@zenrows/cli 1.8.0 → 1.10.0

package/README.md

@@ -37,7 +37,7 @@ that endpoint with extraction parameters, not a separate product.
 | Command | What it does | Status (this build) |
 | --- | --- | --- |
 | `zenrows fetch` | Fetch: retrieve a protected page | **available**: `GET https://api.zenrows.com/v1/` |
-| `zenrows extract` | Extract: turn a page into structured data with `extract=auto` on any prepared domain (falls back to Autoparse on one not prepared yet), CSS selectors, or Markdown | **available**: `GET https://api.zenrows.com/v1/?extract=auto` |
+| `zenrows extract` | Extract: turn a page into structured data with `extract=auto` on any prepared domain (prepare one yourself with `zenrows extract prepare`), CSS selectors, or Markdown | **available**: `GET https://api.zenrows.com/v1/?extract=auto` |
 | `zenrows batch` | Batch: run Fetch and Extract over many URLs in one job; specs validate and estimate locally with no key | **available**: `POST https://async.api.zenrows.com/v1/jobs` |
 | `zenrows crawl` | Crawl (new): collect the URLs behind one start page, optionally with each page's HTML | **available**: `POST https://api.zenrows.com/v1/crawls` |
 | `zenrows browser` | Browser Sessions: a real cloud browser over REST (same backend as MCP `browser_*`); escalation-only, billed by bandwidth + time | **available**: `POST https://mcp.zenrows.com/browser/sessions` |
@@ -56,7 +56,7 @@ npm install -g @zenrows/cli # puts `zenrows` on PATH (466 ms, zero deps)
 zenrows init
 zenrows fetch https://httpbin.io/html # auto-provisions a Free plan account on first use
 zenrows extract https://www.owler.com/company/meltwater # extract=auto on a prepared domain
-zenrows extract https://www.scrapingcourse.com/ecommerce/ --autoparse # Autoparse (any domain)
+zenrows extract https://www.scrapingcourse.com/ecommerce/ --css '{"title":"h1"}' # CSS selectors (any domain)
 ```
 
 > Prefer no global install? Prefix each command with `npx -y @zenrows/cli`
@@ -83,6 +83,18 @@ unclaimed Zenrows Free plan account**, stores the key in `.zenrows/secrets.json`
 (0600, gitignored), and records the account in `.zenrows/account.json`
 (no secret — just the accountId, Free-period info, and a claim link).
 
+Zenrows may first ask the agent one short question before it creates the
+account. The command then fails with `SIGNUP_CHALLENGE` and prints the
+question; answer it and re-run the original command:
+
+```bash
+zenrows signup --answer "<your answer>"
+```
+
+A wrong or late answer gets a new question. Too many questions or wrong
+answers from one network pause signups there for an hour
+(`SIGNUP_CHALLENGE_LOCKED`).
+
 When you (or your agent) want to keep the usage and history, **claim** the
 account — this confirms an email (Google, GitHub or a 6-digit code); the same
 key keeps working:
@@ -96,10 +108,11 @@ zenrows usage          # plan usage, credits & concurrency (does not count again
 Opt out of auto-provisioning at any time:
 
 ```bash
-zenrows fetch <url> --no-signup # do not auto-create an account for this call
-zenrows signup --agent          # explicitly provision a Free plan account, headless
-zenrows login --api-key <key>   # use an existing key (stored 0600, gitignored)
-zenrows login --env             # use the ZENROWS_API_KEY environment variable
+zenrows fetch <url> --no-signup  # do not auto-create an account for this call
+zenrows signup --agent           # explicitly provision a Free plan account, headless
+zenrows signup --answer "<text>" # answer the signup question (SIGNUP_CHALLENGE)
+zenrows login --api-key <key>    # use an existing key (stored 0600, gitignored)
+zenrows login --env              # use the ZENROWS_API_KEY environment variable
 ```
 
 Set `auto_signup: false` in `.zenrows/policy.json` to disable auto-provisioning
@@ -118,12 +131,28 @@ zenrows fetch <url> --proxy-country us --wait-for ".price"
 
 ```bash
 zenrows extract https://www.owler.com/company/meltwater                # extract=auto (prepared domain)
-zenrows extract https://www.scrapingcourse.com/ecommerce/ --autoparse   # Autoparse (any domain)
+zenrows extract https://www.scrapingcourse.com/ecommerce/ --autoparse   # deprecated Autoparse (any domain)
 zenrows extract <url> --css '{"title":"h1","price":".price"}' --validate
 zenrows extract <url> --outputs emails,links                            # built-in output filters → JSON
 zenrows extract <url> --output markdown
 ```
 
+On a domain Extract hasn't prepared yet, `zenrows extract` fails with
+`EXTRACT_DOMAIN_NOT_PREPARED` (API code REQS007) and prints the command to
+prepare it. Preparing takes a few minutes and costs no credits; each new domain
+uses one slot of the monthly allowance. `EXTRACT_PAGE_NOT_RECOGNISED` (also
+REQS007) is different: the domain is prepared, but this page is not one Extract
+extracts. Try a product, article or listing page instead, retry it once in a
+few minutes if it should work, or use `--css`; preparing again does not change
+it. `zenrows extract` never falls back to Autoparse. The `fallbackAutoparse`
+adapter option is deprecated and has no effect.
+
+```bash
+zenrows extract prepare example.com --url https://example.com/p/1 --url https://example.com/list --wait
+zenrows extract prepare status example.com   # progress + monthly allowance
+zenrows extract https://example.com/p/1      # then extract again
+```
+
 ## 9. Batch
 
 Zenrows **Batch** (`https://async.api.zenrows.com/v1`) fans a

package/agent-plugin/README.md

@@ -62,7 +62,7 @@ Use MCP tool names — not CLI `zenrows fetch`:
 | --- | --- |
 | `zenrows` | Decision tree across all primitives |
 | `protected-fetch` | `scrape` |
-| `extract` | `extract` (fallback: `scrape` + autoparse / css_extractor) |
+| `extract` | `extract` (fallback: `scrape` + css_extractor); on REQS007 with reason `domain_not_prepared`, `prepare_domain` then `prepared_domain_status` |
 | `batch-jobs` | `batch_create`, `batch_status`, `batch_results`, `batch_cancel` |
 | `interact-browser` | `browser_*` (escalation only) |
 | `cost-control` | Cost multipliers + escalate-with-evidence |

package/agent-plugin/skills/cost-control/SKILL.md

@@ -19,8 +19,8 @@ These multipliers apply when you enable the flags (on `scrape` or `extract`):
 - Both: **25×**
 
 `extract` `mode=auto` is currently free; billing may apply
-later. Do not promise permanent free extract pricing. Autoparse / CSS still
-follow the multipliers above when stealth flags are set.
+later. Do not promise permanent free extract pricing. CSS (and the deprecated
+Autoparse) still follow the multipliers above when stealth flags are set.
 
 ## Browser sessions (`browser_*`)
 

package/agent-plugin/skills/extract/SKILL.md

@@ -14,28 +14,67 @@ Convert protected pages into structured data. Value is **protected page access
 Use **`extract`** when you need structured JSON fields rather than a full page:
 
 ```
-extract({ url })                                    # mode=auto (default)
-extract({ url, mode: "autoparse" })                 # general Autoparse (any domain)
+extract({ url })                                    # mode=auto (default), returns `parsed` only
+extract({ url, include_html: true })                # also return the full page HTML
+extract({ url, mode: "autoparse" })                 # deprecated Autoparse (any domain)
 extract({ url, mode: "css", css_extractor: '{"title":"h1","price":".price"}' })
 extract({ url, proxy_country: "US" })               # geo-targeted
 ```
 
-`mode=auto` (`extract=auto`) works on any domain Zenrows has prepared, with any
-key, and is currently free; billing may apply later. If the
-domain is not enabled (AUTH010) or not prepared yet (REQS007), the tool retries
-once with Autoparse by default (`fallback_autoparse`).
+`mode=auto` (`extract=auto`) works on any prepared domain, with any key, and
+is currently free; billing may apply later. The result carries `parsed` only;
+the page HTML is most of the response size, so ask for it with
+`include_html: true` only when you need it.
 
 Every mode uses Adaptive Stealth Mode by default: pass just the URL, even for
 protected or dynamic sites. Set `js_render` or `premium_proxy` only to force a
 fixed configuration; that turns Adaptive Stealth Mode off. Check `empty` in the
 result: true means no field came back with a value.
 
+## REQS007: prepare the domain, then extract again
+
+`mode=auto` works on any prepared domain, and you can prepare one yourself.
+When Extract refuses a page, `extract` returns a tool error with code
+`REQS007` (legacy `AUTH010`) and a `reason`. It never retries with Autoparse.
+`fallback_autoparse` is deprecated and has no effect; don't send it.
+
+| `reason` | Meaning | Next step |
+| --- | --- | --- |
+| `domain_not_prepared` | The domain is not prepared yet. | `prepare_domain` (the error's `next_tool` holds its arguments), then poll, then `extract` again. |
+| `page_not_recognised` | The domain is prepared, but Extract did not recognise this page as one it can extract (a page with nothing to extract, such as a home page, or a transient failure). | Try a product, article or listing page on the same site instead. If this page should work, retry it once in a few minutes; do not retry in a loop. Otherwise use `mode=css`. Do not call `prepare_domain`: preparing again does not change this. |
+| `domain_not_enabled` | Extract is not enabled for the site. | Use `mode=css`, or contact Zenrows support to have the site enabled. Preparing does not change this. |
+
+Preparing a domain:
+
+```
+extract({ url })                                          # 1. REQS007, reason domain_not_prepared
+prepare_domain({ domain: "example.com",
+  example_urls: ["https://example.com/p/1", "https://example.com/list"] })
+                                                          # 2. returns at once, status "preparing"
+prepared_domain_status({ domain: "example.com" })         # 3. about every 30 seconds until "ready"
+extract({ url })                                          # 4. extract again
+```
+
+- `example_urls`: 1 to 5 real pages you want to extract, one per page kind
+  (for example a product page and a listing page).
+- The domain is the host: `shop.example.com` and `example.com` are prepared
+  separately, and a leading `www.` is dropped.
+- Preparing takes a few minutes and costs no credits. Each new domain uses one
+  slot of the account's monthly allowance; `prepared_domain_status` returns it
+  (`used` / `limit` / `remaining`) and a `next` field with what to do now.
+- `out_of_allowance`: no slots left this month; use `mode=css`.
+  `overloaded` / `disabled`: retry in a few minutes; do not loop.
+  A `failed` status carries `failure.code` and `failure.slot_consumed`; follow `next`.
+- A domain that is already prepared answers `ready` at once
+  (`already_prepared: true`) and uses no slot: call `extract`. If it then
+  returns `page_not_recognised`, follow that row of the table, not `prepare_domain`.
+
 ## Fallback: `scrape` extraction params
 
 If `extract` is unavailable, similar outcomes are available on **`scrape`**:
 
 ```
-scrape({ url, autoparse: true })
+scrape({ url, autoparse: true })                    # deprecated
 scrape({ url, css_extractor: '{"title":"h1","price":".price"}' })
 scrape({ url, outputs: "emails,links" })            # or "*" for all built-ins
 ```
@@ -46,7 +85,8 @@ scrape({ url, outputs: "emails,links" })            # or "*" for all built-ins
 ## When to use which
 
 - **`mode=auto`**: site-tailored fields on any prepared domain.
-- **`mode=autoparse`**: any website; also the automatic AUTH010 / REQS007 fallback.
+- **`mode=autoparse`** (deprecated): any website, only when asked for. Do not
+  build new work on it.
 - **`mode=css`**: known fields/selectors; deterministic.
 - **Markdown via `scrape`**: feed clean content to an LLM yourself.
 
@@ -57,7 +97,7 @@ Stealth flags (`js_render`, `premium_proxy`) still apply the usual multipliers
 ## Rules
 
 - Validate on a single page before `batch_create` ([[batch-jobs]]).
-- If Autoparse misses fields, switch to `css_extractor`, or add `js_render`
+- If a field is missing, switch to `css_extractor`, or add `js_render`
   for JS-heavy pages.
 - Prefer MCP `extract` / `scrape` over CLI `zenrows extract` when the MCP
   server is connected.

package/agent-plugin/skills/interact-browser/SKILL.md

@@ -27,8 +27,10 @@ cannot handle. **Escalation only.**
 6. Always `browser_close` when done
 
 Other useful tools: `browser_evaluate`, cookies (`browser_get_cookies` /
-`browser_set_cookies` / `browser_clear_cookies`), `browser_local_storage`,
-tabs (`browser_new_tab` / `browser_switch_tab`), `browser_generate_pdf`.
+`browser_set_cookies` / `browser_clear_cookies`), local storage
+(`browser_get_local_storage` / `browser_set_local_storage` /
+`browser_clear_local_storage`), tabs (`browser_new_tab` / `browser_switch_tab`),
+`browser_generate_pdf`.
 
 ## Rules
 

package/agent-plugin/skills/protected-fetch/SKILL.md

@@ -34,7 +34,7 @@ scrape({ url, js_render: true, wait_for: ".price" })
 - Prefer `response_type: "markdown"` for LLM consumption; use `html` only when
   you need raw markup.
 - For **structured** fields, prefer the `extract` tool (or `scrape` with
-  `autoparse` / `css_extractor` / `outputs`) — see [[extract]].
+  `css_extractor` / `outputs`) — see [[extract]].
 - On failure, escalate with evidence before `browser_*` ([[interact-browser]]).
 - Cost model: [[cost-control]].
 

package/agent-plugin/skills/zenrows/SKILL.md

@@ -20,7 +20,10 @@ You do **not** need an API key in the plugin package.
 
 - **stdio** (`npx -y @zenrows/mcp`): on first cloud call the server can
   auto-create a **free, unclaimed** Zenrows Free plan account and persist the
-  key locally. When the Free plan nears its limit (or the user asks), surface
+  key locally. Zenrows may first ask one short question (which word is a
+  bird, which word does not belong): the tool call
+  returns it; answer it yourself with the `account_signup_answer` tool, then
+  retry the call. When the Free plan nears its limit (or the user asks), surface
   the **claim URL** so a human can claim the account (confirming an email
   with Google, GitHub or a 6-digit code). Claim links expire after 30 days. The
   same key keeps working after claim. Never handle payment or upgrades —
@@ -37,7 +40,7 @@ If the user has a known URL and wants page content:
 
 If the user has a known URL and wants structured data:
   → Use Extract.                    (MCP tool: extract)
-                                     Fallback: scrape with autoparse / css_extractor / outputs
+                                     Fallback: scrape with css_extractor / outputs
 
 If the user has many URLs (bulk):
   → Use Batch.                      (validate one page with scrape/extract first,
@@ -67,7 +70,8 @@ If the user needs login, clicks, forms, sessions, or persistent state:
 | Primitive | MCP tools | Notes |
 | --- | --- | --- |
 | Protected Fetch | `scrape` | Default markdown; HTML / plaintext / PDF / screenshot options |
-| Extract | `extract` | Structured JSON (`extract=auto`, autoparse, css_extractor). `extract=auto` is currently free; billing may apply later |
+| Extract | `extract` | Structured JSON (`extract=auto` on any prepared domain, css_extractor; autoparse deprecated). `extract=auto` is currently free; billing may apply later |
+| Prepare a domain | `prepare_domain`, `prepared_domain_status` | After an `extract` REQS007 with reason `domain_not_prepared`: prepare the domain with 1 to 5 example URLs, poll about every 30 seconds until ready, extract again. No credits; uses one monthly allowance slot. Not for `page_not_recognised`: that domain is already prepared |
 | Batch | `batch_create`, `batch_status`, `batch_results`, `batch_cancel` | Same credits as Fetch; a 403 maps to `BATCH_ACCESS_DENIED` |
 | Browser | `browser_*` (start with `browser_navigate`) | Escalation-only; same backend as Browser Sessions |
 

package/dist/src/adapters/extract.js

@@ -1,17 +1,26 @@
 import { ToolkitError } from "../core/errors.js";
+import { log } from "../core/logger.js";
 import { runFetch } from "./protected-fetch.js";
-/** True when a parsed extraction result carries no usable structured data. */
-function isEmptyData(data) {
+/**
+ * True when a parsed extraction result carries no usable structured data: null,
+ * a blank string, or an array / object whose every value is itself empty. So
+ * `{"title": null, "items": [], "author": {"name": ""}}` is empty. Numbers and
+ * booleans are values, so `0` and `false` count as data.
+ */
+export function isEmptyData(data) {
     if (data === null || data === undefined)
         return true;
-    if (Array.isArray(data))
-        return data.length === 0;
-    if (typeof data === "object")
-        return Object.keys(data).length === 0;
     if (typeof data === "string")
         return data.trim() === "";
+    if (Array.isArray(data))
+        return data.every(isEmptyData);
+    if (typeof data === "object")
+        return Object.values(data).every(isEmptyData);
     return false;
 }
+/** The warning a caller that still passes `fallbackAutoparse: true` gets. */
+export const FALLBACK_AUTOPARSE_DEPRECATION = "fallbackAutoparse is deprecated and has no effect: Extract no longer falls back to Autoparse. " +
+    "On REQS007, prepare the domain with `zenrows extract prepare <domain> --url <page>` instead.";
 export async function runExtract(opts, config, policy, apiKey) {
     const method = opts.method ?? (opts.outputs ? "outputs" : opts.cssExtractor ? "css" : "extract");
     if (method === "css" && !opts.cssExtractor) {
@@ -30,18 +39,8 @@ export async function runExtract(opts, config, policy, apiKey) {
             next_action: `Pass one or more filters, e.g. --outputs emails,links (or --outputs '*').`,
         });
     }
-    if (method === "extract" && opts.fallbackAutoparse !== false) {
-        try {
-            return await runExtractOnce({ ...opts, method: "extract" }, config, policy, apiKey);
-        }
-        catch (err) {
-            if (err instanceof ToolkitError && err.code === "EXTRACT_DOMAIN_NOT_ENABLED") {
-                const outcome = await runExtractOnce({ ...opts, method: "autoparse" }, config, policy, apiKey);
-                return { ...outcome, fellBackToAutoparse: true };
-            }
-            throw err;
-        }
-    }
+    if (opts.fallbackAutoparse === true)
+        log.warn(FALLBACK_AUTOPARSE_DEPRECATION);
     return runExtractOnce({ ...opts, method }, config, policy, apiKey);
 }
 async function runExtractOnce(opts, config, policy, apiKey) {
@@ -101,7 +100,7 @@ function parseExtractBody(method, body, opts) {
         }
     }
     const empty = isEmptyData(data);
-    // ACT-1514: an empty result must not read as a silent success. Under
+    // An empty result must not read as a silent success. Under
     // --validate it's an error; otherwise the command surfaces a warning.
     if (opts.validate && empty) {
         throw new ToolkitError({

package/dist/src/cli/commands/extract-prepare.js

@@ -0,0 +1,168 @@
+/**
+ * `zenrows extract prepare <domain> --url <u> [--url <u>...] [--wait]` and
+ * `zenrows extract prepare status <domain>`.
+ *
+ * The way out of REQS007: prepare the domain so `extract=auto` works on it.
+ * Submitting returns at once; `--wait` polls until the preparation is ready or
+ * failed (a few minutes). Costs no credits; each new domain uses one slot of the
+ * account's monthly allowance.
+ */
+import { ensureApiKey } from "../../core/ensure-key.js";
+import { loadConfig } from "../../core/config.js";
+import { loadPolicy } from "../../core/policy.js";
+import { log } from "../../core/logger.js";
+import { ToolkitError } from "../../core/errors.js";
+import { DEFAULT_WAIT_TIMEOUT_MS, MAX_EXAMPLE_URLS, failureNextStep, getAllowance, getPreparedDomain, normalizeDomain, prepareDomain, statusNextStep, waitForPreparedDomain, } from "../../core/prepared-domains-api.js";
+import { parse, asString } from "../command.js";
+import { printError } from "../output.js";
+export const PREPARE_USAGE = "zenrows extract prepare <domain> --url <page-url> [--url <page-url>...] [--wait [--timeout <seconds>]]\n" +
+    "       zenrows extract prepare status <domain>";
+export const PREPARE_HELP = [
+    "Prepare a domain so `zenrows extract <url>` (extract=auto) works on it. Use it when an",
+    "extract fails with EXTRACT_DOMAIN_NOT_PREPARED (REQS007: the domain is not prepared yet).",
+    "Not for EXTRACT_PAGE_NOT_RECOGNISED: that domain is already prepared, and preparing it",
+    "again does not change that answer.",
+    "",
+    `  --url <page-url>       1 to ${MAX_EXAMPLE_URLS} real pages you want to extract, one per page kind (repeat --url)`,
+    "  --wait                 poll every 30 seconds until the domain is ready or failed; off by default",
+    `  --timeout <seconds>    give up waiting after this long (default ${DEFAULT_WAIT_TIMEOUT_MS / 1000})`,
+    "  status <domain>        show progress and the account's monthly allowance",
+    "  --json                 structured result",
+    "",
+    "Preparing takes a few minutes and costs no credits. Each new domain uses one slot of the",
+    "account's monthly allowance; a domain that is already prepared answers ready at once and",
+    "uses none. The domain is the host (shop.example.com and example.com are separate); a",
+    "leading www. is dropped.",
+].join("\n");
+export async function runPrepare(argv, ctx, deps = {}) {
+    const isStatus = argv[0] === "status";
+    const { values, positionals } = parse(isStatus ? argv.slice(1) : argv, {
+        url: { type: "string", multiple: true },
+        wait: { type: "boolean" },
+        timeout: { type: "string" },
+        json: { type: "boolean" },
+        help: { type: "boolean" },
+    });
+    const json = ctx.json || values.json === true;
+    try {
+        const raw = positionals[0];
+        if (!raw) {
+            throw new ToolkitError({
+                code: "INVALID_USAGE",
+                message: "Missing domain.",
+                likely_cause: "No <domain> was given.",
+                next_action: `Usage: ${PREPARE_USAGE}`,
+                suggested_commands: ["zenrows extract prepare example.com --url https://example.com/products/1"],
+            });
+        }
+        const domain = normalizeDomain(raw);
+        const urls = isStatus ? [] : validateUrls(values.url, domain);
+        const timeoutMs = parseTimeout(asString(values.timeout));
+        const policy = loadPolicy();
+        const apiKey = deps.apiKey ??
+            // Preparing never creates a Free plan account: it needs a key the user already has.
+            (await ensureApiKey({ ...policy, auto_signup: false }));
+        const opts = { apiKey, apiBase: loadConfig().apiBase, fetchImpl: deps.fetchImpl };
+        if (isStatus) {
+            const [record, allowance] = await Promise.all([getPreparedDomain(domain, opts), getAllowance(opts).catch(() => undefined)]);
+            report(record, allowance, json);
+            return 0;
+        }
+        log.step(`Prepare ${domain} for Extract (${urls.length} example URL${urls.length === 1 ? "" : "s"})…`);
+        let record = await prepareDomain(domain, urls, opts);
+        if (record.already_in_progress)
+            log.info(`${domain} was already being prepared; following that preparation.`);
+        // A submit that answers ready at once found the domain already prepared.
+        const alreadyReady = record.status === "ready" && !record.already_in_progress;
+        if (values.wait === true && record.status !== "ready" && record.status !== "failed") {
+            record = await waitForPreparedDomain(domain, {
+                ...opts,
+                timeoutMs,
+                intervalMs: deps.intervalMs,
+                sleepImpl: deps.sleepImpl,
+                now: deps.now,
+                onPoll: (r) => log.dim(`  ${r.domain}: ${r.status} (${r.state ?? r.status})`),
+            });
+        }
+        if (record.status === "failed") {
+            throw new ToolkitError({
+                code: "EXTRACT_PREPARE_FAILED",
+                message: `Preparing ${domain} failed${record.failure?.code ? ` (${record.failure.code})` : ""}.`,
+                likely_cause: record.failure?.detail ?? "The preparation did not finish.",
+                next_action: failureNextStep(domain, record.failure),
+                server_code: record.failure?.code,
+            });
+        }
+        report(record, undefined, json, { exampleUrl: urls[0], alreadyReady });
+        return 0;
+    }
+    catch (err) {
+        printError(err, json);
+        return 1;
+    }
+}
+function validateUrls(raw, domain) {
+    const urls = (Array.isArray(raw) ? raw : raw === undefined ? [] : [raw]).map(String);
+    if (urls.length < 1 || urls.length > MAX_EXAMPLE_URLS) {
+        throw new ToolkitError({
+            code: "INVALID_USAGE",
+            message: `Pass 1 to ${MAX_EXAMPLE_URLS} example page URLs with --url (got ${urls.length}).`,
+            likely_cause: "Preparation learns the domain from real pages you want to extract.",
+            next_action: "Add one --url per page kind, e.g. a product page and a listing page.",
+            suggested_commands: [`zenrows extract prepare ${domain} --url https://${domain}/<page>`],
+        });
+    }
+    for (const u of urls) {
+        let parsed;
+        try {
+            parsed = new URL(u);
+        }
+        catch {
+            // reported below
+        }
+        if (!parsed || (parsed.protocol !== "http:" && parsed.protocol !== "https:")) {
+            throw new ToolkitError({
+                code: "INVALID_USAGE",
+                message: `--url ${u} is not a full http(s) URL.`,
+                likely_cause: "Each --url must be a page URL including its scheme.",
+                next_action: `Use full URLs, e.g. --url https://${domain}/<page>.`,
+            });
+        }
+    }
+    return urls;
+}
+function parseTimeout(v) {
+    if (v === undefined)
+        return DEFAULT_WAIT_TIMEOUT_MS;
+    const n = Number(v);
+    if (!Number.isFinite(n) || n <= 0) {
+        throw new ToolkitError({
+            code: "INVALID_USAGE",
+            message: `--timeout must be a positive number of seconds (got ${v}).`,
+            likely_cause: "The value is not a number.",
+            next_action: "Pass seconds, e.g. --timeout 600.",
+        });
+    }
+    return n * 1000;
+}
+function report(record, allowance, json, opts = {}) {
+    const next = statusNextStep(record, opts);
+    if (json) {
+        log.out(JSON.stringify({ ok: true, ...record, ...(opts.alreadyReady ? { already_prepared: true } : {}), ...(allowance ? { allowance } : {}), next }, null, 2));
+        return;
+    }
+    const line = `${record.domain}: ${record.status}${record.state && record.state !== record.status ? ` (${record.state})` : ""}`;
+    if (record.status === "ready")
+        log.success(line);
+    else if (record.status === "failed")
+        log.warn(line);
+    else
+        log.info(line);
+    if (record.failure)
+        log.dim(`  failure: ${record.failure.code}${record.failure.detail ? ` — ${record.failure.detail}` : ""}`);
+    for (const role of record.roles ?? [])
+        log.dim(`  ${role.role}: ${role.status}${role.url ? ` ${role.url}` : ""}`);
+    if (allowance)
+        log.dim(`  allowance: ${allowance.used} of ${allowance.limit} used, ${allowance.remaining} left${allowance.month ? ` (${allowance.month})` : ""}`);
+    log.out(next);
+}

package/dist/src/cli/commands/extract.js

@@ -1,9 +1,12 @@
 /**
  * `zenrows extract <url> [flags]` → Extract (structured extraction on `/v1/`).
  *
- * Default: `extract=auto` (site-tailored Extract). If the domain is
- * not enabled or prepared (AUTH010 / REQS007), falls back once to Autoparse. Opt into Autoparse
- * directly with `--autoparse`. Other methods: `--css`, `--outputs`, `--output`.
+ * Default: `extract=auto` (site-tailored Extract). On a REQS007 / AUTH010 the
+ * error names the next step for its reason (prepare the domain, or try another
+ * page); nothing is retried. `--autoparse` runs the deprecated Autoparse
+ * explicitly. Other
+ * methods: `--css`, `--outputs`, `--output`. `zenrows extract prepare` prepares a
+ * domain (see extract-prepare.ts).
  */
 import { ensureApiKey } from "../../core/ensure-key.js";
 import { maybeNudgeClaim } from "../../core/nudge.js";
@@ -18,14 +21,17 @@ import { formatRequestCost } from "../../core/http.js";
 import { parse, asString, asNumber } from "../command.js";
 import { printError, writeOut } from "../output.js";
 import { refreshClaimAdvice } from "../../core/claim-link.js";
+import { PREPARE_HELP, PREPARE_USAGE, runPrepare } from "./extract-prepare.js";
 export const extract = {
     name: "extract",
     summary: "Turn a protected page into structured data (Extract / Autoparse / CSS / Markdown).",
-    usage: "zenrows extract <url> [--autoparse | --css <json> | --outputs <filters> | --output md|text] [flags]",
+    usage: "zenrows extract <url> [--autoparse | --css <json> | --outputs <filters> | --output md|text] [flags]\n       " +
+        PREPARE_USAGE,
     help: [
         "Methods:",
-        "  (default)              extract=auto: site-tailored Extract; falls back to Autoparse if the domain is not enabled or prepared",
-        "  --autoparse            general-purpose Autoparse (any domain, no Extract fallback)",
+        "  (default)              extract=auto: site-tailored Extract on any prepared domain",
+        "                         (EXTRACT_DOMAIN_NOT_PREPARED = not prepared yet: run zenrows extract prepare, below)",
+        "  --autoparse            deprecated general-purpose Autoparse (any domain)",
         "  --css <json>           CSS selector map, e.g. '{\"title\":\"h1\",\"price\":\".price\"}'",
         "  --outputs <list>       built-in output filters → JSON: emails, phone_numbers, headings,",
         "                         images, audios, videos, links, menus, hashtags, metadata, tables,",
@@ -40,8 +46,13 @@ export const extract = {
         "",
         "Cost (credits per request): 1x normal · 5x --js-render · 10x --premium-proxy · 25x both.",
         "The exact charge is reported after every request (costCredits / X-Request-Credits).",
+        "",
+        "Prepare a domain:",
+        PREPARE_HELP.split("\n").map((l) => (l ? "  " + l : l)).join("\n"),
     ].join("\n"),
     async run(argv, ctx) {
+        if (argv[0] === "prepare")
+            return runPrepare(argv.slice(1), ctx);
         const { values, positionals } = parse(argv, {
             autoparse: { type: "boolean" },
             css: { type: "string" },
@@ -114,14 +125,14 @@ export const extract = {
         const runId = newRunId();
         const startedAt = new Date().toISOString();
         log.step(`Extract ${url} (method=${opts.method ?? "extract"})…`);
+        if (opts.method === "autoparse") {
+            log.warn("Autoparse is deprecated. Prefer the default extract=auto on a prepared domain, or --css.");
+        }
         try {
             const outcome = await runExtract(opts, config, policy, apiKey);
             const finishedAt = new Date().toISOString();
             const safeParams = { ...outcome.params };
             delete safeParams.apikey;
-            if (outcome.fellBackToAutoparse) {
-                log.info("Extract not available for this domain yet — fell back to Autoparse.");
-            }
             const runDir = writeRun({
                 runId,
                 command: "zenrows extract",
@@ -133,7 +144,6 @@ export const extract = {
                 request: {
                     ...safeParams,
                     method: outcome.method,
-                    fellBackToAutoparse: outcome.fellBackToAutoparse ?? false,
                 },
                 result: { httpStatus: outcome.result.status, bytes: outcome.result.body.length, parsed: outcome.data !== undefined },
                 costUsd: outcome.result.costUsd,
@@ -145,8 +155,7 @@ export const extract = {
                 writeOut(values.out, payload);
                 log.success(`Wrote output → ${values.out}`);
             }
-            const via = outcome.fellBackToAutoparse ? `${outcome.method} (fallback)` : outcome.method;
-            log.success(`Extracted via ${via} · ${outcome.result.body.length} bytes · ${formatRequestCost(outcome.result.costUsd, outcome.result.costCredits)} · run ${runId}`);
+            log.success(`Extracted via ${outcome.method} · ${outcome.result.body.length} bytes · ${formatRequestCost(outcome.result.costUsd, outcome.result.costCredits)} · run ${runId}`);
             if (runDir)
                 log.dim(`  artifact: ${runDir}`);
             if (outcome.noDataExtracted) {
@@ -160,7 +169,6 @@ export const extract = {
                     ok: true,
                     runId,
                     method: outcome.method,
-                    fellBackToAutoparse: outcome.fellBackToAutoparse ?? false,
                     empty: outcome.empty ?? false,
                     noDataExtracted: outcome.noDataExtracted ?? false,
                     httpStatus: outcome.result.status,