diff --git a/CHANGELOG.md b/CHANGELOG.md
index 746bf63..7696102 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,14 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Fixed
-- Setup failures now print the full error in red, and the agent hand-off prompt includes the error text so the agent can diagnose it directly.
-- Error output with bracket tokens (e.g. `[notice]`) is no longer swallowed by rich markup.
+- Setup failures print the full error in red and include it in the agent hand-off prompt, so the agent can diagnose it directly.
+- Connecting the playground workspace no longer fails with a confusing "already exists" error; setup connects to it directly.
 
 ### Changed
-- The launch-plan preview shows an `<error shown above>` placeholder instead of repeating the error; wrapped lines keep their indentation; non-interactive runs no longer hard-wrap the hand-off prompt.
-- The hand-off prompt prints as plain flush-left text instead of inside a panel, so it can be selected and copied manually without grabbing box borders.
-- The scaffold's `.scripts/show_notebook.py` opens the notebook with `?hide_header=true` for a cleaner view.
-- Refreshed the bundled minimal workspace `uv.lock` (`dlthub-client` 0.28.1, `marimo` 0.23.13, `pandas` 3.0.3 — 3.0.4 was yanked for datetime segfaults) and updated the notebook session snapshot's pinned marimo version.
+- The hand-off prompt prints as plain text (no panel), so it can be copied manually.
+- The onboarding notebook is a single page; its "Next step" button navigates to the organization's setup page on dltHub.
+- The dataset viewer now hides the notebook header, and opens on whichever stack (local or hosted) you're connected to instead of always pointing to production.
+- Refreshed the bundled workspace `uv.lock` (`dlthub-client` 0.28.1, `marimo` 0.23.13; `pandas` 3.0.3 — 3.0.4 was yanked).
 
 ## [0.10.1] - 2026-07-01
 
diff --git a/Makefile b/Makefile
index 3c38ef6..55ab3eb 100644
--- a/Makefile
+++ b/Makefile
@@ -127,14 +127,14 @@ workspace-env: ## Like workspace, but pins api_base_url (+ auth_base_url / dlthu
 	fi; \
 	echo "workspace-env: pinned + validated api_base_url = $(API_BASE_URL)$(if $(AUTH_BASE_URL), (auth_base_url = $(AUTH_BASE_URL))) in $$cfg"
 
-workspace-local: ## Scaffold a workspace pointed at the local stack (api + auth on *.dlthub.test) with an editable dlthub-client; skips TLS verify (mkcert CA is not in Python's bundle)
-	$(MAKE) workspace-env API_BASE_URL=https://api.dlthub.test AUTH_BASE_URL=https://auth.dlthub.test DLT_RUNTIME_INSECURE=true DLTHUB_CLIENT_SOURCE="$(or $(DLTHUB_CLIENT_SOURCE),$(CURDIR)/../runtime/clients/cli)"
+workspace-local: ## Scaffold a workspace pointed at the local stack (api + auth on *.dlthub.test) with the released dlthub-client; skips TLS verify (mkcert CA is not in Python's bundle)
+	$(MAKE) workspace-env API_BASE_URL=https://api.dlthub.test AUTH_BASE_URL=https://auth.dlthub.test DLT_RUNTIME_INSECURE=true
 
 workspace-stage: ## Scaffold a workspace pointed at the staging stack (api.dlthub.net)
 	$(MAKE) workspace-env API_BASE_URL=https://api.dlthub.net
 
-workspace-dev: ## Scaffold a workspace pointed at the dev stack (api.dlthub.dev) with an editable dlthub-client matching the dev API
-	$(MAKE) workspace-env API_BASE_URL=https://api.dlthub.dev DLTHUB_CLIENT_SOURCE="$(or $(DLTHUB_CLIENT_SOURCE),$(CURDIR)/../runtime/clients/cli)"
+workspace-dev: ## Scaffold a workspace pointed at the dev stack (api.dlthub.dev) with the released dlthub-client
+	$(MAKE) workspace-env API_BASE_URL=https://api.dlthub.dev
 
 workspace-here: dev ## Init in place: make empty ./$(WORKSPACE_HERE_DIR), cd in, run the local CLI with no positional (pass ARGS="--yes --skip-uv-sync")
 	@case "$(WORKSPACE_HERE_DIR)" in *..*|"") echo "invalid WORKSPACE_HERE_DIR: $(WORKSPACE_HERE_DIR)"; exit 1;; esac
diff --git a/src/create_dlthub_workspace/cli.py b/src/create_dlthub_workspace/cli.py
index 5898de9..d3b5ce8 100644
--- a/src/create_dlthub_workspace/cli.py
+++ b/src/create_dlthub_workspace/cli.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import argparse
-import re
 import shutil
 import subprocess
 import sys
@@ -43,7 +42,7 @@
     validate_agent,
     validate_scaffold_name,
 )
-from .uv import capture_uv_command, execute_uv_install, find_uv, run_uv_command, run_uv_sync
+from .uv import execute_uv_install, find_uv, run_uv_command, run_uv_sync
 
 
 def _ensure_utf8_io_on_windows() -> None:
@@ -325,55 +324,13 @@ def _login_and_connect_playground(uv_executable: str, project_dir: Path, *, verb
     """Log in and bind the playground workspace, the setup the entry skill assumes is done."""
     with substep(strings.MSG_CONNECTING_DLTHUB, strings.MSG_CONNECTED_DLTHUB, verbose=verbose):
         run_uv_command(uv_executable, project_dir, ["run", "dlthub", "login"], verbose=verbose)
-        # connect --create errors on an existing workspace, so pass it only when absent.
-        connect_args = ["run", "dlthub", "workspace", "connect", PLAYGROUND_WORKSPACE]
-        if not _playground_exists(uv_executable, project_dir):
-            connect_args.append("--create")
-        run_uv_command(uv_executable, project_dir, connect_args, verbose=verbose)
-
-
-def _workspace_in_list(list_output: str, name: str) -> bool:
-    """True if ``name`` appears in the Name column of `dlthub workspace list`.
-
-    The output is a space-padded table; workspace names can contain single
-    spaces (e.g. "My Workspace"), so columns are split on runs of 2+ spaces and
-    the first field is the name. The header row (before the dashed separator)
-    and the separator itself are skipped, so a workspace literally named like a
-    column header can't false-match.
-    """
-    seen_separator = False
-    for line in list_output.splitlines():
-        stripped = line.strip()
-        if not stripped:
-            continue
-        if set(stripped) <= {"-", " "}:
-            seen_separator = True
-            continue
-        if not seen_separator:
-            continue  # header row(s) above the separator
-        first_column = re.split(r"\s{2,}", stripped)[0]
-        if first_column == name:
-            return True
-    return False
-
-
-def _playground_exists(uv_executable: str, project_dir: Path) -> bool:
-    """Report whether the playground workspace already exists for the user.
-
-    Lists remote workspaces with --non-interactive so an unauthenticated user
-    fails fast (no hanging prompt) instead of blocking. On any failure we report
-    False, so the caller falls back to `connect --create` — and that connect
-    step then triggers the interactive login.
-    """
-    try:
-        output = capture_uv_command(
+        # The account always has a playground workspace, so connect without --create.
+        run_uv_command(
             uv_executable,
             project_dir,
-            ["run", "dlthub", "--non-interactive", "workspace", "list"],
+            ["run", "dlthub", "workspace", "connect", PLAYGROUND_WORKSPACE],
+            verbose=verbose,
         )
-    except UvError:
-        return False
-    return _workspace_in_list(output, PLAYGROUND_WORKSPACE)
 
 
 if __name__ == "__main__":
diff --git a/src/create_dlthub_workspace/scaffolds/minimal_workspace/.scripts/show_notebook.py b/src/create_dlthub_workspace/scaffolds/minimal_workspace/.scripts/show_notebook.py
index 6b157b9..8aa69f5 100644
--- a/src/create_dlthub_workspace/scaffolds/minimal_workspace/.scripts/show_notebook.py
+++ b/src/create_dlthub_workspace/scaffolds/minimal_workspace/.scripts/show_notebook.py
@@ -1,44 +1,34 @@
 """Open a deployed notebook's read-only "show" page in the dltHub web app.
 
 Builds and opens:
-    {APP_BASE}/w/{workspace_id}/notebooks/{job_ref}/show?hide_header=true
+    {web_ui_base}/w/{workspace_id}/notebooks/{job_ref}/show?hide_header=true
 
-The workspace id is read from this workspace's `.dlt/config.toml` (so it tracks
-whatever this workspace is connected to). Pass the job ref as the only argument.
-Override the web-app base with DLTHUB_APP_URL (defaults to prod).
+The workspace id and web-app base come from the active workspace context —
+`dlt_runtime.urls` mirrors the web app's routes — so the URL tracks whatever
+stack this workspace is connected to. Pass the job ref as the only argument.
 
-Usage (run from the workspace root):
+Usage (run from the workspace root so the workspace context resolves):
     uv run .scripts/show_notebook.py jobs.onboarding_success
-    DLTHUB_APP_URL=https://app.dlthub.test uv run .scripts/show_notebook.py jobs.onboarding_success
 """
 
-import os
 import sys
-import tomllib
 import webbrowser
-from pathlib import Path
-
-APP_BASE = os.environ.get("DLTHUB_APP_URL", "https://app.dlthub.com").rstrip("/")
 
 if len(sys.argv) < 2:
     sys.exit("usage: uv run .scripts/show_notebook.py <job-ref>   e.g. jobs.onboarding_success")
 ref = sys.argv[1]
 
+from dlt._workspace._workspace_context import active
+from dlt._workspace.exceptions import WorkspaceRunContextNotAvailable
+from dlt_runtime.urls import workspace_url
 
-def _find_config() -> Path:
-    """Locate .dlt/config.toml by walking up from this script (location-independent)."""
-    for parent in Path(__file__).resolve().parents:
-        candidate = parent / ".dlt" / "config.toml"
-        if candidate.is_file():
-            return candidate
-    sys.exit("Could not find .dlt/config.toml above this script — run inside a workspace.")
-
-
-cfg = tomllib.loads(_find_config().read_text())
-ws = cfg.get("runtime", {}).get("workspace_id")
+try:
+    ws = active().runtime_config.workspace_id
+except WorkspaceRunContextNotAvailable:
+    sys.exit("No workspace found here — run from the workspace root.")
 if not ws:
     sys.exit("No workspace_id in .dlt/config.toml — connect the workspace first.")
 
-url = f"{APP_BASE}/w/{ws}/notebooks/{ref}/show?hide_header=true"
+url = f"{workspace_url(ws)}/notebooks/{ref}/show?hide_header=true"
 print(f"Opening {url}")
 webbrowser.open(url)
diff --git a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/__marimo__/session/onboarding_success.py.json b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/__marimo__/session/onboarding_success.py.json
index 819f0ec..2575cbb 100644
--- a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/__marimo__/session/onboarding_success.py.json
+++ b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/__marimo__/session/onboarding_success.py.json
@@ -7,7 +7,7 @@
   "cells": [
     {
       "id": "Hbol",
-      "code_hash": "1a27776b2040b0805f75b129ec9774e4",
+      "code_hash": "a192c5210b0ffba29688aaee75b76f44",
       "outputs": [
         {
           "type": "data",
@@ -20,12 +20,12 @@
     },
     {
       "id": "MJUe",
-      "code_hash": "7ad9a3d419427dce2e8bbd1d217ebd9e",
+      "code_hash": "6550d5e9c367d44dff418140b3b74070",
       "outputs": [
         {
           "type": "data",
           "data": {
-            "text/html": "<style>/* Onboarding chrome + brand theme. Injected after the shared styles/app.css\n   (only on this page), so the :root block below re-points the --dlt-* tokens to\n   the official dltHub palette without affecting app.py. Values mirror the web\n   client's design tokens (runtime/clients/web globals.css). */\n:root {\n  /* dltHub brand */\n  --dlt-aqua: oklch(0.7 0.1 215);            /* #59c1d5 */\n  --dlt-lime: oklch(0.81 0.18 115);          /* #c6d300 */\n  --dlt-green: oklch(0.65 0.15 135);         /* action / \"run\" */\n  --dlt-dark-purple: oklch(0.16 0.06 285);   /* #191937 */\n  --dlt-medium-purple: oklch(0.28 0.09 285);\n  --dlt-light-purple: #5c57c6;               /* primary */\n  --dlt-lightest-purple: oklch(0.73 0.08 285);\n\n  /* semantic \u2014 same names the rest of this file & app.css already reference */\n  --dlt-bg: #f9f9fb;\n  --dlt-card: oklch(1 0 0);\n  --dlt-border: oklch(0.92 0.004 286.32);\n  --dlt-border-soft: oklch(0.95 0.003 286);\n  --dlt-secondary: #ecedf1;\n  --dlt-danger: #ee5a51;\n  --dlt-accent: var(--dlt-light-purple);\n  --dlt-accent-soft: color-mix(in oklch, var(--dlt-lightest-purple) 22%, transparent);\n  --dlt-accent-ink: var(--dlt-light-purple);\n  --dlt-accent-fg: oklch(0.985 0 0);\n  --dlt-text: var(--dlt-dark-purple);\n  --dlt-muted: oklch(0.45 0.04 285);\n  --dlt-radius: 6px;\n  --dlt-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);\n  --dlt-card-border: 1px solid var(--dlt-border);\n  --dlt-font: \"Geist\", ui-sans-serif, system-ui, sans-serif;\n  --dlt-font-mono: \"Geist Mono\", ui-monospace, SFMono-Regular, Menlo, monospace;\n}\n\n#App.config-width-full > div > div { padding-left: 0 !important; padding-right: 0 !important; }\n#App { padding-left: 0; padding-top: 0; background: var(--dlt-bg); box-sizing: border-box; }\n#App .marimo-cell { background: transparent !important; border-radius: 0 !important; box-shadow: none !important; margin: 0 !important; }\n\n/* ---- Page dots (3-step wizard progress) ---- */\n.page-dots { display: flex; justify-content: center; gap: 6px; margin: 0 0 12px; }\n.page-dot {\n  height: 6px; border-radius: 999px;\n  background: color-mix(in oklch, var(--dlt-text) 12%, transparent);\n  transition: width 0.2s ease, background 0.2s ease;\n}\n.page-dot.idle { width: 6px; }\n.page-dot.active { width: 18px; background: var(--dlt-accent); }\n\n/* ---- Page header (centered title + subtitle) ---- */\n.page-head { text-align: center; margin: 0; }\n.page-title {\n  font-family: var(--dlt-font);\n  font-size: 30px; font-weight: 500; line-height: 1.3;\n  color: var(--dlt-text); letter-spacing: -0.02em;\n  margin: 0 auto; max-width: 700px;\n}\n.page-subtitle {\n  font-family: var(--dlt-font);\n  font-size: 18px; font-weight: 400; line-height: 1.55;\n  color: var(--dlt-muted); margin: 14px auto 0; max-width: 560px;\n}\n.page-trial {\n  font-family: var(--dlt-font);\n  font-size: 16px; font-weight: 400; color: var(--dlt-muted);\n  text-align: center; margin: 0;\n}\n\n/* ---- Results (rendered inside the query card once a query runs) ---- */\n.dlt-section-label {\n  font-family: var(--dlt-font);\n  font-size: 16px; font-weight: 600; color: var(--dlt-text);\n  margin: 4px 0 10px;\n}\n.res-block { padding: 2px 2px 0; }\n.res-empty {\n  display: flex; align-items: center; justify-content: center;\n  min-height: 300px; text-align: center;\n  font: 400 14px/1.5 var(--dlt-font); color: var(--dlt-muted);\n}\n.run-hint {\n  display: inline-flex; align-items: center; gap: 7px;\n  font: 600 13px/1 var(--dlt-font); color: var(--dlt-accent-ink);\n  white-space: nowrap;\n  background: var(--dlt-accent-soft); padding: 7px 11px; border-radius: 6px;\n}\n.run-arrow {\n  font-size: 16px; font-weight: 700;\n  animation: nudge 1.1s ease-in-out infinite;\n}\n@keyframes nudge {\n  0%, 100% { transform: translateX(0); }\n  50% { transform: translateX(-5px); }\n}\n@keyframes fade-in {\n  from { opacity: 0; transform: translateY(4px); }\n  to { opacity: 1; transform: translateY(0); }\n}\n@media (prefers-reduced-motion: reduce) {\n  .run-arrow { animation: none; }\n}\n\n/* ---- loading skeleton (page 2, while the playground read resolves) ---- */\n.dlt-skeleton {\n  display: flex; gap: 16px; align-items: stretch; flex-wrap: wrap;\n  animation: fade-in .25s ease;\n}\n.sk-pane {\n  background: var(--dlt-card); border: var(--dlt-card-border);\n  border-radius: var(--dlt-radius); box-shadow: var(--dlt-shadow);\n  padding: 18px 20px; box-sizing: border-box;\n}\n.sk-schema { flex: 1 1 300px; min-width: 260px; }\n.sk-workspace { flex: 3 1 480px; min-width: 320px; }\n.sk-row {\n  display: flex; align-items: center; gap: 10px;\n  padding: 11px 2px; border-bottom: 1px solid var(--dlt-border-soft);\n}\n.sk-row:last-child { border-bottom: none; }\n.sk-dot { width: 16px; height: 16px; border-radius: 5px; flex: none; }\n.sk-line { height: 11px; border-radius: 5px; }\n.sk-w30 { width: 30%; } .sk-w40 { width: 40%; } .sk-w55 { width: 55%; } .sk-w70 { width: 70%; }\n.sk-block { height: 120px; border-radius: 8px; margin-bottom: 14px; }\n.sk-block.tall { height: 220px; margin-bottom: 0; }\n.sk-dot, .sk-line, .sk-block {\n  background: linear-gradient(90deg,\n    var(--dlt-border-soft) 25%, var(--dlt-border) 38%, var(--dlt-border-soft) 63%);\n  background-size: 400% 100%;\n  animation: sk-shimmer 1.4s ease infinite;\n}\n@keyframes sk-shimmer {\n  from { background-position: 100% 0; }\n  to { background-position: 0 0; }\n}\n@media (prefers-reduced-motion: reduce) {\n  .sk-dot, .sk-line, .sk-block { animation: none; }\n}\n\n/* ---- floating scroll-down cue ---- */\n.dlt-next-anchor { height: 0; }\n.dlt-scroll-cue {\n  position: fixed; left: 50%; bottom: 22px; transform: translateX(-50%) translateY(8px);\n  z-index: 50; display: grid; place-items: center;\n  width: 40px; height: 40px; padding: 0;\n  border: none; border-radius: 999px;\n  background: var(--dlt-accent-soft); color: var(--dlt-accent-ink);\n  box-shadow: 0 4px 14px rgb(0 0 0 / 0.12); cursor: pointer;\n  opacity: 0; pointer-events: none;\n  transition: opacity .2s ease, transform .2s ease;\n}\n.dlt-scroll-cue.show {\n  opacity: 1; pointer-events: auto; transform: translateX(-50%) translateY(0);\n  animation: cue-bob 1.4s ease-in-out infinite;\n}\n.dlt-scroll-cue:hover { background: color-mix(in oklch, var(--dlt-accent-soft) 75%, var(--dlt-accent)); }\n.dlt-scroll-cue svg { width: 20px; height: 20px; }\n@keyframes cue-bob {\n  0%, 100% { transform: translateX(-50%) translateY(0); }\n  50% { transform: translateX(-50%) translateY(4px); }\n}\n@media (prefers-reduced-motion: reduce) {\n  .dlt-scroll-cue.show { animation: none; }\n}\n\n/* ---- copy-for-agent prompt box (page 3) ---- */\n.pb-eyebrow {\n  font-family: var(--dlt-font);\n  font-size: 16px; font-weight: 600; color: var(--dlt-text);\n  text-align: left; margin: 4px 0 10px;\n}\n.pbo-a {\n  --agb-fill: var(--dlt-card);\n  display: flex; align-items: center; justify-content: space-between; gap: 16px;\n  border-radius: var(--dlt-radius); padding: 14px 16px;\n}\n.pbo-a .pb-text {\n  flex: 1; min-width: 0; font-size: 16px; line-height: 1.55;\n  color: var(--dlt-text); text-align: left;\n  font-family: var(--dlt-font);\n}\n.dlt-prompt-copy {\n  flex: none; display: inline-flex; align-items: center; justify-content: center; gap: 8px;\n  background: var(--dlt-accent); border: 1px solid var(--dlt-accent); border-radius: 6px;\n  padding: 12px 24px; cursor: pointer; color: var(--dlt-accent-fg);\n  font: 600 16px/1 var(--dlt-font); transition: background .12s ease, border-color .12s ease;\n}\n.dlt-prompt-copy:hover { background: color-mix(in oklch, var(--dlt-accent) 86%, black); border-color: color-mix(in oklch, var(--dlt-accent) 86%, black); }\n.dlt-prompt-copy svg { width: 18px; height: 18px; }\n.dlt-prompt-copy svg path[stroke=\"none\"] { fill: var(--dlt-accent-fg); }\n.dlt-prompt-copy.copied { background: color-mix(in oklch, var(--dlt-accent) 86%, black); border-color: color-mix(in oklch, var(--dlt-accent) 86%, black); }\n\n/* Animated \"AI\" gradient border \u2014 brand conic gradient (purple\u2192aqua\u2192lime) drawn\n   in the border-box, with the fill in the padding-box. Override --agb-fill to\n   tint the inner surface. Mirrors the web client's signature onboarding effect. */\n@property --gradient-border-angle {\n  syntax: \"<angle>\";\n  inherits: false;\n  initial-value: 0deg;\n}\n@keyframes gradient-border-rotate {\n  to { --gradient-border-angle: 360deg; }\n}\n.animated-gradient-border {\n  --agb-fill: var(--dlt-card);\n  border: 2px solid transparent;\n  background:\n    linear-gradient(var(--agb-fill), var(--agb-fill)) padding-box,\n    conic-gradient(\n      from var(--gradient-border-angle),\n      var(--dlt-light-purple), var(--dlt-aqua), var(--dlt-lime),\n      var(--dlt-aqua), var(--dlt-light-purple)\n    ) border-box;\n  animation: gradient-border-rotate 3s linear infinite;\n}\n@media (prefers-reduced-motion: reduce) {\n  .animated-gradient-border { animation: none; }\n}\n\n/* ---- Results table ---- */\n.dlt-table-wrap { overflow: auto; height: 264px; box-sizing: border-box; padding: 10px 12px; }\n.dlt-table {\n  width: 100%; border-collapse: collapse; font: 400 13px/1.5 var(--dlt-font);\n}\n.dlt-table thead tr { border-bottom: 1px solid var(--dlt-border); }\n.dlt-table th {\n  padding: 0 12px 8px; text-align: left;\n  font: 600 11px/1 var(--dlt-font); color: var(--dlt-muted);\n  letter-spacing: 0.05em; text-transform: uppercase;\n  vertical-align: bottom; white-space: nowrap;\n}\n.dlt-table td { padding: 7px 12px; color: var(--dlt-text); white-space: nowrap; }\n.dlt-table tbody tr { border-bottom: 1px solid var(--dlt-border-soft); }\n.dlt-table tbody tr:hover { background: var(--dlt-accent-soft); }\n.dlt-table tbody tr:last-child { border-bottom: none; }\n.th-name { margin-bottom: 4px; }\n/* mini distribution bar chart above column header label */\n.spark { display: flex; align-items: flex-end; height: 20px; gap: 1px; margin-bottom: 4px; }\n.spark-bar { flex: 1; background: #b5a9f0; border-radius: 1px 1px 0 0; min-height: 2px; }\n/* collapsible results \u2014 show 8 rows by default, expand on toggle */\n.res-expand-cb { display: none; }\n.res-collapsible tbody tr:nth-child(n+9) { display: none; }\n.res-expand-cb:checked ~ .res-collapsible tbody tr:nth-child(n+9) { display: table-row; }\n.res-foot {\n  display: flex; align-items: center; justify-content: space-between;\n  padding-top: 10px; font: 400 12px/1 var(--dlt-font); color: var(--dlt-muted);\n}\n.res-toggle {\n  font: 500 12px/1 var(--dlt-font); color: var(--dlt-accent);\n  cursor: pointer; user-select: none;\n}\n.res-toggle .lbl-less { display: none; }\n.res-expand-cb:checked ~ * .lbl-more,\n.res-expand-cb:checked + * .lbl-more { display: none; }\n.res-expand-cb:checked ~ * .lbl-less,\n.res-expand-cb:checked + * .lbl-less { display: inline; }\n.dlt-muted { color: var(--dlt-muted); }\n</style>"
+            "text/html": "<style>/* Onboarding chrome + brand theme. Injected after the shared styles/app.css\n   (only on this page), so the :root block below re-points the --dlt-* tokens to\n   the official dltHub palette without affecting app.py. Values mirror the web\n   client's design tokens (runtime/clients/web globals.css). */\n:root {\n  /* dltHub brand */\n  --dlt-green: oklch(0.65 0.15 135);         /* action / \"run\" */\n  --dlt-dark-purple: oklch(0.16 0.06 285);   /* #191937 */\n  --dlt-medium-purple: oklch(0.28 0.09 285);\n  --dlt-light-purple: #5c57c6;               /* primary */\n  --dlt-lightest-purple: oklch(0.73 0.08 285);\n\n  /* semantic \u2014 same names the rest of this file & app.css already reference */\n  --dlt-bg: #f9f9fb;\n  --dlt-card: oklch(1 0 0);\n  --dlt-border: oklch(0.92 0.004 286.32);\n  --dlt-border-soft: oklch(0.95 0.003 286);\n  --dlt-secondary: #ecedf1;\n  --dlt-danger: #ee5a51;\n  --dlt-accent: var(--dlt-light-purple);\n  --dlt-accent-soft: color-mix(in oklch, var(--dlt-lightest-purple) 22%, transparent);\n  --dlt-accent-ink: var(--dlt-light-purple);\n  --dlt-accent-fg: oklch(0.985 0 0);\n  --dlt-text: var(--dlt-dark-purple);\n  --dlt-muted: oklch(0.45 0.04 285);\n  --dlt-radius: 6px;\n  --dlt-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);\n  --dlt-card-border: 1px solid var(--dlt-border);\n  --dlt-font: \"Geist\", ui-sans-serif, system-ui, sans-serif;\n  --dlt-font-mono: \"Geist Mono\", ui-monospace, SFMono-Regular, Menlo, monospace;\n}\n\n#App.config-width-full > div > div { padding-left: 0 !important; padding-right: 0 !important; }\n#App { padding-left: 0; padding-top: 0; background: var(--dlt-bg); box-sizing: border-box; }\n#App .marimo-cell { background: transparent !important; border-radius: 0 !important; box-shadow: none !important; margin: 0 !important; }\n\n/* ---- Page header (centered title + subtitle) ---- */\n.page-head { text-align: center; margin: 0; }\n.page-title {\n  font-family: var(--dlt-font);\n  font-size: 30px; font-weight: 500; line-height: 1.3;\n  color: var(--dlt-text); letter-spacing: -0.02em;\n  margin: 0 auto; max-width: 700px;\n}\n.page-subtitle {\n  font-family: var(--dlt-font);\n  font-size: 18px; font-weight: 400; line-height: 1.55;\n  color: var(--dlt-muted); margin: 14px auto 0; max-width: 560px;\n}\n/* ---- Results (rendered inside the query card once a query runs) ---- */\n.dlt-section-label {\n  font-family: var(--dlt-font);\n  font-size: 16px; font-weight: 600; color: var(--dlt-text);\n  margin: 4px 0 10px;\n}\n.res-block { padding: 2px 2px 0; }\n.res-empty {\n  display: flex; align-items: center; justify-content: center;\n  min-height: 300px; text-align: center;\n  font: 400 14px/1.5 var(--dlt-font); color: var(--dlt-muted);\n}\n.run-hint {\n  display: inline-flex; align-items: center; gap: 7px;\n  font: 600 13px/1 var(--dlt-font); color: var(--dlt-accent-ink);\n  white-space: nowrap;\n  background: var(--dlt-accent-soft); padding: 7px 11px; border-radius: 6px;\n}\n.run-arrow {\n  font-size: 16px; font-weight: 700;\n  animation: nudge 1.1s ease-in-out infinite;\n}\n@keyframes nudge {\n  0%, 100% { transform: translateX(0); }\n  50% { transform: translateX(-5px); }\n}\n@keyframes fade-in {\n  from { opacity: 0; transform: translateY(4px); }\n  to { opacity: 1; transform: translateY(0); }\n}\n@media (prefers-reduced-motion: reduce) {\n  .run-arrow { animation: none; }\n}\n\n/* ---- loading skeleton (while the playground read resolves) ---- */\n.dlt-skeleton {\n  display: flex; gap: 16px; align-items: stretch; flex-wrap: wrap;\n  animation: fade-in .25s ease;\n}\n.sk-pane {\n  background: var(--dlt-card); border: var(--dlt-card-border);\n  border-radius: var(--dlt-radius); box-shadow: var(--dlt-shadow);\n  padding: 18px 20px; box-sizing: border-box;\n}\n.sk-schema { flex: 1 1 300px; min-width: 260px; }\n.sk-workspace { flex: 3 1 480px; min-width: 320px; }\n.sk-row {\n  display: flex; align-items: center; gap: 10px;\n  padding: 11px 2px; border-bottom: 1px solid var(--dlt-border-soft);\n}\n.sk-row:last-child { border-bottom: none; }\n.sk-dot { width: 16px; height: 16px; border-radius: 5px; flex: none; }\n.sk-line { height: 11px; border-radius: 5px; }\n.sk-w30 { width: 30%; } .sk-w40 { width: 40%; } .sk-w55 { width: 55%; } .sk-w70 { width: 70%; }\n.sk-block { height: 120px; border-radius: 8px; margin-bottom: 14px; }\n.sk-block.tall { height: 220px; margin-bottom: 0; }\n.sk-dot, .sk-line, .sk-block {\n  background: linear-gradient(90deg,\n    var(--dlt-border-soft) 25%, var(--dlt-border) 38%, var(--dlt-border-soft) 63%);\n  background-size: 400% 100%;\n  animation: sk-shimmer 1.4s ease infinite;\n}\n@keyframes sk-shimmer {\n  from { background-position: 100% 0; }\n  to { background-position: 0 0; }\n}\n@media (prefers-reduced-motion: reduce) {\n  .sk-dot, .sk-line, .sk-block { animation: none; }\n}\n\n/* ---- floating scroll-down cue ---- */\n.dlt-next-anchor { height: 0; }\n.dlt-scroll-cue {\n  position: fixed; left: 50%; bottom: 22px; transform: translateX(-50%) translateY(8px);\n  z-index: 50; display: grid; place-items: center;\n  width: 40px; height: 40px; padding: 0;\n  border: none; border-radius: 999px;\n  background: var(--dlt-accent-soft); color: var(--dlt-accent-ink);\n  box-shadow: 0 4px 14px rgb(0 0 0 / 0.12); cursor: pointer;\n  opacity: 0; pointer-events: none;\n  transition: opacity .2s ease, transform .2s ease;\n}\n.dlt-scroll-cue.show {\n  opacity: 1; pointer-events: auto; transform: translateX(-50%) translateY(0);\n  animation: cue-bob 1.4s ease-in-out infinite;\n}\n.dlt-scroll-cue:hover { background: color-mix(in oklch, var(--dlt-accent-soft) 75%, var(--dlt-accent)); }\n.dlt-scroll-cue svg { width: 20px; height: 20px; }\n@keyframes cue-bob {\n  0%, 100% { transform: translateX(-50%) translateY(0); }\n  50% { transform: translateX(-50%) translateY(4px); }\n}\n@media (prefers-reduced-motion: reduce) {\n  .dlt-scroll-cue.show { animation: none; }\n}\n\n/* ---- Results table ---- */\n.dlt-table-wrap { overflow: auto; height: 264px; box-sizing: border-box; padding: 10px 12px; }\n.dlt-table {\n  width: 100%; border-collapse: collapse; font: 400 13px/1.5 var(--dlt-font);\n}\n.dlt-table thead tr { border-bottom: 1px solid var(--dlt-border); }\n.dlt-table th {\n  padding: 0 12px 8px; text-align: left;\n  font: 600 11px/1 var(--dlt-font); color: var(--dlt-muted);\n  letter-spacing: 0.05em; text-transform: uppercase;\n  vertical-align: bottom; white-space: nowrap;\n}\n.dlt-table td { padding: 7px 12px; color: var(--dlt-text); white-space: nowrap; }\n.dlt-table tbody tr { border-bottom: 1px solid var(--dlt-border-soft); }\n.dlt-table tbody tr:hover { background: var(--dlt-accent-soft); }\n.dlt-table tbody tr:last-child { border-bottom: none; }\n.th-name { margin-bottom: 4px; }\n/* mini distribution bar chart above column header label */\n.spark { display: flex; align-items: flex-end; height: 20px; gap: 1px; margin-bottom: 4px; }\n.spark-bar { flex: 1; background: #b5a9f0; border-radius: 1px 1px 0 0; min-height: 2px; }\n/* collapsible results \u2014 show 8 rows by default, expand on toggle */\n.res-expand-cb { display: none; }\n.res-collapsible tbody tr:nth-child(n+9) { display: none; }\n.res-expand-cb:checked ~ .res-collapsible tbody tr:nth-child(n+9) { display: table-row; }\n.res-foot {\n  display: flex; align-items: center; justify-content: space-between;\n  padding-top: 10px; font: 400 12px/1 var(--dlt-font); color: var(--dlt-muted);\n}\n.res-toggle {\n  font: 500 12px/1 var(--dlt-font); color: var(--dlt-accent);\n  cursor: pointer; user-select: none;\n}\n.res-toggle .lbl-less { display: none; }\n.res-expand-cb:checked ~ * .lbl-more,\n.res-expand-cb:checked + * .lbl-more { display: none; }\n.res-expand-cb:checked ~ * .lbl-less,\n.res-expand-cb:checked + * .lbl-less { display: inline; }\n.dlt-muted { color: var(--dlt-muted); }\n</style>"
           }
         }
       ],
@@ -33,7 +33,7 @@
     },
     {
       "id": "vblA",
-      "code_hash": "5860d2445a93961997024114aca58422",
+      "code_hash": "be8b2ffd86a807ae3da2275abca5ec1e",
       "outputs": [
         {
           "type": "data",
@@ -85,12 +85,12 @@
     },
     {
       "id": "Xref",
-      "code_hash": "28e7aaedab4c496499d18c7019a7f6b1",
+      "code_hash": "2723352c93024b3e2aabb8dfe3046d7c",
       "outputs": [
         {
           "type": "data",
           "data": {
-            "text/html": "<div style='max-width:1120px;margin:0 auto;padding:44px 24px 72px;box-sizing:border-box'><div style='display: flex;flex: 1;flex-direction: column;justify-content: flex-start;align-items: normal;flex-wrap: nowrap;gap: 1.25rem'><div class=\"page-dots\"><span class=\"page-dot active\"></span><span class=\"page-dot idle\"></span></div><div class=\"page-head\"><h2 class=\"page-title\">Congrats! Your first pipeline successfully loaded data from the sample shop API into playground.</h2><p class=\"page-subtitle\">Take a quick look at your data, then run your first query.</p></div><div class=\"dlt-skeleton\"><div class=\"sk-pane sk-schema\"><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w55\"></span></div><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w40\"></span></div><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w70\"></span></div><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w30\"></span></div><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w55\"></span></div><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w40\"></span></div></div><div class=\"sk-pane sk-workspace\"><div class=\"sk-block\"></div><div class=\"sk-block tall\"></div></div></div></div></div>"
+            "text/html": "<div style='max-width:1120px;margin:0 auto;padding:44px 24px 72px;box-sizing:border-box'><div style='display: flex;flex: 1;flex-direction: column;justify-content: flex-start;align-items: normal;flex-wrap: nowrap;gap: 1.25rem'><div class=\"page-head\"><h2 class=\"page-title\">Congrats! Your first pipeline successfully loaded data from the sample shop API into playground.</h2><p class=\"page-subtitle\">Take a quick look at your data, then run your first query.</p></div><div class=\"dlt-skeleton\"><div class=\"sk-pane sk-schema\"><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w55\"></span></div><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w40\"></span></div><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w70\"></span></div><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w30\"></span></div><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w55\"></span></div><div class=\"sk-row\"><span class=\"sk-dot\"></span><span class=\"sk-line sk-w40\"></span></div></div><div class=\"sk-pane sk-workspace\"><div class=\"sk-block\"></div><div class=\"sk-block tall\"></div></div></div></div></div>"
           }
         }
       ],
diff --git a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/onboarding_success.py b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/onboarding_success.py
index d1c2149..72df02b 100644
--- a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/onboarding_success.py
+++ b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/onboarding_success.py
@@ -22,11 +22,10 @@ def _():
 
     import dlt_access as da
     from widgets.action_button import ActionButton
-    from widgets.clipboard_copy import ClipboardCopy
     from widgets.schema_overview import SchemaOverview
     from widgets.scroll_cue import ScrollCue
 
-    return ActionButton, ClipboardCopy, Path, SchemaOverview, ScrollCue, asyncio, da, html, mo, np, pd
+    return ActionButton, Path, SchemaOverview, ScrollCue, asyncio, da, html, mo, np, pd
 
 
 @app.cell
@@ -42,19 +41,11 @@ def _(Path, mo):
         "box-sizing": "border-box",
     }
     COLUMN_STYLE = {
-        "max-width": "800px",
+        "max-width": "1120px",
         "margin": "0 auto",
         "padding": "44px 24px 72px",
         "box-sizing": "border-box",
     }
-    WIDE_COLUMN_STYLE = {**COLUMN_STYLE, "max-width": "1120px"}
-
-    def page_dots(current):
-        dots = "".join(
-            f'<span class="page-dot {"active" if i == current else "idle"}"></span>'
-            for i in (1, 2)
-        )
-        return mo.Html(f'<div class="page-dots">{dots}</div>')
 
     def page_header(title, subtitle):
         return mo.Html(
@@ -65,7 +56,7 @@ def page_header(title, subtitle):
         )
 
     shell_css
-    return CARD_STYLE, COLUMN_STYLE, WIDE_COLUMN_STYLE, page_dots, page_header
+    return CARD_STYLE, COLUMN_STYLE, page_header
 
 
 @app.cell
@@ -74,7 +65,7 @@ def _(ActionButton, mo):
         ActionButton(label="Run Query", variant="start", icon="run", size="lg")
     )
     to_next = mo.ui.anywidget(
-        ActionButton(label="Next step", variant="primary", size="lg")
+        ActionButton(label="Next step", variant="primary", size="lg", route="org-setup")
     )
     return run_button, to_next
 
@@ -113,23 +104,18 @@ def _(da, get_data, mo, schema_overview):
 def _(
     CARD_STYLE,
     COLUMN_STYLE,
-    ClipboardCopy,
     ScrollCue,
-    WIDE_COLUMN_STYLE,
     da,
     html,
     mo,
     np,
     pd,
-    page_dots,
     page_header,
     run_button,
     schema_overview,
     sql_editor,
     to_next,
 ):
-    page = 1 + (to_next.clicks > 0)
-
     def _spark(series):
         s = series.dropna()
         if not len(s):
@@ -179,7 +165,7 @@ def _results_html(sql):
         "Take a quick look at your data, then run your first query.",
     )
 
-    if page == 1 and (schema_overview is None or sql_editor is None):
+    if schema_overview is None or sql_editor is None:
         _rows = "".join(
             f'<div class="sk-row"><span class="sk-dot"></span>'
             f'<span class="sk-line {w}"></span></div>'
@@ -195,7 +181,7 @@ def _results_html(sql):
                 "</div></div>"
             ),
         ]
-    elif page == 1:
+    else:
         queried = run_button.clicks > 0
         _schema_pane = mo.vstack([schema_overview], gap=0).style(
             {**CARD_STYLE, "flex": "1 1 300px", "min-width": "260px"}
@@ -245,37 +231,8 @@ def _results_html(sql):
                 ).style({"animation": "fade-in 0.3s ease"})
             )
             _content.append(mo.ui.anywidget(ScrollCue()))
-    else:
-        _content = [
-            page_header(
-                "You're all set.",
-                "Now build your own pipeline and explore your data on dltHub.",
-            ),
-            mo.Html(
-                '<div class="page-trial">Your trial includes $30 of free usage.</div>'
-                '<div class="pb-eyebrow">Prompt for Claude / Codex / Cursor</div>'
-                '<div class="pbo-a animated-gradient-border">'
-                '<div class="pb-text">Help me get started building and running a data pipeline on dltHub.</div>'
-                '<button class="dlt-prompt-copy" type="button"'
-                ' data-copy-text="Help me get started building and running a data pipeline on dltHub.">'
-                '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8"'
-                ' stroke-linecap="round" stroke-linejoin="round">'
-                '<path d="M3.5 14.5h-1a1.8 1.8 0 0 1-1.8-1.8V3.8A1.8 1.8 0 0 1 2.5 2h6.7A1.8 1.8 0 0 1 11 3.8v.7"/>'
-                '<rect x="4.5" y="7" width="11.5" height="13" rx="2"/>'
-                '<path d="M19.5 0.2L20.75 3.25L23.8 4.5L20.75 5.75L19.5 8.8L18.25 5.75L15.2 4.5L18.25 3.25Z"'
-                ' fill="#5c57c6" stroke="none"/>'
-                '<path d="M11 0L11.7 1.5L13.2 2.2L11.7 2.9L11 4.4L10.3 2.9L8.8 2.2L10.3 1.5Z"'
-                ' fill="#5c57c6" stroke="none"/>'
-                "</svg>"
-                '<span class="pb-copy-label">Copy</span>'
-                "</button>"
-                "</div>",
-            ),
-            mo.ui.anywidget(ClipboardCopy()),
-        ]
 
-    _column = WIDE_COLUMN_STYLE if page == 1 else COLUMN_STYLE
-    mo.vstack([page_dots(page), *_content], gap=1.25).style(_column)
+    mo.vstack(_content, gap=1.25).style(COLUMN_STYLE)
     return
 
 @app.cell
diff --git a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/styles/head.html b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/styles/head.html
index ff1d75b..4fe2bb7 100644
--- a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/styles/head.html
+++ b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/styles/head.html
@@ -2,68 +2,3 @@
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link href="https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap" rel="stylesheet">
 <link href="https://fonts.googleapis.com/css2?family=Geist:wght@100..900&family=Geist+Mono:wght@100..900&display=swap" rel="stylesheet">
-<script>
-/* Global copy handler: any element with data-copy="<text>" copies it on click and
-   shows a brief toast. Used by the command cards in the completion section. */
-(function () {
-  function toast(label) {
-    var t = document.createElement("div");
-    t.textContent = "Copied " + (label || "to clipboard");
-    t.style.cssText = "position:fixed;left:50%;bottom:24px;transform:translateX(-50%);" +
-      "background:#1e1b3a;color:#fff;font:600 12px/1 Inter,system-ui,sans-serif;" +
-      "padding:9px 14px;border-radius:8px;box-shadow:0 6px 16px rgba(16,24,40,.25);" +
-      "z-index:4000;opacity:0;transition:opacity .2s ease;pointer-events:none;";
-    document.body.appendChild(t);
-    requestAnimationFrame(function () { t.style.opacity = "1"; });
-    setTimeout(function () { t.style.opacity = "0"; setTimeout(function () { t.remove(); }, 250); }, 1500);
-  }
-  document.addEventListener("click", function (e) {
-    var btn = e.target.closest("[data-copy]");
-    if (!btn) return;
-    var text = btn.getAttribute("data-copy");
-    if (text && navigator.clipboard && navigator.clipboard.writeText) {
-      navigator.clipboard.writeText(text).then(function () {
-        toast(btn.getAttribute("data-copy-label") || "to clipboard");
-      }).catch(function () {});
-    }
-  });
-})();
-
-/* Onboarding auto-complete via MutationObserver.
-   Reactive marimo cells output hidden [data-ob-auto="browse"|"query"] elements
-   when a real interaction occurs. This observer watches the whole document for
-   those signals and sets the matching real checkbox — CSS :has() re-evaluates
-   immediately, gating sidebar nav swap and final-section reveal. */
-(function () {
-  function handleNode(node) {
-    if (!node || node.nodeType !== 1) return;
-    var sig = node.getAttribute && node.getAttribute("data-ob-auto");
-    if (sig) {
-      if (sig === "browse") {
-        var b = document.getElementById("ob-check-browse");
-        if (b && !b.checked) b.checked = true;
-      } else if (sig === "query") {
-        var q = document.getElementById("ob-check-query");
-        if (q && !q.checked) q.checked = true;
-      }
-    }
-    /* also scan children in case the element was added as a subtree */
-    if (node.querySelectorAll) {
-      node.querySelectorAll("[data-ob-auto]").forEach(handleNode);
-    }
-  }
-  var obs = new MutationObserver(function (mutations) {
-    mutations.forEach(function (m) {
-      m.addedNodes.forEach(handleNode);
-    });
-  });
-  function attach() {
-    obs.observe(document.body, { childList: true, subtree: true });
-  }
-  if (document.readyState === "loading") {
-    document.addEventListener("DOMContentLoaded", attach);
-  } else {
-    attach();
-  }
-})();
-</script>
diff --git a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/styles/onboarding_shell.css b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/styles/onboarding_shell.css
index df3b0b1..a0da8ea 100644
--- a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/styles/onboarding_shell.css
+++ b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/styles/onboarding_shell.css
@@ -4,8 +4,6 @@
    client's design tokens (runtime/clients/web globals.css). */
 :root {
   /* dltHub brand */
-  --dlt-aqua: oklch(0.7 0.1 215);            /* #59c1d5 */
-  --dlt-lime: oklch(0.81 0.18 115);          /* #c6d300 */
   --dlt-green: oklch(0.65 0.15 135);         /* action / "run" */
   --dlt-dark-purple: oklch(0.16 0.06 285);   /* #191937 */
   --dlt-medium-purple: oklch(0.28 0.09 285);
@@ -36,16 +34,6 @@
 #App { padding-left: 0; padding-top: 0; background: var(--dlt-bg); box-sizing: border-box; }
 #App .marimo-cell { background: transparent !important; border-radius: 0 !important; box-shadow: none !important; margin: 0 !important; }
 
-/* ---- Page dots (3-step wizard progress) ---- */
-.page-dots { display: flex; justify-content: center; gap: 6px; margin: 0 0 12px; }
-.page-dot {
-  height: 6px; border-radius: 999px;
-  background: color-mix(in oklch, var(--dlt-text) 12%, transparent);
-  transition: width 0.2s ease, background 0.2s ease;
-}
-.page-dot.idle { width: 6px; }
-.page-dot.active { width: 18px; background: var(--dlt-accent); }
-
 /* ---- Page header (centered title + subtitle) ---- */
 .page-head { text-align: center; margin: 0; }
 .page-title {
@@ -59,12 +47,6 @@
   font-size: 18px; font-weight: 400; line-height: 1.55;
   color: var(--dlt-muted); margin: 14px auto 0; max-width: 560px;
 }
-.page-trial {
-  font-family: var(--dlt-font);
-  font-size: 16px; font-weight: 400; color: var(--dlt-muted);
-  text-align: center; margin: 0;
-}
-
 /* ---- Results (rendered inside the query card once a query runs) ---- */
 .dlt-section-label {
   font-family: var(--dlt-font);
@@ -99,7 +81,7 @@
   .run-arrow { animation: none; }
 }
 
-/* ---- loading skeleton (page 2, while the playground read resolves) ---- */
+/* ---- loading skeleton (while the playground read resolves) ---- */
 .dlt-skeleton {
   display: flex; gap: 16px; align-items: stretch; flex-wrap: wrap;
   animation: fade-in .25s ease;
@@ -161,60 +143,6 @@
   .dlt-scroll-cue.show { animation: none; }
 }
 
-/* ---- copy-for-agent prompt box (page 3) ---- */
-.pb-eyebrow {
-  font-family: var(--dlt-font);
-  font-size: 16px; font-weight: 600; color: var(--dlt-text);
-  text-align: left; margin: 4px 0 10px;
-}
-.pbo-a {
-  --agb-fill: var(--dlt-card);
-  display: flex; align-items: center; justify-content: space-between; gap: 16px;
-  border-radius: var(--dlt-radius); padding: 14px 16px;
-}
-.pbo-a .pb-text {
-  flex: 1; min-width: 0; font-size: 16px; line-height: 1.55;
-  color: var(--dlt-text); text-align: left;
-  font-family: var(--dlt-font);
-}
-.dlt-prompt-copy {
-  flex: none; display: inline-flex; align-items: center; justify-content: center; gap: 8px;
-  background: var(--dlt-accent); border: 1px solid var(--dlt-accent); border-radius: 6px;
-  padding: 12px 24px; cursor: pointer; color: var(--dlt-accent-fg);
-  font: 600 16px/1 var(--dlt-font); transition: background .12s ease, border-color .12s ease;
-}
-.dlt-prompt-copy:hover { background: color-mix(in oklch, var(--dlt-accent) 86%, black); border-color: color-mix(in oklch, var(--dlt-accent) 86%, black); }
-.dlt-prompt-copy svg { width: 18px; height: 18px; }
-.dlt-prompt-copy svg path[stroke="none"] { fill: var(--dlt-accent-fg); }
-.dlt-prompt-copy.copied { background: color-mix(in oklch, var(--dlt-accent) 86%, black); border-color: color-mix(in oklch, var(--dlt-accent) 86%, black); }
-
-/* Animated "AI" gradient border — brand conic gradient (purple→aqua→lime) drawn
-   in the border-box, with the fill in the padding-box. Override --agb-fill to
-   tint the inner surface. Mirrors the web client's signature onboarding effect. */
-@property --gradient-border-angle {
-  syntax: "<angle>";
-  inherits: false;
-  initial-value: 0deg;
-}
-@keyframes gradient-border-rotate {
-  to { --gradient-border-angle: 360deg; }
-}
-.animated-gradient-border {
-  --agb-fill: var(--dlt-card);
-  border: 2px solid transparent;
-  background:
-    linear-gradient(var(--agb-fill), var(--agb-fill)) padding-box,
-    conic-gradient(
-      from var(--gradient-border-angle),
-      var(--dlt-light-purple), var(--dlt-aqua), var(--dlt-lime),
-      var(--dlt-aqua), var(--dlt-light-purple)
-    ) border-box;
-  animation: gradient-border-rotate 3s linear infinite;
-}
-@media (prefers-reduced-motion: reduce) {
-  .animated-gradient-border { animation: none; }
-}
-
 /* ---- Results table ---- */
 .dlt-table-wrap { overflow: auto; height: 264px; box-sizing: border-box; padding: 10px 12px; }
 .dlt-table {
diff --git a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/action_button.py b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/action_button.py
index 7447c14..79390c3 100644
--- a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/action_button.py
+++ b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/action_button.py
@@ -3,6 +3,11 @@
 Replaces marimo's default buttons (which can't be themed - shadow DOM) so the
 query controls match the rest of the design. Each click increments `clicks`,
 which marimo treats as a reactive value.
+
+With `route` set, a click instead posts `{type: "dlthub:navigate", route}` to
+the embedding dltHub app, which validates the route against its allowlist and
+navigates for us — the iframe sandbox blocks the notebook from navigating
+anywhere itself. No-op when nothing is listening (standalone marimo).
 """
 
 from __future__ import annotations
@@ -29,6 +34,16 @@
   const ic = ICONS[model.get("icon")] || "";
   btn.innerHTML = ic + "<span>" + (model.get("label") || "") + "</span>";
   btn.addEventListener("click", () => {
+    const route = model.get("route");
+    if (route) {
+      // "*" is safe: the message carries no data, only a route name the
+      // parent checks against its own allowlist. No clicks sync — nothing
+      // reads it, and the trait change would re-run dependent cells.
+      if (window.parent !== window) {
+        window.parent.postMessage({ type: "dlthub:navigate", route: route }, "*");
+      }
+      return;
+    }
     model.set("clicks", (model.get("clicks") || 0) + 1);
     model.save_changes();
   });
@@ -76,4 +91,5 @@ class ActionButton(anywidget.AnyWidget):
     variant = traitlets.Unicode("secondary").tag(sync=True)
     icon = traitlets.Unicode("").tag(sync=True)
     size = traitlets.Unicode("md").tag(sync=True)
+    route = traitlets.Unicode("").tag(sync=True)
     clicks = traitlets.Int(0).tag(sync=True)
diff --git a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/clipboard_copy.py b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/clipboard_copy.py
deleted file mode 100644
index 6aee5da..0000000
--- a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/clipboard_copy.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""Invisible anywidget that wires up copy-to-clipboard for plain HTML buttons.
-
-marimo's HTML renderer strips inline ``onclick`` handlers (it rebuilds the markup
-as React elements), so a ``<button onclick=...>`` inside an ``mo.Html`` block never
-fires. This widget runs real JS in the page and installs a single delegated click
-listener for any ``.dlt-prompt-copy`` button. The button names what to copy via a
-``data-copy`` selector; on click we read that element's text, write it to the
-clipboard, and flash the button's ``.pb-copy-label`` to "Copied".
-
-It renders nothing visible — drop one instance anywhere on the page.
-"""
-
-from __future__ import annotations
-
-import anywidget
-import traitlets
-
-_ESM = r"""
-// execCommand isn't governed by the clipboard-write permissions policy, so it
-// still works inside an iframe where navigator.clipboard.writeText is blocked.
-function legacyCopy(text) {
-  return new Promise((resolve, reject) => {
-    try {
-      const ta = document.createElement("textarea");
-      ta.value = text;
-      ta.setAttribute("readonly", "");
-      ta.style.position = "fixed";
-      ta.style.top = "-9999px";
-      document.body.appendChild(ta);
-      ta.select();
-      const ok = document.execCommand("copy");
-      document.body.removeChild(ta);
-      ok ? resolve() : reject();
-    } catch (err) {
-      reject(err);
-    }
-  });
-}
-
-// Try the async Clipboard API, but fall back when it's missing OR rejects — e.g.
-// a permissions-policy violation inside the dltHub app's iframe.
-function copyText(text) {
-  if (window.isSecureContext && navigator.clipboard && navigator.clipboard.writeText) {
-    return navigator.clipboard.writeText(text).catch(() => legacyCopy(text));
-  }
-  return legacyCopy(text);
-}
-
-function render({ el }) {
-  el.style.display = "none";
-  if (window.__dltClipboardCopyBound) return;
-  window.__dltClipboardCopyBound = true;
-
-  document.addEventListener("click", (e) => {
-    const btn = e.target.closest && e.target.closest(".dlt-prompt-copy");
-    if (!btn) return;
-    // data-copy-text wins (lets the visible text use <br> without polluting the
-    // clipboard); otherwise read the element named by data-copy.
-    let text = btn.getAttribute("data-copy-text");
-    if (!text) {
-      const sel = btn.getAttribute("data-copy");
-      const src = sel && document.querySelector(sel);
-      text = src ? src.textContent.trim() : "";
-    }
-    text = (text || "").trim();
-    if (!text) return;
-    copyText(text).then(() => {
-      const lbl = btn.querySelector(".pb-copy-label");
-      btn.classList.add("copied");
-      const prev = lbl ? lbl.textContent : "";
-      if (lbl) lbl.textContent = "Copied";
-      setTimeout(() => {
-        btn.classList.remove("copied");
-        if (lbl) lbl.textContent = prev;
-      }, 1500);
-    }).catch(() => {});
-  });
-}
-export default { render };
-"""
-
-
-class ClipboardCopy(anywidget.AnyWidget):
-    _esm = _ESM
-    _css = ""
diff --git a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/scroll_cue.py b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/scroll_cue.py
index 1fbafb7..38b93de 100644
--- a/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/scroll_cue.py
+++ b/src/create_dlthub_workspace/scaffolds/minimal_workspace/notebooks/onboarding_success/widgets/scroll_cue.py
@@ -1,6 +1,6 @@
 """Invisible widget that floats a down-arrow when there's content below the fold
 and smooth-scrolls to the bottom on click. Styled via onboarding_shell.css
-(.dlt-scroll-cue), like the ClipboardCopy button.
+(.dlt-scroll-cue).
 
 marimo's run-mode app scrolls an inner container, not the window, so we detect
 the tallest scrollable element instead of assuming the document scrolls.
diff --git a/src/create_dlthub_workspace/uv.py b/src/create_dlthub_workspace/uv.py
index 74183ad..45c46ff 100644
--- a/src/create_dlthub_workspace/uv.py
+++ b/src/create_dlthub_workspace/uv.py
@@ -70,25 +70,6 @@ def run_uv_command(
     _run(command, cwd=project_dir, isolated_project=True, verbose=verbose)
 
 
-def capture_uv_command(uv_executable: str, project_dir: Path, args: list[str]) -> str:
-    """Run a uv command in the generated workspace and return its captured stdout."""
-    try:
-        result = subprocess.run(
-            [uv_executable, *args],
-            cwd=project_dir,
-            env=_isolated_project_env(),
-            capture_output=True,
-            text=True,
-            check=True,
-        )
-    except FileNotFoundError as exc:
-        raise UvError(strings.ERROR_UV_COMMAND_NOT_FOUND.format(cmd=uv_executable)) from exc
-    except subprocess.CalledProcessError as exc:
-        joined = " ".join([uv_executable, *args])
-        raise UvError(strings.ERROR_UV_COMMAND_FAILED.format(returncode=exc.returncode, cmd=joined)) from exc
-    return result.stdout
-
-
 def _run_unix_installer(*, verbose: bool = False) -> None:
     try:
         with urllib.request.urlopen(UV_UNIX_INSTALLER, timeout=30) as response:
diff --git a/tests/test_cli.py b/tests/test_cli.py
index a5165e6..5b611d7 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -11,7 +11,7 @@
 from unittest.mock import MagicMock, patch
 
 from create_dlthub_workspace import strings
-from create_dlthub_workspace.cli import _entry_skill_path, _launch_agent, _workspace_in_list, build_parser, main, run
+from create_dlthub_workspace.cli import _entry_skill_path, _launch_agent, build_parser, main, run
 from create_dlthub_workspace.config import PLAYGROUND_WORKSPACE, RECOMMENDED
 from create_dlthub_workspace.errors import UvError, WorkspaceDirectoryNotEmptyError, WorkspaceError
 from create_dlthub_workspace.scaffold import TargetResolution
@@ -141,7 +141,6 @@ def _make_args(**overrides: object) -> argparse.Namespace:
     "execute_uv_install",
     "run_uv_sync",
     "run_uv_command",
-    "capture_uv_command",
     "copy_to_clipboard",
     "_agent_launchable",
     "_launch_agent",
@@ -169,7 +168,6 @@ def setUp(self) -> None:
         self.m["copy_to_clipboard"].return_value = True
         self.m["_agent_launchable"].return_value = True
         self.m["_launch_agent"].return_value = False
-        self.m["capture_uv_command"].return_value = "Name\n----\n"
         self.m["resolve_workspace_target"].return_value = TargetResolution(Path("/tmp/test_workspace"), None)
 
     def _run(self, **overrides: object) -> None:
@@ -312,9 +310,7 @@ def test_scaffold_only_stops_after_install_but_adds_agent_files(self) -> None:
         self.assertTrue(kwargs["needs_deps"])
         self.assertFalse(kwargs.get("needs_uv_install", False))
 
-    def test_login_connect_creates_playground_when_absent(self) -> None:
-        self.m["capture_uv_command"].return_value = "Name\n----\nMy Workspace\n"
-
+    def test_login_then_connects_playground(self) -> None:
         self._run()
 
         run_uv_command = self.m["run_uv_command"]
@@ -322,21 +318,12 @@ def test_login_connect_creates_playground_when_absent(self) -> None:
         login_args = run_uv_command.call_args_list[0].args[2]
         connect_args = run_uv_command.call_args_list[1].args[2]
         self.assertEqual(login_args, ["run", "dlthub", "login"])
-        self.assertEqual(connect_args, ["run", "dlthub", "workspace", "connect", PLAYGROUND_WORKSPACE, "--create"])
+        # The account always has a playground workspace, so we connect without --create.
+        self.assertEqual(connect_args, ["run", "dlthub", "workspace", "connect", PLAYGROUND_WORKSPACE])
         # Login and connect run quietly (output surfaces only on error); nothing streams.
         self.assertFalse(any(c.kwargs["verbose"] for c in run_uv_command.call_args_list))
         self.assertFalse(any(c.kwargs.get("stream", False) for c in run_uv_command.call_args_list))
 
-    def test_login_connect_skips_create_when_playground_exists(self) -> None:
-        self.m[
-            "capture_uv_command"
-        ].return_value = f"Name        Organization\n----------  ------------\n{PLAYGROUND_WORKSPACE}  Personal\n"
-
-        self._run()
-
-        connect_args = self.m["run_uv_command"].call_args_list[1].args[2]
-        self.assertEqual(connect_args, ["run", "dlthub", "workspace", "connect", PLAYGROUND_WORKSPACE])
-
     @patch("create_dlthub_workspace.cli.console")
     def test_relocation_notice_printed_only_when_relocated(self, console: MagicMock) -> None:
         def printed_relocation() -> bool:
@@ -368,7 +355,6 @@ def _run_with(self, **flags: bool) -> MagicMock:
             patch("create_dlthub_workspace.cli.find_uv", return_value="/usr/local/bin/uv"),
             patch("create_dlthub_workspace.cli.run_uv_sync"),
             patch("create_dlthub_workspace.cli.run_uv_command"),
-            patch("create_dlthub_workspace.cli.capture_uv_command", return_value="Name\n----\n"),
             patch("create_dlthub_workspace.cli.copy_to_clipboard", return_value=False),
             patch("create_dlthub_workspace.cli.print_created_tree"),
             patch("create_dlthub_workspace.cli.confirm", return_value=False),
@@ -425,33 +411,5 @@ def test_returns_false_when_spawn_fails(self, _which: MagicMock, _run: MagicMock
             self.assertFalse(_launch_agent(Path("/tmp/ws"), "claude", prompt="x"))
 
 
-class WorkspaceInListTests(unittest.TestCase):
-    """Parsing of `dlthub workspace list` output (space-padded table, Name first)."""
-
-    # Mirrors the real CLI output: header, separator, then space-padded rows.
-    SAMPLE = (
-        "Name                 Organization         ID                                    Role\n"
-        "-------------------  -------------------  ------------------------------------  ------\n"
-        "My Workspace         Personal Workspaces  927a586a-9d98-40ae-a70d-46b02ee19d80  owner\n"
-        "playground           Personal Workspaces  ebe84413-790a-41c1-9947-37ce70a491d9  owner\n"
-    )
-
-    def test_detects_existing_workspace(self) -> None:
-        self.assertTrue(_workspace_in_list(self.SAMPLE, "playground"))
-
-    def test_absent_workspace_returns_false(self) -> None:
-        self.assertFalse(_workspace_in_list(self.SAMPLE, "Sandbox"))
-
-    def test_matches_name_with_internal_spaces(self) -> None:
-        # "My Workspace" has a single internal space; columns split on 2+ spaces.
-        self.assertTrue(_workspace_in_list(self.SAMPLE, "My Workspace"))
-
-    def test_header_and_separator_rows_are_ignored(self) -> None:
-        self.assertFalse(_workspace_in_list(self.SAMPLE, "Name"))
-
-    def test_empty_output_returns_false(self) -> None:
-        self.assertFalse(_workspace_in_list("", "Playground"))
-
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_workspace_scripts.py b/tests/test_workspace_scripts.py
index 810125f..4a8e931 100644
--- a/tests/test_workspace_scripts.py
+++ b/tests/test_workspace_scripts.py
@@ -1,11 +1,9 @@
 from __future__ import annotations
 
 import io
-import os
 import re
-import runpy
 import sys
-import tempfile
+import runpy
 import unittest
 from contextlib import redirect_stdout
 from pathlib import Path
@@ -16,18 +14,12 @@
 SCRIPTS = SCAFFOLDS_DIR / "minimal_workspace" / ".scripts"
 
 
-def _run(script: Path, argv: list[str], app_url: str | None = None):
+def _run(script: Path, argv: list[str]):
     """Return (exit_code, stdout, exit_message, browser_mock)."""
-    env = dict(os.environ)
-    if app_url is None:
-        env.pop("DLTHUB_APP_URL", None)
-    else:
-        env["DLTHUB_APP_URL"] = app_url
     out = io.StringIO()
     code, msg = 0, None
     with (
         mock.patch.object(sys, "argv", argv),
-        mock.patch.dict(os.environ, env, clear=True),
         mock.patch("webbrowser.open") as browser,
         redirect_stdout(out),
     ):
@@ -41,16 +33,8 @@ def _run(script: Path, argv: list[str], app_url: str | None = None):
     return code, out.getvalue(), msg, browser
 
 
-def _workspace_with_config(tmp: Path, body: str) -> Path:
-    (tmp / ".dlt").mkdir(parents=True)
-    (tmp / ".dlt" / "config.toml").write_text(body)
-    (tmp / ".scripts").mkdir()
-    for name in ("show_notebook.py", "serve_headless.py"):
-        (tmp / ".scripts" / name).write_text((SCRIPTS / name).read_text())
-    return tmp
-
-
 class ScriptsRequireRefTests(unittest.TestCase):
+    # Arg-checks run before `import dlt_runtime`, so these work without it installed.
     def test_show_notebook_requires_ref(self) -> None:
         code, _, msg, browser = _run(SCRIPTS / "show_notebook.py", ["show_notebook.py"])
         self.assertEqual(code, 1)
@@ -58,7 +42,6 @@ def test_show_notebook_requires_ref(self) -> None:
         browser.assert_not_called()
 
     def test_serve_headless_requires_ref(self) -> None:
-        # Arg-check runs before `import dlt_runtime`, so this works without it installed.
         code, _, msg, _ = _run(SCRIPTS / "serve_headless.py", ["serve_headless.py"])
         self.assertEqual(code, 1)
         self.assertIn("usage", (msg or "").lower())
@@ -76,41 +59,5 @@ def test_scripts_reference_a_deployed_job(self) -> None:
                 )
 
 
-class ShowNotebookUrlTests(unittest.TestCase):
-    CONFIG = '[runtime]\nworkspace_id = "ws-123"\n'
-
-    def test_builds_show_url_and_opens_browser(self) -> None:
-        with tempfile.TemporaryDirectory() as d:
-            ws = _workspace_with_config(Path(d), self.CONFIG)
-            code, out, _, browser = _run(
-                ws / ".scripts" / "show_notebook.py", ["show_notebook.py", "jobs.onboarding_success"]
-            )
-        url = "https://app.dlthub.com/w/ws-123/notebooks/jobs.onboarding_success/show?hide_header=true"
-        self.assertEqual(code, 0)
-        self.assertIn(url, out)
-        browser.assert_called_once_with(url)
-
-    def test_respects_app_url_override(self) -> None:
-        with tempfile.TemporaryDirectory() as d:
-            ws = _workspace_with_config(Path(d), self.CONFIG)
-            code, out, _, browser = _run(
-                ws / ".scripts" / "show_notebook.py",
-                ["show_notebook.py", "jobs.onboarding_success"],
-                app_url="https://app.dlthub.test/",
-            )
-        self.assertEqual(code, 0)
-        self.assertIn("https://app.dlthub.test/w/ws-123/", out)
-
-    def test_errors_when_workspace_id_missing(self) -> None:
-        with tempfile.TemporaryDirectory() as d:
-            ws = _workspace_with_config(Path(d), '[runtime]\nlog_level = "INFO"\n')
-            code, _, msg, browser = _run(
-                ws / ".scripts" / "show_notebook.py", ["show_notebook.py", "jobs.onboarding_success"]
-            )
-        self.assertEqual(code, 1)
-        self.assertIn("workspace_id", msg or "")
-        browser.assert_not_called()
-
-
 if __name__ == "__main__":
     unittest.main()