diff --git a/installation.mdx b/installation.mdx
index a0178a7..c2c8d6f 100644
--- a/installation.mdx
+++ b/installation.mdx
@@ -131,6 +131,8 @@ Docker is the default and works on all three platforms. Apple Container is an op
 | `NANOCLAW_AGENT_NAME` | Set the messaging-channel agent name; the CLI scratch agent remains `Terminal Agent` |
 | `SECRET_NAME` | OneCLI secret name for `setup/register-claude-token.sh` (default: `Anthropic`) |
 | `HOST_PATTERN` | OneCLI host pattern for `setup/register-claude-token.sh` (default: `api.anthropic.com`) |
+| `NANOCLAW_SETUP_ASSIST_MODE` | Set to `1` (or pass `--assist-mode`) to use the legacy non-interactive Claude assist on failure instead of the default interactive handoff |
+| `NANOCLAW_SKIP_CLAUDE_ASSIST` | Set to `1` to skip the Claude handoff/assist offer entirely when a step fails |
 
 If OneCLI is already installed and configured, setup asks whether to reuse it. For custom Anthropic-compatible model endpoints, set `ANTHROPIC_BASE_URL` and `ANTHROPIC_AUTH_TOKEN` in `.env`.
 
diff --git a/quickstart.mdx b/quickstart.mdx
index 72c275e..6027ec9 100644
--- a/quickstart.mdx
+++ b/quickstart.mdx
@@ -40,7 +40,9 @@ This guide covers the default installer. If you want to skip steps, reuse an exi
     - Pairing your first channel (Telegram, Discord, WhatsApp, Signal, Teams, Slack, iMessage, or the local CLI)
     - Installing a systemd or launchd service so NanoClaw starts with your machine
 
-    If any step fails, Claude Code is invoked automatically to diagnose and resume from where it broke. You don't have to debug the installer yourself.
+    If any step fails, the installer offers to hand off to an interactive Claude session preloaded with the failure context, the relevant source files, and the raw step log. You debug with full terminal access and type `/exit` (or press Ctrl-D) when you're ready to resume setup.
+
+    Set `NANOCLAW_SETUP_ASSIST_MODE=1` (or pass `--assist-mode`) to use the legacy non-interactive assist that proposes a single fix command instead. Set `NANOCLAW_SKIP_CLAUDE_ASSIST=1` to disable the handoff entirely.
   </Step>
 
   <Step title="Answer the setup prompts">