@rsc-kit/core 0.18.1 → 0.19.0

package/dist/hostCalls.js

@@ -70,6 +70,14 @@ export function httpHostCalls(options) {
     }
     /** One POST. `label` names what is being sent, for the error messages. */
     async function post(body, headers, label) {
+        const response = await send(body, headers, label);
+        // Read the body before branching on status: a host that reports the error
+        // in JSON with a 500 is saying something more useful than "500", and
+        // throwing on the status alone discards it.
+        return { status: response.status, text: await response.text() };
+    }
+    /** The POST itself, headers in hand, body still to read. */
+    async function send(body, headers, label) {
         const doFetch = fetchImpl ?? globalThis.fetch;
         // AbortSignal.timeout is not on every runtime this engine targets, so the
         // controller is written out rather than assumed.
@@ -93,10 +101,7 @@ export function httpHostCalls(options) {
         finally {
             clearTimeout(timer);
         }
-        // Read the body before branching on status: a host that reports the error
-        // in JSON with a 500 is saying something more useful than "500", and
-        // throwing on the status alone discards it.
-        return { status: response.status, text: await response.text() };
+        return response;
     }
     function parse(text) {
         try {
@@ -110,6 +115,60 @@ export function httpHostCalls(options) {
         const { status, text } = await post({ function: name, args }, headers, JSON.stringify(name));
         return { status, reply: parse(text), text };
     }
+    /** Read a streamed batch, one reply per line, resolving each call as its line lands. */
+    async function resolveAsLinesArrive(body, calls) {
+        const answered = new Set();
+        const reader = body.getReader();
+        const decoder = new TextDecoder();
+        let buffered = '';
+        const take = (line) => {
+            const trimmed = line.trim();
+            if (!trimmed)
+                return;
+            let parsed;
+            try {
+                parsed = JSON.parse(trimmed);
+            }
+            catch {
+                return;
+            }
+            const index = parsed?.index;
+            if (typeof index !== 'number' || !calls[index] || answered.has(index))
+                return;
+            const { index: _, status: own, ...reply } = parsed;
+            answered.add(index);
+            calls[index].resolve({ status: own ?? 200, reply, text: JSON.stringify(reply) });
+        };
+        try {
+            for (;;) {
+                const { done, value } = await reader.read();
+                if (done)
+                    break;
+                buffered += decoder.decode(value, { stream: true });
+                let at;
+                while ((at = buffered.indexOf('\n')) !== -1) {
+                    take(buffered.slice(0, at));
+                    buffered = buffered.slice(at + 1);
+                }
+            }
+            buffered += decoder.decode();
+            take(buffered);
+        }
+        catch (error) {
+            for (const [i, call] of calls.entries()) {
+                if (!answered.has(i))
+                    call.reject(error);
+            }
+            return;
+        }
+        // The host closed the batch with a call unanswered: a fault on its side,
+        // reported to the call rather than left pending forever.
+        for (const [i, call] of calls.entries()) {
+            if (!answered.has(i)) {
+                call.reject(new Error(`Host call ${JSON.stringify(call.name)} was not answered in its batch`));
+            }
+        }
+    }
     /**
      * Send a bucket. One call goes as itself, so a host that speaks only the
      * single shape - or a request that happened to be alone - sees nothing
@@ -128,11 +187,9 @@ export function httpHostCalls(options) {
             return;
         }
         const label = `batch of ${calls.length} (${calls.map((c) => c.name).join(', ')})`;
-        let status;
-        let text;
+        let response;
         try {
-            ;
-            ({ status, text } = await post({ calls: calls.map((c) => ({ function: c.name, args: c.args })) }, headers, label));
+            response = await send({ calls: calls.map((c) => ({ function: c.name, args: c.args })) }, headers, label);
         }
         catch (error) {
             // The host could not be reached, or did not answer in time. Not
@@ -142,6 +199,16 @@ export function httpHostCalls(options) {
                 call.reject(error);
             return;
         }
+        // Answered as it goes: each call resolves the moment its line arrives,
+        // so a component waiting on a fast read paints while a slow sibling's
+        // is still running. The batch saved the round trips; this keeps the
+        // streaming the batch would otherwise have cost.
+        if (response.status < 400 && (response.headers.get('content-type') ?? '').includes('x-ndjson') && response.body) {
+            await resolveAsLinesArrive(response.body, calls);
+            return;
+        }
+        const status = response.status;
+        const text = await response.text();
         const parsed = parse(text);
         const replies = parsed?.replies;
         if (status < 400 && Array.isArray(replies) && replies.length === calls.length) {

package/dist/hostCalls.js.map

@@ -1 +1 @@
-{"version":3,"file":"hostCalls.js","sourceRoot":"","sources":["../src/hostCalls.ts"],"names":[],"mappings":"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","sourcesContent":["// Host calls over HTTP, so a host in any language can answer them.\n//\n// A server component writing `await rpc('Orders.recent')` needs the host\n// mid-render. The Laravel path answers on a second unix socket with its own\n// framing (PROTOCOL.md, \"The callback channel\"), which every non-JS host has\n// to reimplement before it can render a single page that fetches anything.\n// This is the same conversation over an ordinary POST.\n//\n// The transport is the only thing that changes. The engine still sees one\n// function, the deferred-release ordering in streaming.ts still applies, and a\n// reply may still carry `revalidate` — a Go host that answers this endpoint\n// gets the same semantics the socket has, without the framing.\n\nimport { headers as incomingHeaders } from './request.js'\nimport { revalidate } from './revalidate.js'\nimport type { RevalidateTarget } from './routes.js'\nimport { ActionValidationError } from './action.js'\nimport { redirect } from './redirect.js'\nimport { ServerAuthenticationError, ServerAuthorizationError } from './js/errors.js'\n\nexport interface HttpHostCallsOptions {\n  /**\n   * Where calls are POSTed. A loopback address or a unix socket url — see the\n   * note on `secret` for why this must not be a public one.\n   */\n  endpoint: string\n  /**\n   * Sent as `X-RSC-Host-Secret`, and required rather than optional.\n   *\n   * This endpoint runs functions by name on behalf of a render. PROTOCOL.md\n   * Part 3b draws the line at client-supplied input deciding what RUNS, and an\n   * unauthenticated callback endpoint is on the wrong side of it: anyone who\n   * can reach it can invoke any registered host function directly, with\n   * whatever arguments they like and none of the app's routing in front. A\n   * default of \"off\" would be the kind that ships.\n   */\n  secret: string\n  /**\n   * Request headers copied from the render's own request onto the call.\n   *\n   * This is what makes a host call run as the person browsing: the backend's\n   * session middleware reads its cookie and finds the same user. Nothing else\n   * is forwarded, because everything else is either meaningless to the backend\n   * or actively wrong — `content-length` and `content-type` describe this POST,\n   * not the page request.\n   */\n  forwardHeaders?: string[]\n  /** Defaults to 30s. A render blocked on a host that never answers is a hung request. */\n  timeoutMs?: number\n  /** Injectable for tests and for a runtime whose fetch is not global. */\n  fetch?: typeof fetch\n  /**\n   * What to do with whatever a reply reported as invalidated.\n   *\n   * Defaults to marking it on the engine, which is the only thing that makes\n   * `Revalidate(ctx, \"orders\")` on the host side mean anything: an action's\n   * answer carries the re-rendered region only if the target reached the\n   * revalidation scope before the action returned. Without it a host reports\n   * what it dirtied, nothing listens, and the browser is told nothing — the\n   * page simply shows stale data with no error anywhere.\n   */\n  onRevalidate?: (targets: string[]) => void\n  /**\n   * Send calls issued in the same tick as one POST. On by default; a host\n   * that does not understand the envelope is detected on the first batch and\n   * sent single calls from then on. `false` never batches.\n   */\n  batch?: boolean\n}\n\nconst DEFAULT_FORWARDED = ['cookie', 'authorization']\n\nexport interface HostCallReply {\n  result?: unknown\n  error?: string\n  revalidate?: string[]\n  /**\n   * Field name to messages, when the host refused the input.\n   *\n   * The same shape everything else here already uses: Laravel's own\n   * `$e->errors()`, the socket protocol's `validation_errors`, and what\n   * `issuesToErrors` turns a Standard Schema result into. Dot-joined for a\n   * nested field, the empty string for a message about the form rather than\n   * any one field.\n   */\n  validationErrors?: Record<string, string[]>\n  /** The caller has no session. Becomes the engine's own authentication error. */\n  unauthenticated?: boolean\n  /** The caller has a session and still may not. */\n  unauthorized?: boolean\n  /**\n   * Where the host says this request should go instead.\n   *\n   * Answered with a 200 and this field, never as a 3xx: fetch follows a\n   * redirect transparently, so a real one would send the host call itself to\n   * the destination and hand whatever came back to the render as the\n   * function's result.\n   */\n  redirect?: string\n  /** The status to redirect with. Defaults to 307, which preserves the method. */\n  redirectStatus?: number\n  /**\n   * The status a refusal should be answered with.\n   *\n   * A middleware that aborted meant what it aborted with — throttle answers\n   * 429, a signed-url check 403 — and collapsing those to 500 makes a\n   * rate-limited visitor indistinguishable from a broken server.\n   */\n  refusalStatus?: number\n}\n\n/**\n * A batch on the wire: several calls in one POST, answered in order.\n *\n * Calls issued in the same tick of a render - sibling components each\n * awaiting rpc() - travel together, so a page's parallel reads cost the host\n * one request rather than one each. A host that has never heard of the\n * envelope answers it as a malformed single call, and the calls are sent one\n * at a time from then on; nothing is lost but the saving.\n */\nexport interface HostCallBatch {\n  calls: { function: string; args: unknown[] }[]\n}\n\nexport interface HostCallBatchReply {\n  /** One per call, in order. Each carries the status that call would have had. */\n  replies: (HostCallReply & { status?: number })[]\n}\n\n/** How many calls one POST carries at most. */\nconst BATCH_LIMIT = 50\n\ntype Settled = { status: number; reply: HostCallReply | null; text: string }\n\ninterface Pending {\n  name: string\n  args: unknown[]\n  resolve: (settled: Settled) => void\n  reject: (error: unknown) => void\n}\n\ninterface Bucket {\n  headers: Record<string, string>\n  calls: Pending[]\n}\n\n// After the current I/O, before the next timer: what a render issued\n// synchronously - and across the microtasks between one component's awaits -\n// is in the bucket by then. setImmediate where the runtime has it, a zero\n// timer where it does not (a Worker).\nconst nextTick: (fn: () => void) => void =\n  typeof setImmediate === 'function' ? (fn) => setImmediate(fn) : (fn) => setTimeout(fn, 0)\n\n/**\n * The function to hand to `installHostFn`, or to `hostCalls` on the JS host.\n */\nexport function httpHostCalls(\n  options: HttpHostCallsOptions,\n): (name: string, ...args: unknown[]) => Promise<unknown> {\n  const {\n    endpoint,\n    secret,\n    forwardHeaders = DEFAULT_FORWARDED,\n    timeoutMs = 30_000,\n    fetch: fetchImpl,\n    onRevalidate,\n    batch = true,\n  } = options\n\n  if (!secret) {\n    throw new Error('httpHostCalls requires a secret — see the note on the option.')\n  }\n\n  const forwarded = forwardHeaders.map((name) => name.toLowerCase())\n\n  // Off for good the first time the host answers a batch as something else.\n  let batching = batch\n\n  // One bucket per set of forwarded headers: two visitors' renders in flight\n  // at once must not share a request, because the host reads the cookie off\n  // the request to know whose session a call runs under.\n  const buckets = new Map<string, Bucket>()\n\n  async function forwardedHeaders(): Promise<Record<string, string>> {\n    const headers: Record<string, string> = {\n      'content-type': 'application/json',\n      'x-rsc-host-secret': secret,\n    }\n\n    // Outside a render — a prerender pass, or a host calling one directly —\n    // there is no request to forward from, and that is not an error. The call\n    // simply carries no session, which is exactly what a build-time render\n    // should be doing.\n    //\n    // Only that one condition is swallowed. A blanket catch here is the wrong\n    // shape: anything else going wrong while reading the request would come\n    // out as a call with no session, which is not a failure the caller sees —\n    // it is the visitor silently becoming anonymous, and the page rendering as\n    // though they were logged out.\n    try {\n      const from = await incomingHeaders()\n\n      for (const key of forwarded) {\n        const value = from.get(key)\n        if (value !== null) headers[key] = value\n      }\n    } catch (error) {\n      const message = error instanceof Error ? error.message : String(error)\n\n      if (!message.startsWith('No request in scope')) throw error\n    }\n\n    return headers\n  }\n\n  /** One POST. `label` names what is being sent, for the error messages. */\n  async function post(\n    body: unknown,\n    headers: Record<string, string>,\n    label: string,\n  ): Promise<{ status: number; text: string }> {\n    const doFetch = fetchImpl ?? globalThis.fetch\n\n    // AbortSignal.timeout is not on every runtime this engine targets, so the\n    // controller is written out rather than assumed.\n    const controller = new AbortController()\n    const timer = setTimeout(() => controller.abort(), timeoutMs)\n\n    let response: Response\n\n    try {\n      response = await doFetch(endpoint, {\n        method: 'POST',\n        headers,\n        body: JSON.stringify(body),\n        signal: controller.signal,\n      })\n    } catch (error) {\n      if (controller.signal.aborted) {\n        throw new Error(`Host call ${label} timed out after ${timeoutMs}ms`)\n      }\n\n      throw new Error(\n        `Host call ${label} could not reach the host at ${endpoint}: ${\n          error instanceof Error ? error.message : String(error)\n        }`,\n      )\n    } finally {\n      clearTimeout(timer)\n    }\n\n    // Read the body before branching on status: a host that reports the error\n    // in JSON with a 500 is saying something more useful than \"500\", and\n    // throwing on the status alone discards it.\n    return { status: response.status, text: await response.text() }\n  }\n\n  function parse(text: string): HostCallReply | null {\n    try {\n      return text ? (JSON.parse(text) as HostCallReply) : null\n    } catch {\n      return null\n    }\n  }\n\n  async function single(name: string, args: unknown[], headers: Record<string, string>): Promise<Settled> {\n    const { status, text } = await post({ function: name, args }, headers, JSON.stringify(name))\n\n    return { status, reply: parse(text), text }\n  }\n\n  /**\n   * Send a bucket. One call goes as itself, so a host that speaks only the\n   * single shape - or a request that happened to be alone - sees nothing\n   * new on the wire.\n   */\n  async function flush(bucket: Bucket): Promise<void> {\n    const { headers, calls } = bucket\n\n    if (calls.length === 1) {\n      const [only] = calls\n\n      try {\n        only.resolve(await single(only.name, only.args, headers))\n      } catch (error) {\n        only.reject(error)\n      }\n\n      return\n    }\n\n    const label = `batch of ${calls.length} (${calls.map((c) => c.name).join(', ')})`\n    let status: number\n    let text: string\n\n    try {\n      ;({ status, text } = await post(\n        { calls: calls.map((c) => ({ function: c.name, args: c.args })) } satisfies HostCallBatch,\n        headers,\n        label,\n      ))\n    } catch (error) {\n      // The host could not be reached, or did not answer in time. Not\n      // re-sent one by one: the calls may have run, and an action run twice\n      // is worse than one reported as failed.\n      for (const call of calls) call.reject(error)\n\n      return\n    }\n\n    const parsed = parse(text) as Partial<HostCallBatchReply> | null\n    const replies = parsed?.replies\n\n    if (status < 400 && Array.isArray(replies) && replies.length === calls.length) {\n      calls.forEach((call, i) => {\n        const { status: own, ...reply } = replies[i]!\n\n        call.resolve({ status: own ?? 200, reply, text: JSON.stringify(reply) })\n      })\n\n      return\n    }\n\n    // Not a batch answer: a host that does not know the envelope refused it\n    // as one malformed call, before running anything. From here on, one at a\n    // time - and these, now.\n    batching = false\n\n    await Promise.all(\n      calls.map(async (call) => {\n        try {\n          call.resolve(await single(call.name, call.args, headers))\n        } catch (error) {\n          call.reject(error)\n        }\n      }),\n    )\n  }\n\n  function enqueue(name: string, args: unknown[], headers: Record<string, string>): Promise<Settled> {\n    return new Promise<Settled>((resolve, reject) => {\n      const key = JSON.stringify(headers)\n      let bucket = buckets.get(key)\n\n      if (!bucket) {\n        bucket = { headers, calls: [] }\n        buckets.set(key, bucket)\n\n        const mine = bucket\n\n        nextTick(() => {\n          if (buckets.get(key) === mine) buckets.delete(key)\n\n          void flush(mine)\n        })\n      }\n\n      bucket.calls.push({ name, args, resolve, reject })\n\n      if (bucket.calls.length >= BATCH_LIMIT) {\n        buckets.delete(key)\n\n        void flush(bucket)\n      }\n    })\n  }\n\n  /**\n   * What a reply means, in the caller's own async context.\n   *\n   * Deliberately not done where the response arrives: a batch is answered in\n   * a timer, outside every caller's request scope, and `redirect()` and\n   * `revalidate()` both write to that scope. Interpreting here, after the\n   * caller's await resumed, puts each reply back inside the render it belongs\n   * to.\n   */\n  function interpret(name: string, { status, reply, text }: Settled): unknown {\n    // Refusing the input is not the call failing — it is the call answering.\n    //\n    // Thrown rather than returned, so a handler stops where it is instead of\n    // carrying on with data the host rejected. createActionClient catches this\n    // on the way out and returns { validationErrors }, which is the shape\n    // useForm reads: React serialises a REJECTED server action opaquely, so a\n    // validation error that stays thrown reaches the browser as \"an error\n    // occurred\" with every field it named gone.\n    //\n    // Checked before `error`, so a host that sends both is read as a refusal\n    // rather than as a failure with no fields.\n    if (reply?.validationErrors) {\n      throw new ActionValidationError(reply.validationErrors)\n    }\n\n    // Raised as the engine's own redirect, so it travels the path every other\n    // redirect travels — a real 3xx above a Suspense boundary, the digest\n    // below one — rather than becoming an error the page has to interpret.\n    if (reply?.redirect) {\n      redirect(reply.redirect as never, reply.redirectStatus ?? 307)\n    }\n\n    if (reply?.unauthenticated) {\n      throw new ServerAuthenticationError(reply.error ?? 'Unauthenticated.')\n    }\n\n    if (reply?.unauthorized) {\n      throw new ServerAuthorizationError(reply.error ?? 'This action is unauthorized.')\n    }\n\n    if (reply?.error !== undefined) {\n      const failure = new Error(`Host call ${JSON.stringify(name)} failed: ${reply.error}`)\n\n      // Carried on the error rather than thrown as another class: the host\n      // chose a status and the only job here is not to lose it on the way to\n      // whoever writes the response.\n      if (reply.refusalStatus) {\n        ;(failure as Error & { refusalStatus?: number }).refusalStatus = reply.refusalStatus\n      }\n\n      throw failure\n    }\n\n    if (status >= 400) {\n      throw new Error(\n        `Host call ${JSON.stringify(name)} failed: ${status}`.trim() +\n          (text ? ` — ${text.slice(0, 200)}` : ''),\n      )\n    }\n\n    if (reply === null) {\n      throw new Error(\n        `Host call ${JSON.stringify(name)} returned a body that is not JSON: ${text.slice(0, 200)}`,\n      )\n    }\n\n    if (reply.revalidate?.length) {\n      if (onRevalidate) onRevalidate(reply.revalidate)\n      // Named by the host over the wire - Rsc::revalidate('orders') in PHP -\n      // so nothing here can check it; the renderer refuses an unknown name.\n      else for (const target of reply.revalidate) revalidate(target as RevalidateTarget)\n    }\n\n    return reply.result ?? null\n  }\n\n  return async function hostCall(name: string, ...args: unknown[]): Promise<unknown> {\n    const headers = await forwardedHeaders()\n    const settled = batching ? await enqueue(name, args, headers) : await single(name, args, headers)\n\n    return interpret(name, settled)\n  }\n}\n"]}
+{"version":3,"file":"hostCalls.js","sourceRoot":"","sources":["../src/hostCalls.ts"],"names":[],"mappings":"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","sourcesContent":["// Host calls over HTTP, so a host in any language can answer them.\n//\n// A server component writing `await rpc('Orders.recent')` needs the host\n// mid-render. The Laravel path answers on a second unix socket with its own\n// framing (PROTOCOL.md, \"The callback channel\"), which every non-JS host has\n// to reimplement before it can render a single page that fetches anything.\n// This is the same conversation over an ordinary POST.\n//\n// The transport is the only thing that changes. The engine still sees one\n// function, the deferred-release ordering in streaming.ts still applies, and a\n// reply may still carry `revalidate` — a Go host that answers this endpoint\n// gets the same semantics the socket has, without the framing.\n\nimport { headers as incomingHeaders } from './request.js'\nimport { revalidate } from './revalidate.js'\nimport type { RevalidateTarget } from './routes.js'\nimport { ActionValidationError } from './action.js'\nimport { redirect } from './redirect.js'\nimport { ServerAuthenticationError, ServerAuthorizationError } from './js/errors.js'\n\nexport interface HttpHostCallsOptions {\n  /**\n   * Where calls are POSTed. A loopback address or a unix socket url — see the\n   * note on `secret` for why this must not be a public one.\n   */\n  endpoint: string\n  /**\n   * Sent as `X-RSC-Host-Secret`, and required rather than optional.\n   *\n   * This endpoint runs functions by name on behalf of a render. PROTOCOL.md\n   * Part 3b draws the line at client-supplied input deciding what RUNS, and an\n   * unauthenticated callback endpoint is on the wrong side of it: anyone who\n   * can reach it can invoke any registered host function directly, with\n   * whatever arguments they like and none of the app's routing in front. A\n   * default of \"off\" would be the kind that ships.\n   */\n  secret: string\n  /**\n   * Request headers copied from the render's own request onto the call.\n   *\n   * This is what makes a host call run as the person browsing: the backend's\n   * session middleware reads its cookie and finds the same user. Nothing else\n   * is forwarded, because everything else is either meaningless to the backend\n   * or actively wrong — `content-length` and `content-type` describe this POST,\n   * not the page request.\n   */\n  forwardHeaders?: string[]\n  /** Defaults to 30s. A render blocked on a host that never answers is a hung request. */\n  timeoutMs?: number\n  /** Injectable for tests and for a runtime whose fetch is not global. */\n  fetch?: typeof fetch\n  /**\n   * What to do with whatever a reply reported as invalidated.\n   *\n   * Defaults to marking it on the engine, which is the only thing that makes\n   * `Revalidate(ctx, \"orders\")` on the host side mean anything: an action's\n   * answer carries the re-rendered region only if the target reached the\n   * revalidation scope before the action returned. Without it a host reports\n   * what it dirtied, nothing listens, and the browser is told nothing — the\n   * page simply shows stale data with no error anywhere.\n   */\n  onRevalidate?: (targets: string[]) => void\n  /**\n   * Send calls issued in the same tick as one POST. On by default; a host\n   * that does not understand the envelope is detected on the first batch and\n   * sent single calls from then on. `false` never batches.\n   */\n  batch?: boolean\n}\n\nconst DEFAULT_FORWARDED = ['cookie', 'authorization']\n\nexport interface HostCallReply {\n  result?: unknown\n  error?: string\n  revalidate?: string[]\n  /**\n   * Field name to messages, when the host refused the input.\n   *\n   * The same shape everything else here already uses: Laravel's own\n   * `$e->errors()`, the socket protocol's `validation_errors`, and what\n   * `issuesToErrors` turns a Standard Schema result into. Dot-joined for a\n   * nested field, the empty string for a message about the form rather than\n   * any one field.\n   */\n  validationErrors?: Record<string, string[]>\n  /** The caller has no session. Becomes the engine's own authentication error. */\n  unauthenticated?: boolean\n  /** The caller has a session and still may not. */\n  unauthorized?: boolean\n  /**\n   * Where the host says this request should go instead.\n   *\n   * Answered with a 200 and this field, never as a 3xx: fetch follows a\n   * redirect transparently, so a real one would send the host call itself to\n   * the destination and hand whatever came back to the render as the\n   * function's result.\n   */\n  redirect?: string\n  /** The status to redirect with. Defaults to 307, which preserves the method. */\n  redirectStatus?: number\n  /**\n   * The status a refusal should be answered with.\n   *\n   * A middleware that aborted meant what it aborted with — throttle answers\n   * 429, a signed-url check 403 — and collapsing those to 500 makes a\n   * rate-limited visitor indistinguishable from a broken server.\n   */\n  refusalStatus?: number\n}\n\n/**\n * A batch on the wire: several calls in one POST, answered in order.\n *\n * Calls issued in the same tick of a render - sibling components each\n * awaiting rpc() - travel together, so a page's parallel reads cost the host\n * one request rather than one each. A host that has never heard of the\n * envelope answers it as a malformed single call, and the calls are sent one\n * at a time from then on; nothing is lost but the saving.\n */\nexport interface HostCallBatch {\n  calls: { function: string; args: unknown[] }[]\n}\n\nexport interface HostCallBatchReply {\n  /** One per call, in order. Each carries the status that call would have had. */\n  replies: (HostCallReply & { status?: number })[]\n}\n\n/**\n * A batch answered as it goes: one line per call, each as the host finishes\n * it, in whatever order that is.\n *\n * `application/x-ndjson`, each line a reply with the call's `index` in the\n * batch. A host that answers this way lets a fast call resolve while a slow\n * sibling is still running - which is what keeps a page's boundaries\n * streaming independently when their reads travelled together. A host that\n * answers the whole batch at once, as one JSON object of `replies`, is read\n * as before; the saving of the batch stays, the independence does not.\n */\nexport type HostCallBatchLine = HostCallReply & { index: number; status?: number }\n\n/** How many calls one POST carries at most. */\nconst BATCH_LIMIT = 50\n\ntype Settled = { status: number; reply: HostCallReply | null; text: string }\n\ninterface Pending {\n  name: string\n  args: unknown[]\n  resolve: (settled: Settled) => void\n  reject: (error: unknown) => void\n}\n\ninterface Bucket {\n  headers: Record<string, string>\n  calls: Pending[]\n}\n\n// After the current I/O, before the next timer: what a render issued\n// synchronously - and across the microtasks between one component's awaits -\n// is in the bucket by then. setImmediate where the runtime has it, a zero\n// timer where it does not (a Worker).\nconst nextTick: (fn: () => void) => void =\n  typeof setImmediate === 'function' ? (fn) => setImmediate(fn) : (fn) => setTimeout(fn, 0)\n\n/**\n * The function to hand to `installHostFn`, or to `hostCalls` on the JS host.\n */\nexport function httpHostCalls(\n  options: HttpHostCallsOptions,\n): (name: string, ...args: unknown[]) => Promise<unknown> {\n  const {\n    endpoint,\n    secret,\n    forwardHeaders = DEFAULT_FORWARDED,\n    timeoutMs = 30_000,\n    fetch: fetchImpl,\n    onRevalidate,\n    batch = true,\n  } = options\n\n  if (!secret) {\n    throw new Error('httpHostCalls requires a secret — see the note on the option.')\n  }\n\n  const forwarded = forwardHeaders.map((name) => name.toLowerCase())\n\n  // Off for good the first time the host answers a batch as something else.\n  let batching = batch\n\n  // One bucket per set of forwarded headers: two visitors' renders in flight\n  // at once must not share a request, because the host reads the cookie off\n  // the request to know whose session a call runs under.\n  const buckets = new Map<string, Bucket>()\n\n  async function forwardedHeaders(): Promise<Record<string, string>> {\n    const headers: Record<string, string> = {\n      'content-type': 'application/json',\n      'x-rsc-host-secret': secret,\n    }\n\n    // Outside a render — a prerender pass, or a host calling one directly —\n    // there is no request to forward from, and that is not an error. The call\n    // simply carries no session, which is exactly what a build-time render\n    // should be doing.\n    //\n    // Only that one condition is swallowed. A blanket catch here is the wrong\n    // shape: anything else going wrong while reading the request would come\n    // out as a call with no session, which is not a failure the caller sees —\n    // it is the visitor silently becoming anonymous, and the page rendering as\n    // though they were logged out.\n    try {\n      const from = await incomingHeaders()\n\n      for (const key of forwarded) {\n        const value = from.get(key)\n        if (value !== null) headers[key] = value\n      }\n    } catch (error) {\n      const message = error instanceof Error ? error.message : String(error)\n\n      if (!message.startsWith('No request in scope')) throw error\n    }\n\n    return headers\n  }\n\n  /** One POST. `label` names what is being sent, for the error messages. */\n  async function post(\n    body: unknown,\n    headers: Record<string, string>,\n    label: string,\n  ): Promise<{ status: number; text: string }> {\n    const response = await send(body, headers, label)\n\n    // Read the body before branching on status: a host that reports the error\n    // in JSON with a 500 is saying something more useful than \"500\", and\n    // throwing on the status alone discards it.\n    return { status: response.status, text: await response.text() }\n  }\n\n  /** The POST itself, headers in hand, body still to read. */\n  async function send(body: unknown, headers: Record<string, string>, label: string): Promise<Response> {\n    const doFetch = fetchImpl ?? globalThis.fetch\n\n    // AbortSignal.timeout is not on every runtime this engine targets, so the\n    // controller is written out rather than assumed.\n    const controller = new AbortController()\n    const timer = setTimeout(() => controller.abort(), timeoutMs)\n\n    let response: Response\n\n    try {\n      response = await doFetch(endpoint, {\n        method: 'POST',\n        headers,\n        body: JSON.stringify(body),\n        signal: controller.signal,\n      })\n    } catch (error) {\n      if (controller.signal.aborted) {\n        throw new Error(`Host call ${label} timed out after ${timeoutMs}ms`)\n      }\n\n      throw new Error(\n        `Host call ${label} could not reach the host at ${endpoint}: ${\n          error instanceof Error ? error.message : String(error)\n        }`,\n      )\n    } finally {\n      clearTimeout(timer)\n    }\n\n    return response\n  }\n\n  function parse(text: string): HostCallReply | null {\n    try {\n      return text ? (JSON.parse(text) as HostCallReply) : null\n    } catch {\n      return null\n    }\n  }\n\n  async function single(name: string, args: unknown[], headers: Record<string, string>): Promise<Settled> {\n    const { status, text } = await post({ function: name, args }, headers, JSON.stringify(name))\n\n    return { status, reply: parse(text), text }\n  }\n\n  /** Read a streamed batch, one reply per line, resolving each call as its line lands. */\n  async function resolveAsLinesArrive(body: ReadableStream<Uint8Array>, calls: Pending[]): Promise<void> {\n    const answered = new Set<number>()\n    const reader = body.getReader()\n    const decoder = new TextDecoder()\n    let buffered = ''\n\n    const take = (line: string) => {\n      const trimmed = line.trim()\n\n      if (!trimmed) return\n\n      let parsed: Partial<HostCallBatchLine> | null\n\n      try {\n        parsed = JSON.parse(trimmed) as Partial<HostCallBatchLine>\n      } catch {\n        return\n      }\n\n      const index = parsed?.index\n\n      if (typeof index !== 'number' || !calls[index] || answered.has(index)) return\n\n      const { index: _, status: own, ...reply } = parsed as HostCallBatchLine\n\n      answered.add(index)\n      calls[index]!.resolve({ status: own ?? 200, reply, text: JSON.stringify(reply) })\n    }\n\n    try {\n      for (;;) {\n        const { done, value } = await reader.read()\n\n        if (done) break\n\n        buffered += decoder.decode(value, { stream: true })\n\n        let at: number\n\n        while ((at = buffered.indexOf('\\n')) !== -1) {\n          take(buffered.slice(0, at))\n          buffered = buffered.slice(at + 1)\n        }\n      }\n\n      buffered += decoder.decode()\n      take(buffered)\n    } catch (error) {\n      for (const [i, call] of calls.entries()) {\n        if (!answered.has(i)) call.reject(error)\n      }\n\n      return\n    }\n\n    // The host closed the batch with a call unanswered: a fault on its side,\n    // reported to the call rather than left pending forever.\n    for (const [i, call] of calls.entries()) {\n      if (!answered.has(i)) {\n        call.reject(new Error(`Host call ${JSON.stringify(call.name)} was not answered in its batch`))\n      }\n    }\n  }\n\n  /**\n   * Send a bucket. One call goes as itself, so a host that speaks only the\n   * single shape - or a request that happened to be alone - sees nothing\n   * new on the wire.\n   */\n  async function flush(bucket: Bucket): Promise<void> {\n    const { headers, calls } = bucket\n\n    if (calls.length === 1) {\n      const [only] = calls\n\n      try {\n        only.resolve(await single(only.name, only.args, headers))\n      } catch (error) {\n        only.reject(error)\n      }\n\n      return\n    }\n\n    const label = `batch of ${calls.length} (${calls.map((c) => c.name).join(', ')})`\n    let response: Response\n\n    try {\n      response = await send(\n        { calls: calls.map((c) => ({ function: c.name, args: c.args })) } satisfies HostCallBatch,\n        headers,\n        label,\n      )\n    } catch (error) {\n      // The host could not be reached, or did not answer in time. Not\n      // re-sent one by one: the calls may have run, and an action run twice\n      // is worse than one reported as failed.\n      for (const call of calls) call.reject(error)\n\n      return\n    }\n\n    // Answered as it goes: each call resolves the moment its line arrives,\n    // so a component waiting on a fast read paints while a slow sibling's\n    // is still running. The batch saved the round trips; this keeps the\n    // streaming the batch would otherwise have cost.\n    if (response.status < 400 && (response.headers.get('content-type') ?? '').includes('x-ndjson') && response.body) {\n      await resolveAsLinesArrive(response.body, calls)\n\n      return\n    }\n\n    const status = response.status\n    const text = await response.text()\n    const parsed = parse(text) as Partial<HostCallBatchReply> | null\n    const replies = parsed?.replies\n\n    if (status < 400 && Array.isArray(replies) && replies.length === calls.length) {\n      calls.forEach((call, i) => {\n        const { status: own, ...reply } = replies[i]!\n\n        call.resolve({ status: own ?? 200, reply, text: JSON.stringify(reply) })\n      })\n\n      return\n    }\n\n    // Not a batch answer: a host that does not know the envelope refused it\n    // as one malformed call, before running anything. From here on, one at a\n    // time - and these, now.\n    batching = false\n\n    await Promise.all(\n      calls.map(async (call) => {\n        try {\n          call.resolve(await single(call.name, call.args, headers))\n        } catch (error) {\n          call.reject(error)\n        }\n      }),\n    )\n  }\n\n  function enqueue(name: string, args: unknown[], headers: Record<string, string>): Promise<Settled> {\n    return new Promise<Settled>((resolve, reject) => {\n      const key = JSON.stringify(headers)\n      let bucket = buckets.get(key)\n\n      if (!bucket) {\n        bucket = { headers, calls: [] }\n        buckets.set(key, bucket)\n\n        const mine = bucket\n\n        nextTick(() => {\n          if (buckets.get(key) === mine) buckets.delete(key)\n\n          void flush(mine)\n        })\n      }\n\n      bucket.calls.push({ name, args, resolve, reject })\n\n      if (bucket.calls.length >= BATCH_LIMIT) {\n        buckets.delete(key)\n\n        void flush(bucket)\n      }\n    })\n  }\n\n  /**\n   * What a reply means, in the caller's own async context.\n   *\n   * Deliberately not done where the response arrives: a batch is answered in\n   * a timer, outside every caller's request scope, and `redirect()` and\n   * `revalidate()` both write to that scope. Interpreting here, after the\n   * caller's await resumed, puts each reply back inside the render it belongs\n   * to.\n   */\n  function interpret(name: string, { status, reply, text }: Settled): unknown {\n    // Refusing the input is not the call failing — it is the call answering.\n    //\n    // Thrown rather than returned, so a handler stops where it is instead of\n    // carrying on with data the host rejected. createActionClient catches this\n    // on the way out and returns { validationErrors }, which is the shape\n    // useForm reads: React serialises a REJECTED server action opaquely, so a\n    // validation error that stays thrown reaches the browser as \"an error\n    // occurred\" with every field it named gone.\n    //\n    // Checked before `error`, so a host that sends both is read as a refusal\n    // rather than as a failure with no fields.\n    if (reply?.validationErrors) {\n      throw new ActionValidationError(reply.validationErrors)\n    }\n\n    // Raised as the engine's own redirect, so it travels the path every other\n    // redirect travels — a real 3xx above a Suspense boundary, the digest\n    // below one — rather than becoming an error the page has to interpret.\n    if (reply?.redirect) {\n      redirect(reply.redirect as never, reply.redirectStatus ?? 307)\n    }\n\n    if (reply?.unauthenticated) {\n      throw new ServerAuthenticationError(reply.error ?? 'Unauthenticated.')\n    }\n\n    if (reply?.unauthorized) {\n      throw new ServerAuthorizationError(reply.error ?? 'This action is unauthorized.')\n    }\n\n    if (reply?.error !== undefined) {\n      const failure = new Error(`Host call ${JSON.stringify(name)} failed: ${reply.error}`)\n\n      // Carried on the error rather than thrown as another class: the host\n      // chose a status and the only job here is not to lose it on the way to\n      // whoever writes the response.\n      if (reply.refusalStatus) {\n        ;(failure as Error & { refusalStatus?: number }).refusalStatus = reply.refusalStatus\n      }\n\n      throw failure\n    }\n\n    if (status >= 400) {\n      throw new Error(\n        `Host call ${JSON.stringify(name)} failed: ${status}`.trim() +\n          (text ? ` — ${text.slice(0, 200)}` : ''),\n      )\n    }\n\n    if (reply === null) {\n      throw new Error(\n        `Host call ${JSON.stringify(name)} returned a body that is not JSON: ${text.slice(0, 200)}`,\n      )\n    }\n\n    if (reply.revalidate?.length) {\n      if (onRevalidate) onRevalidate(reply.revalidate)\n      // Named by the host over the wire - Rsc::revalidate('orders') in PHP -\n      // so nothing here can check it; the renderer refuses an unknown name.\n      else for (const target of reply.revalidate) revalidate(target as RevalidateTarget)\n    }\n\n    return reply.result ?? null\n  }\n\n  return async function hostCall(name: string, ...args: unknown[]): Promise<unknown> {\n    const headers = await forwardedHeaders()\n    const settled = batching ? await enqueue(name, args, headers) : await single(name, args, headers)\n\n    return interpret(name, settled)\n  }\n}\n"]}

package/dist/js/Form.d.ts

@@ -1,5 +1,5 @@
 import type { Href } from "../routes.js";
-import { type FormHTMLAttributes, type ReactNode } from "react";
+import { type FormHTMLAttributes, type ReactNode, type Ref } from "react";
 import type { FormStore } from "./formStore";
 import type { StandardSchemaV1 } from "./standardSchema";
 type PrefetchStrategy = "hover" | "mount" | "none";
@@ -57,6 +57,17 @@ interface FormRenderProps<T extends Record<string, unknown> = Record<string, unk
     error: (field: keyof T & string) => string | undefined;
     clearErrors: (...fields: (keyof T & string)[]) => void;
     reset: () => void;
+    /**
+     * Whether anything differs from what the form started with.
+     *
+     * For the Save button that stays quiet until there is something to save,
+     * and the Discard that appears beside it. Read from the form itself - a
+     * snapshot of its FormData on mount, compared on every input - so an
+     * uncontrolled field counts, which nothing outside the form can do. A
+     * successful submit makes the current values the new baseline; `reset()`
+     * goes back to the first one.
+     */
+    dirty: boolean;
     /** Whether the last submit was accepted. */
     succeeded: boolean;
     /**
@@ -101,6 +112,12 @@ interface FormRenderProps<T extends Record<string, unknown> = Record<string, unk
 interface FormProps<T extends Record<string, unknown> = Record<string, unknown>> extends Omit<FormHTMLAttributes<HTMLFormElement>, "action" | "method" | "children" | "onSubmit" | "onError"> {
     action: Href | ((formData: FormData) => Promise<unknown>);
     method?: "get" | "post";
+    /**
+     * The <form> element, for a caller that needs it - to focus, to scroll to,
+     * to hand a library. The form keeps its own handle beside it; a caller's
+     * never replaces it.
+     */
+    ref?: Ref<HTMLFormElement>;
     /**
      * Starting values for fields bound with `field()`.
      *
@@ -198,5 +215,5 @@ export declare function useFormStatus<T extends Record<string, unknown> = Record
  * Also exported by name, and re-exported below, because both spellings are in
  * use: `import Form from` and `import { Form } from`.
  */
-export default function Form<T extends Record<string, unknown> = Record<string, unknown>>({ action, method: methodProp, defaultValues, store: providedStore, prefetch, cacheFor, replace, preserveScroll, resetOnSuccess, schema, transform, optimistic, onSuccess, onError, onSubmit, children, ...rest }: FormProps<T>): import("react").JSX.Element;
+export default function Form<T extends Record<string, unknown> = Record<string, unknown>>({ action, method: methodProp, defaultValues, store: providedStore, prefetch, cacheFor, replace, preserveScroll, resetOnSuccess, schema, transform, optimistic, onSuccess, onError, onSubmit, children, ref: callerRef, ...rest }: FormProps<T>): import("react").JSX.Element;
 export { Form };

package/dist/js/Form.js

@@ -1,8 +1,9 @@
 "use client";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, useSyncExternalStore, useTransition, } from "react";
-import { ServerValidationError, ServerDumpError } from "./errors";
-import { buildFormData } from "./formEncoding";
+import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useActionState, useState, useSyncExternalStore, useTransition, } from "react";
+import { submitForm } from "../formSubmit";
+import { ServerValidationError, ServerDumpError, ServerRedirectError, redirectedTo } from "./errors";
+import { buildFormData, decodeFormData } from "./formEncoding";
 import { createFormStore } from "./formStore";
 import { validateWith } from "./standardSchema";
 /**
@@ -26,11 +27,14 @@ function resultOf(value) {
         return { errors: result.validationErrors };
     if (result.serverError)
         return { serverError: result.serverError };
+    if (typeof result.redirected === "string")
+        return { redirected: result.redirected };
     return null;
 }
 const FormStatusContext = createContext({
     pending: false,
     data: {},
+    dirty: false,
     errors: {},
     error: () => undefined,
     clearErrors: () => { },
@@ -138,96 +142,56 @@ export function useFormStatus() {
     return useContext(FormStatusContext);
 }
 /**
- * The pieces of a field name: `items[0].name` is items, 0, name.
+ * submitForm bound to an action, once per action.
  *
- * Both spellings, because both are in use and a form should not care which one
- * a person reached for: `items[0].name` and `items[0][name]` are the same
- * field. A trailing `[]` is a piece of its own — see below.
+ * Bound on every render, it was a fresh function with a fresh promise for
+ * its bound arguments each time - and React, seating a posted form's state
+ * during the server render, suspends on that promise until it settles, then
+ * renders the component again, which bound again. A render that never
+ * finished, on every page a form was posted to without javascript. One
+ * bound function per action, and the promise settles once.
  */
-function pathOf(name) {
-    return name
-        .replace(/\[(\w*)\]/g, ".$1")
-        .split(".")
-        .filter((piece, index, all) => piece !== "" || index === all.length - 1);
-}
-/** Whether a piece names an array index rather than a property. */
-const isIndex = (piece) => /^\d+$/.test(piece);
-/**
- * Put one value at one path, making the containers it passes through.
- *
- * Whether a container is an array or an object is decided by the NEXT piece, so
- * `items[0].name` makes an array holding an object without being told which is
- * which.
- */
-function place(root, path, value) {
-    let node = root;
-    for (let i = 0; i < path.length - 1; i++) {
-        const key = path[i];
-        const container = node;
-        if (container[key] === undefined || typeof container[key] !== "object") {
-            // An index makes an array, and so does the empty piece a trailing `[]`
-            // leaves — `tags[]` has to reach an array to be pushed into, and building
-            // an object there is how this first went wrong.
-            const next = path[i + 1];
-            container[key] = isIndex(next) || next === "" ? [] : {};
-        }
-        node = container[key];
+const boundSubmits = new WeakMap();
+function boundSubmit(action) {
+    let bound = boundSubmits.get(action);
+    if (!bound) {
+        bound = submitForm.bind(null, action);
+        boundSubmits.set(action, bound);
     }
-    const last = path[path.length - 1];
-    // The empty piece a trailing `[]` leaves: push rather than assign, so
-    // `tags[]` twice is two entries rather than one overwriting the other.
-    if (last === "")
-        node.push(value);
-    else
-        node[last] = value;
+    return bound;
 }
 /**
- * A FormData as the object a schema expects.
- *
- * Four things beyond copying entries across, and each of them was a bug or a
- * gap someone would meet on their first non-trivial form:
- *
- * A repeated name is an array. Three checkboxes sharing a name, a multiple
- * select, a list of tags — this used to keep the LAST one and drop the rest
- * silently, so a schema validated an object the person had not submitted.
- *
- * A name ending in `[]` is always an array, even with one value selected.
- * Otherwise a list of checkboxes is a string when one is ticked and an array
- * when two are, and no schema can describe both. It is also what `useForm`
- * writes when it serialises an array, so the two round-trip.
- *
- * Nested names nest. `address.city` and `items[0].name` build the object they
- * describe, which is the shape the schema was written against — and the shape
- * whose validation errors come back keyed the same way, because Standard
- * Schema issue paths are joined with dots too.
+ * A form's values as one comparable string.
  *
- * Files are kept. They were dropped for being non-strings, which meant a schema
- * checking an upload was handed undefined and refused a file that was there.
+ * FormData in document order, a file by its name and size: enough to say
+ * whether anything changed, which is all `dirty` asks.
  */
-function formDataToObject(formData) {
-    const obj = {};
-    for (const name of new Set(formData.keys())) {
-        const all = formData.getAll(name);
-        const path = pathOf(name);
-        // A plain name used more than once is the array case, and it has no
-        // brackets to say so — `tags` twice is `['a', 'b']`.
-        if (path.length === 1 && path[0] !== "" && all.length > 1) {
-            obj[path[0]] = all;
-            continue;
-        }
-        for (const value of all)
-            place(obj, path, value);
+function serializeForm(form) {
+    const parts = [];
+    for (const [name, value] of new FormData(form)) {
+        parts.push(name + "=" + (typeof value === "string" ? value : "file:" + value.name + ":" + value.size));
     }
-    return obj;
+    return parts.join("\n");
 }
 /**
  * Also exported by name, and re-exported below, because both spellings are in
  * use: `import Form from` and `import { Form } from`.
  */
-export default function Form({ action, method: methodProp, defaultValues, store: providedStore, prefetch = "hover", cacheFor, replace = false, preserveScroll = false, resetOnSuccess = true, schema, transform, optimistic, onSuccess, onError, onSubmit, children, ...rest }) {
+export default function Form({ action, method: methodProp, defaultValues, store: providedStore, prefetch = "hover", cacheFor, replace = false, preserveScroll = false, resetOnSuccess = true, schema, transform, optimistic, onSuccess, onError, onSubmit, children, ref: callerRef, ...rest }) {
     const isGetForm = typeof action === "string";
     const method = methodProp ?? (isGetForm ? "get" : "post");
-    const [errors, setErrors] = useState({});
+    // The answer to this form posted without a runtime, seated by React into
+    // the form that posted it - which is the only way a visitor with no
+    // javascript sees a refusal. Registered through submitForm, bound to the
+    // action, because React hands a form-state action a (previous, formData)
+    // pair and the action takes the FormData alone. On the server a plain
+    // function - a closure, not a server reference - cannot be bound into a
+    // form; the form falls back to the action itself, and posts nothing
+    // seatable, which is all a closure could ever have done.
+    const bindable = typeof action === "function" && (typeof window !== "undefined" || "$$FORM_ACTION" in action);
+    const [posted, formAction] = useActionState(bindable ? boundSubmit(action) : async () => null, null);
+    const postedRefusal = resultOf(posted);
+    const [errors, setErrors] = useState(() => postedRefusal?.errors ?? {});
     const [touched, setTouched] = useState({});
     /**
      * Mark a field visited, and check it.
@@ -246,7 +210,7 @@ export default function Form({ action, method: methodProp, defaultValues, store:
         setTouched((prev) => (prev[name] ? prev : { ...prev, [name]: true }));
         if (!schema || !formRef.current)
             return;
-        const invalid = await validateWith(schema, formDataToObject(new FormData(formRef.current)));
+        const invalid = await validateWith(schema, decodeFormData(new FormData(formRef.current), schema));
         setErrors((prev) => {
             const next = { ...prev };
             if (invalid?.[name])
@@ -284,6 +248,41 @@ export default function Form({ action, method: methodProp, defaultValues, store:
     const [currentData, setCurrentData] = useState({});
     const [isPending, startTransition] = useTransition();
     const formRef = useRef(null);
+    // What the form started with, as its FormData reads: the baseline `dirty`
+    // is measured against. Taken on mount, retaken after a successful submit.
+    const baseline = useRef(null);
+    const [dirty, setDirty] = useState(false);
+    // Only a form that reads `dirty` pays for it: the flip from clean to dirty
+    // is a render of the whole form, and a field that subscribes for itself
+    // is promised that typing in it renders it alone.
+    const dirtyRead = useRef(false);
+    const snapshot = useCallback(() => {
+        if (!formRef.current)
+            return;
+        baseline.current = serializeForm(formRef.current);
+        setDirty(false);
+    }, []);
+    const measureDirty = useCallback(() => {
+        if (!dirtyRead.current || !formRef.current || baseline.current === null)
+            return;
+        const now = serializeForm(formRef.current) !== baseline.current;
+        setDirty((was) => (was === now ? was : now));
+    }, []);
+    useEffect(snapshot, [snapshot]);
+    // A bound control with no native element behind it changes through the
+    // store, not through an input event - a Radix select - so the store is
+    // watched too. Its input, if it has one, is read back with the rest.
+    useEffect(() => store.subscribe(() => queueMicrotask(measureDirty)), [store, measureDirty]);
+    // Both handles, one element. React 19 hands a function component its ref
+    // as a prop, and spread after the form's own it replaced it - every
+    // FormData read then found null. A caller's ref is filled beside ours.
+    const attachForm = useCallback((element) => {
+        formRef.current = element;
+        if (typeof callerRef === "function")
+            callerRef(element);
+        else if (callerRef)
+            callerRef.current = element;
+    }, [callerRef]);
     const error = useCallback((field) => errors[field]?.[0], [errors]);
     const clearErrors = useCallback((...fields) => {
         if (fields.length === 0) {
@@ -303,7 +302,8 @@ export default function Form({ action, method: methodProp, defaultValues, store:
         formRef.current?.reset();
         setErrors({});
         setCurrentData({});
-    }, []);
+        queueMicrotask(measureDirty);
+    }, [measureDirty]);
     useEffect(() => {
         if (isGetForm && prefetch === "mount") {
             const fn = window.__rsc_prefetch;
@@ -319,7 +319,7 @@ export default function Form({ action, method: methodProp, defaultValues, store:
     const handleSubmit = useCallback(async (e) => {
         e.preventDefault();
         const formData = new FormData(e.currentTarget);
-        const data = formDataToObject(formData);
+        const data = decodeFormData(formData, schema);
         setCurrentData(data);
         if (onSubmit?.(formData) === false) {
             return;
@@ -381,6 +381,12 @@ export default function Form({ action, method: methodProp, defaultValues, store:
                 optimistic?.(data);
                 const result = await serverAction(formData);
                 const refused = resultOf(result);
+                // The action answered with somewhere to go, and callServer has
+                // already started the navigation. Not an error for a form to
+                // show, and not a save to announce either: signing in and going
+                // to the dashboard is the whole success.
+                if (refused?.redirected !== undefined || redirectedTo() !== null)
+                    return;
                 if (refused) {
                     if (refused.errors) {
                         setErrors(refused.errors);
@@ -396,6 +402,8 @@ export default function Form({ action, method: methodProp, defaultValues, store:
                     setTouched({});
                     setCurrentData({});
                 }
+                // Saved: what is in the form now is what the server has.
+                snapshot();
                 setErrors({});
                 setSucceeded(true);
                 setRecentlySucceeded(true);
@@ -404,6 +412,11 @@ export default function Form({ action, method: methodProp, defaultValues, store:
                 onSuccess?.(result);
             }
             catch (err) {
+                // A redirect no longer arrives here - callServer resolves after
+                // performing it - but an action called through something older
+                // than that still may.
+                if (err instanceof ServerRedirectError)
+                    return;
                 if (err instanceof ServerValidationError) {
                     setErrors(err.errors);
                     onError?.(err.errors);
@@ -466,6 +479,10 @@ export default function Form({ action, method: methodProp, defaultValues, store:
     const formStatus = {
         pending: isPending,
         data: currentData,
+        get dirty() {
+            dirtyRead.current = true;
+            return dirty;
+        },
         succeeded,
         recentlySucceeded,
         field,
@@ -475,7 +492,7 @@ export default function Form({ action, method: methodProp, defaultValues, store:
         clearErrors,
         reset: resetForm,
     };
-    return (_jsx(FormStoreContext.Provider, { value: storeContext, children: _jsx(FormStatusContext.Provider, { value: formStatus, children: _jsx("form", { ref: formRef, 
+    return (_jsx(FormStoreContext.Provider, { value: storeContext, children: _jsx(FormStatusContext.Provider, { value: formStatus, children: _jsx("form", { ref: attachForm, 
                 // On the element as well as in the handler, which is what makes this
                 // work before hydration. React emits a form a browser can submit on its
                 // own for a server action, and an ordinary action/method pair for a
@@ -486,10 +503,20 @@ export default function Form({ action, method: methodProp, defaultValues, store:
                 // React does not run a form action when the submit event was cancelled.
                 // So the enhanced path wins whenever there is one, and the native path
                 // is what is left when there is not.
-                action: action, 
+                action: (bindable ? formAction : action), 
                 // Only for a url. React sets the method itself for a server action, and
                 // passing one alongside is what it warns about.
                 method: isGetForm ? method : undefined, onSubmit: handleSubmit, 
+                // Every keystroke and every toggle, from any control in the form,
+                // uncontrolled ones included: React's onInput here is the bubbling
+                // `input` event. A caller's own handler still runs.
+                onInput: (event) => {
+                    rest.onInput?.(event);
+                    measureDirty();
+                }, onChange: (event) => {
+                    rest.onChange?.(event);
+                    measureDirty();
+                }, 
                 // On the form, not only on the bound fields. `focusout` bubbles where
                 // `blur` does not, so React's onBlur here sees every control that was
                 // left — including the uncontrolled ones, which are most of them and