@owlmeans/client-flow 0.1.18-rc.53 → 0.1.18-rc.54

package/README.md

@@ -12,7 +12,7 @@ Client-side flow orchestration service for managing multi-step workflows in brow
 ## Installation
 
 ```bash
-bun add @owlmeans/client-flow@^0.1.18-rc.53
+bun add @owlmeans/client-flow@^0.1.18-rc.54
 ```
 
 ## Usage
@@ -75,7 +75,7 @@ This package ships embedded agent skills under `agent-meta/`. After installing y
 your project's skill store (`.agents/skills/`):
 
 ```sh
-npx @owlmeans/agent-skills@^0.1.18-rc.48
+npx @owlmeans/agent-skills@^0.1.18-rc.49
 ```
 
 The embedded files are version-matched to this package release. Do not edit them

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/client-flow",
-  "version": "0.1.18-rc.53",
-  "generatedAt": "2026-10-05T08:32:19.086Z",
+  "version": "0.1.18-rc.54",
+  "generatedAt": "2026-10-05T21:03:06.361Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

package/agent-meta/skills/client-flow/SKILL.md

@@ -8,7 +8,7 @@ user-invocable: false
 # @owlmeans/client-flow
 
 **Layer:** Client
-**Install:** `"@owlmeans/client-flow": "^0.1.18-rc.53"` in `dependencies`
+**Install:** `"@owlmeans/client-flow": "^0.1.18-rc.54"` in `dependencies`
 
 Two objects, with different lifetimes. The **service** lives on the context and owns the flow
 definitions and the one live `FlowModel`. The **client** is built per screen, wraps that model with
@@ -26,7 +26,7 @@ a `Navigator`, and is what a component actually calls.
 | `ResolvePair` | The `{ resolve, reject }` behind `service.supplied` |
 | `DEFAULT_ALIAS` (`flow`) | The service alias |
 | `FLOW_STATE` (`state:flow`) | Alias of the client resource the state is persisted in, and the record id inside it |
-| `suspendFlow(context, model, { expiresAt })` · `resumeSuspendedFlow(context)` · `RESUME_FLOW` (`resume-flow`) | The suspended landing: park where a flow was headed before sign-in, read it back once after |
+| `flowLandingOf(context)` → `.suspendFlow(model, { expiresAt })` · `.suspendLanding({ entrypoint, query }, { expiresAt })` · `.resumeSuspendedFlow()` · `.discardSuspendedLanding()` · `RESUME_FLOW` (`resume-flow`) | The suspended landing: park where a flow was headed (or a known screen) before sign-in, read it back once after, or drop it unread |
 | `SuspendedLanding` `{ entrypoint, query }` · `SuspendedLandingRecord` | What resumes / what is stored |
 | `EXTRA_FLOW` (`extra-flow`) · `REHACK_MOD` (`__redirect`) | Id of the second, side-band state record kept in the same resource, and the alias of the entrypoint synthesized to address a target service |
 
@@ -127,27 +127,34 @@ record all belong to the OIDC sign-in machinery, so a flow that must leave for s
 side-band record under `RESUME_FLOW` in the same `FLOW_STATE` resource — the `EXTRA_FLOW` precedent —
 which is IndexedDB in a browser and so survives a full-page Google round trip.
 
-- `suspendFlow(context, model, { expiresAt })` asks the model's own `next()` where the current step
+- `flowLandingOf(context).suspendFlow(model, { expiresAt })` asks the model's own `next()` where the current step
   leads and stores that destination step's **`module`** (an entrypoint alias), the model's `payload()`
   as `query`, and `expiresAt` (epoch ms). It answers `false` — and stores nothing — when `FLOW_STATE`
   is not registered, the step has no forward transition, or the destination has no `module`; the
   caller then lands on `HOME` as before. The record is not a serialized flow token: the destination
   is a screen the app can enter fresh, reading its own parameters from the query.
-- `resumeSuspendedFlow(context)` returns `{ entrypoint, query }` or `null`, and is **delete-on-read** —
+- `.suspendLanding({ entrypoint, query }, { expiresAt })` writes the SAME record for a caller
+  whose destination is already an alias rather than a flow step — `@owlmeans/client-auth`'s login
+  facade parks `useLogin(target)`'s screen with it. One record, one reader: the later write replaces
+  the earlier, whichever helper wrote it. `false` when `FLOW_STATE` is not registered.
+- `.discardSuspendedLanding()` deletes the record unread — for a sign-in that ended without
+  signing anyone in, so its landing cannot hijack the next, unrelated one. A no-op with nothing there.
+- `.resumeSuspendedFlow()` returns `{ entrypoint, query }` or `null`, and is **delete-on-read** —
   a landing answers exactly one sign-in, so a stale tab's record never resurrects on someone else's
   later sign-in. `null` covers no resource, no record, a failed read and an expired record.
 - **Destinations are entrypoint aliases from a registered flow definition, never stored URLs**, so a
   landing cannot become an open redirect. Consumers navigate to the alias with the query.
 
-Two flows use it today: the OAuth consent screen (`oauthFlow`, a signed-out person on a consent link) and
-viable's intent-first landing (`intentFlow` from `@owlmeans/viable-common/intent`, a visitor who arrives
-from the public site with `?ref=` and no account) — both enter their flow FRESH on an `initial` screen
-and never carry `?flow=`.
+Writers today: `useLogin(target)` (`@owlmeans/client-auth`, through the login facade's
+`suspendLanding`), the OAuth consent screen (`oauthFlow`, a signed-out person on a consent link) and
+viable's intent-first landing (`intentFlow` from `@owlmeans/viable-common/intent`, a visitor who
+arrives from the public site with `?ref=` and no account) — the two flows enter FRESH on an `initial`
+screen and never carry `?flow=`.
 
 Every sign-in completion asks `resumeSuspendedFlow` before it navigates home: `DispatcherHOC`'s HOME
 branch (`@owlmeans/client-auth`, so the `/dispatcher?token=` and resume paths are covered) and the
 supervisor and Google login plugins (`web-auth`, `web-oidc-rp`) — see [[login-plugins]].
-`bun test ./tests` covers suspend, resume, expiry and the empty cases.
+`bun test ./tests` covers suspend (flow and known landing), resume, discard, expiry and the empty cases.
 
 ## Depends On
 

package/build/index.d.ts

@@ -1,4 +1,5 @@
 export type * from './types.js';
+export type * from './landing/types.js';
 export * from './consts.js';
 export * from './client.js';
 export * from './service.js';

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,mBAAmB,YAAY,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,mBAAmB,YAAY,CAAA;AAC/B,mBAAmB,oBAAoB,CAAA;AACvC,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA"}

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA"}

package/build/landing/types.d.ts

@@ -0,0 +1,56 @@
+import type { FlowModel } from '@owlmeans/flow';
+import type { SuspendedLanding } from '../types.js';
+/** A flow suspended across the platform's sign-in, and the landing it is resumed at. */
+export interface FlowLandingHelper {
+    /**
+     * Suspend a flow that is about to leave for the platform's own sign-in dispatcher, so whichever
+     * sign-in method completes can send the person back to where they started instead of `HOME`.
+     *
+     * Driven by the flow model rather than a raw URL: `model.next()` is the flow's own answer to
+     * "where does this step lead", so a caller never re-derives a destination the flow already knows,
+     * and a flow whose current step offers no way forward (`next()` throws) suspends nothing rather
+     * than persisting a landing that can never be reached. The persisted record is deliberately NOT a
+     * serialized flow token — the destination step is always one this application can enter fresh (an
+     * `initial`-marked screen reading its own `ref`/`kind` from the query), so nothing needs to
+     * reconstruct the exact `FlowModel` instance on the other side of a sign-in redirect, and this
+     * helper stays usable by any flow, not only one particular package's.
+     *
+     * Returns `false` when there is nowhere to persist this (no `FLOW_STATE` resource registered) or
+     * nothing to suspend to (the current step has no forward transition, or its destination has no
+     * `module`) — the caller falls back to its own default landing (ordinarily `HOME`).
+     */
+    suspendFlow: (model: FlowModel, opts: {
+        expiresAt: number;
+    }) => Promise<boolean>;
+    /**
+     * Suspend a landing whose destination is already known — an entrypoint alias, not a flow step —
+     * into the same side-band record {@link suspendFlow} writes and {@link resumeSuspendedFlow} reads.
+     *
+     * For a caller that has no flow to derive a destination from: a sign-in control aimed at one
+     * screen (`useLogin(target)` in `@owlmeans/client-auth`) parks that screen here and sends the person
+     * to the dispatcher, whose ordinary post-sign-in landing then resumes on it. One record, one reader:
+     * a landing parked this way and one parked by a flow are indistinguishable on the other side, and
+     * the later write replaces the earlier one.
+     *
+     * Returns `false` when there is nowhere to persist this (no `FLOW_STATE` resource registered).
+     */
+    suspendLanding: (landing: SuspendedLanding, opts: {
+        expiresAt: number;
+    }) => Promise<boolean>;
+    /**
+     * Drop a suspended landing without acting on it — for a sign-in that ended before it signed anyone
+     * in (a refused popup, a window the person closed), so the landing it parked cannot hijack the next,
+     * unrelated sign-in. Safe to call when nothing is suspended or nowhere to keep it exists.
+     */
+    discardSuspendedLanding: () => Promise<void>;
+    /**
+     * Read back a suspended landing, once. Delete-on-read: the record answers exactly one sign-in,
+     * because a landing a stale browser tab left behind must never resurrect on somebody else's
+     * sign-in later in the same session.
+     *
+     * `null` covers every reason there is nothing to resume: no resource, no record, or a record
+     * whose window has closed — the caller's own default landing is exactly as safe an answer.
+     */
+    resumeSuspendedFlow: () => Promise<SuspendedLanding | null>;
+}
+//# sourceMappingURL=types.d.ts.map

package/build/landing/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/landing/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,wFAAwF;AACxF,MAAM,WAAW,iBAAiB;IAChC;;;;;;;;;;;;;;;;OAgBG;IACH,WAAW,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IAChF;;;;;;;;;;;OAWG;IACH,cAAc,EAAE,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5F;;;;OAIG;IACH,uBAAuB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5C;;;;;;;OAOG;IACH,mBAAmB,EAAE,MAAM,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CAC5D"}

package/build/landing/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/build/landing/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/landing/types.ts"],"names":[],"mappings":""}

package/build/landing.d.ts

@@ -2,33 +2,13 @@ import type { ClientContext } from '@owlmeans/client';
 import type { ClientConfig } from '@owlmeans/client-context';
 import type { FlowModel } from '@owlmeans/flow';
 import type { SuspendedLanding } from './types.js';
-/**
- * Suspend a flow that is about to leave for the platform's own sign-in dispatcher, so whichever
- * sign-in method completes can send the person back to where they started instead of `HOME`.
- *
- * Driven by the flow model rather than a raw URL: `model.next()` is the flow's own answer to
- * "where does this step lead", so a caller never re-derives a destination the flow already knows,
- * and a flow whose current step offers no way forward (`next()` throws) suspends nothing rather
- * than persisting a landing that can never be reached. The persisted record is deliberately NOT a
- * serialized flow token — the destination step is always one this application can enter fresh (an
- * `initial`-marked screen reading its own `ref`/`kind` from the query), so nothing needs to
- * reconstruct the exact `FlowModel` instance on the other side of a sign-in redirect, and this
- * helper stays usable by any flow, not only one particular package's.
- *
- * Returns `false` when there is nowhere to persist this (no `FLOW_STATE` resource registered) or
- * nothing to suspend to (the current step has no forward transition, or its destination has no
- * `module`) — the caller falls back to its own default landing (ordinarily `HOME`).
- */
+import type { FlowLandingHelper } from './landing/types.js';
+export declare const makeFlowLandingHelper: <C extends ClientConfig, T extends ClientContext<C>>(context: T) => FlowLandingHelper;
+export declare const flowLandingOf: <C extends ClientConfig, T extends ClientContext<C>>(target: T) => FlowLandingHelper;
+/** @deprecated compat:factory-refactor — use `flowLandingOf(context).suspendFlow(…)` */
 export declare const suspendFlow: <C extends ClientConfig, T extends ClientContext<C>>(context: T, model: FlowModel, opts: {
     expiresAt: number;
 }) => Promise<boolean>;
-/**
- * Read back a suspended landing, once. Delete-on-read: the record answers exactly one sign-in,
- * because a landing a stale browser tab left behind must never resurrect on somebody else's
- * sign-in later in the same session.
- *
- * `null` covers every reason there is nothing to resume: no resource, no record, or a record
- * whose window has closed — the caller's own default landing is exactly as safe an answer.
- */
+/** @deprecated compat:factory-refactor — use `flowLandingOf(context).resumeSuspendedFlow()` */
 export declare const resumeSuspendedFlow: <C extends ClientConfig, T extends ClientContext<C>>(context: T) => Promise<SuspendedLanding | null>;
 //# sourceMappingURL=landing.d.ts.map

package/build/landing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"landing.d.ts","sourceRoot":"","sources":["../src/landing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,OAAO,KAAK,EAAE,gBAAgB,EAA0B,MAAM,YAAY,CAAA;AAO1E;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,WAAW,GAAU,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,WACzE,CAAC,SAAS,SAAS,QAAQ;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,KACxD,OAAO,CAAC,OAAO,CAkBjB,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,GAAU,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,WACjF,CAAC,KACT,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAgBjC,CAAA"}
+{"version":3,"file":"landing.d.ts","sourceRoot":"","sources":["../src/landing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,OAAO,KAAK,EAAE,gBAAgB,EAA0B,MAAM,YAAY,CAAA;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAE3D,eAAO,MAAM,qBAAqB,GAAI,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,WAC7E,CAAC,KACT,iBAyDF,CAAA;AAED,eAAO,MAAM,aAAa,GA7DY,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,iCA6DlB,CAAA;AAEtE,wFAAwF;AACxF,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,WACnE,CAAC,SAAS,SAAS,QAAQ;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,KACxD,OAAO,CAAC,OAAO,CAAoD,CAAA;AAEtE,+FAA+F;AAC/F,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,WAC3E,CAAC,KACT,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAiD,CAAA"}

package/build/landing.js

@@ -1,65 +1,61 @@
+import { memoHelper } from '@owlmeans/context';
 import { FLOW_STATE, RESUME_FLOW } from './consts.js';
-const landingResource = (context) => context.hasResource(FLOW_STATE) ? context.resource(FLOW_STATE) : null;
-/**
- * Suspend a flow that is about to leave for the platform's own sign-in dispatcher, so whichever
- * sign-in method completes can send the person back to where they started instead of `HOME`.
- *
- * Driven by the flow model rather than a raw URL: `model.next()` is the flow's own answer to
- * "where does this step lead", so a caller never re-derives a destination the flow already knows,
- * and a flow whose current step offers no way forward (`next()` throws) suspends nothing rather
- * than persisting a landing that can never be reached. The persisted record is deliberately NOT a
- * serialized flow token — the destination step is always one this application can enter fresh (an
- * `initial`-marked screen reading its own `ref`/`kind` from the query), so nothing needs to
- * reconstruct the exact `FlowModel` instance on the other side of a sign-in redirect, and this
- * helper stays usable by any flow, not only one particular package's.
- *
- * Returns `false` when there is nowhere to persist this (no `FLOW_STATE` resource registered) or
- * nothing to suspend to (the current step has no forward transition, or its destination has no
- * `module`) — the caller falls back to its own default landing (ordinarily `HOME`).
- */
-export const suspendFlow = async (context, model, opts) => {
-    const resource = landingResource(context);
-    if (resource == null)
-        return false;
-    let destinationModule;
-    try {
-        const transition = model.next();
-        destinationModule = model.step(transition.step).module;
-    }
-    catch {
-        return false;
-    }
-    if (destinationModule == null)
-        return false;
-    await resource.save({
-        id: RESUME_FLOW, entrypoint: destinationModule, query: model.payload(), expiresAt: opts.expiresAt,
-    });
-    return true;
-};
-/**
- * Read back a suspended landing, once. Delete-on-read: the record answers exactly one sign-in,
- * because a landing a stale browser tab left behind must never resurrect on somebody else's
- * sign-in later in the same session.
- *
- * `null` covers every reason there is nothing to resume: no resource, no record, or a record
- * whose window has closed — the caller's own default landing is exactly as safe an answer.
- */
-export const resumeSuspendedFlow = async (context) => {
-    const resource = landingResource(context);
-    if (resource == null)
-        return null;
-    let record;
-    try {
-        record = await resource.load(RESUME_FLOW);
-    }
-    catch {
-        return null;
-    }
-    if (record == null)
-        return null;
-    await resource.delete(RESUME_FLOW).catch(() => undefined);
-    if (record.expiresAt < Date.now())
-        return null;
-    return { entrypoint: record.entrypoint, query: record.query };
+export const makeFlowLandingHelper = (context) => {
+    const landingResource = () => context.hasResource(FLOW_STATE) ? context.resource(FLOW_STATE) : null;
+    const suspendFlow = async (model, opts) => {
+        const resource = landingResource();
+        if (resource == null)
+            return false;
+        let destinationModule;
+        try {
+            const transition = model.next();
+            destinationModule = model.step(transition.step).module;
+        }
+        catch {
+            return false;
+        }
+        if (destinationModule == null)
+            return false;
+        return await suspendLanding({ entrypoint: destinationModule, query: model.payload() }, opts);
+    };
+    const suspendLanding = async (landing, opts) => {
+        const resource = landingResource();
+        if (resource == null)
+            return false;
+        await resource.save({
+            id: RESUME_FLOW, entrypoint: landing.entrypoint, query: landing.query, expiresAt: opts.expiresAt,
+        });
+        return true;
+    };
+    const discardSuspendedLanding = async () => {
+        const resource = landingResource();
+        if (resource == null)
+            return;
+        await resource.delete(RESUME_FLOW).catch(() => undefined);
+    };
+    const resumeSuspendedFlow = async () => {
+        const resource = landingResource();
+        if (resource == null)
+            return null;
+        let record;
+        try {
+            record = await resource.load(RESUME_FLOW);
+        }
+        catch {
+            return null;
+        }
+        if (record == null)
+            return null;
+        await resource.delete(RESUME_FLOW).catch(() => undefined);
+        if (record.expiresAt < Date.now())
+            return null;
+        return { entrypoint: record.entrypoint, query: record.query };
+    };
+    return { suspendFlow, suspendLanding, discardSuspendedLanding, resumeSuspendedFlow };
 };
+export const flowLandingOf = memoHelper.oncePer(makeFlowLandingHelper);
+/** @deprecated compat:factory-refactor — use `flowLandingOf(context).suspendFlow(…)` */
+export const suspendFlow = (context, model, opts) => flowLandingOf(context).suspendFlow(model, opts);
+/** @deprecated compat:factory-refactor — use `flowLandingOf(context).resumeSuspendedFlow()` */
+export const resumeSuspendedFlow = (context) => flowLandingOf(context).resumeSuspendedFlow();
 //# sourceMappingURL=landing.js.map

package/build/landing.js.map

@@ -1 +1 @@
-{"version":3,"file":"landing.js","sourceRoot":"","sources":["../src/landing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAGrD,MAAM,eAAe,GAAG,CACtB,OAAU,EACqC,EAAE,CACjD,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAyC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AAE/G;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,OAAU,EAAE,KAAgB,EAAE,IAA2B,EACvC,EAAE;IACpB,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAA;IACzC,IAAI,QAAQ,IAAI,IAAI;QAAE,OAAO,KAAK,CAAA;IAElC,IAAI,iBAAqC,CAAA;IACzC,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;QAC/B,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,CAAA;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,iBAAiB,IAAI,IAAI;QAAE,OAAO,KAAK,CAAA;IAE3C,MAAM,QAAQ,CAAC,IAAI,CAAC;QAClB,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS;KAClG,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,OAAU,EACwB,EAAE;IACpC,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAA;IACzC,IAAI,QAAQ,IAAI,IAAI;QAAE,OAAO,IAAI,CAAA;IAEjC,IAAI,MAAqC,CAAA;IACzC,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,IAAI,CAAA;IAE/B,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;IACzD,IAAI,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE;QAAE,OAAO,IAAI,CAAA;IAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAA;AAC/D,CAAC,CAAA"}
+{"version":3,"file":"landing.js","sourceRoot":"","sources":["../src/landing.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAIrD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,OAAU,EACS,EAAE;IACrB,MAAM,eAAe,GAAG,GAAkD,EAAE,CAC1E,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAyC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAE/G,MAAM,WAAW,GAAG,KAAK,EAAE,KAAgB,EAAE,IAA2B,EAAoB,EAAE;QAC5F,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAA;QAClC,IAAI,QAAQ,IAAI,IAAI;YAAE,OAAO,KAAK,CAAA;QAElC,IAAI,iBAAqC,CAAA;QACzC,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;YAC/B,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,CAAA;QACxD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAA;QACd,CAAC;QACD,IAAI,iBAAiB,IAAI,IAAI;YAAE,OAAO,KAAK,CAAA;QAE3C,OAAO,MAAM,cAAc,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;IAC9F,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,KAAK,EAAE,OAAyB,EAAE,IAA2B,EAAoB,EAAE;QACxG,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAA;QAClC,IAAI,QAAQ,IAAI,IAAI;YAAE,OAAO,KAAK,CAAA;QAElC,MAAM,QAAQ,CAAC,IAAI,CAAC;YAClB,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS;SACjG,CAAC,CAAA;QAEF,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IAED,MAAM,uBAAuB,GAAG,KAAK,IAAmB,EAAE;QACxD,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAA;QAClC,IAAI,QAAQ,IAAI,IAAI;YAAE,OAAM;QAE5B,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;IAC3D,CAAC,CAAA;IAED,MAAM,mBAAmB,GAAG,KAAK,IAAsC,EAAE;QACvE,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAA;QAClC,IAAI,QAAQ,IAAI,IAAI;YAAE,OAAO,IAAI,CAAA;QAEjC,IAAI,MAAqC,CAAA;QACzC,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC3C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,MAAM,IAAI,IAAI;YAAE,OAAO,IAAI,CAAA;QAE/B,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QACzD,IAAI,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE;YAAE,OAAO,IAAI,CAAA;QAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAA;IAC/D,CAAC,CAAA;IAED,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,CAAA;AACtF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAEtE,wFAAwF;AACxF,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,OAAU,EAAE,KAAgB,EAAE,IAA2B,EACvC,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AAEtE,+FAA+F;AAC/F,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,OAAU,EACwB,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,CAAA"}

package/build/service.js

@@ -1,6 +1,6 @@
 import { assertContext, createLazyService } from '@owlmeans/context';
 import { DEFAULT_ALIAS } from './consts.js';
-import { DEFAULT_ALIAS as CONFIG_RESOURCE, fromConfigRecord } from '@owlmeans/config';
+import { DEFAULT_ALIAS as CONFIG_RESOURCE, configHelper } from '@owlmeans/config';
 import { FLOW_RECORD, FlowUnsupported, makeFlowModel, STD_AUTH_FLOW, UnknownFlow } from '@owlmeans/flow';
 export const makeBasicFlowService = (alias = DEFAULT_ALIAS) => {
     const location = `flow-service:${alias}`;
@@ -50,7 +50,7 @@ export const makeBasicFlowService = (alias = DEFAULT_ALIAS) => {
         // @TODO Put it into some configuration and make it more flexible
         const configRes = ctx.resource(CONFIG_RESOURCE);
         const flowConfigs = await configRes.list({ recordType: FLOW_RECORD });
-        await Promise.all(flowConfigs.items.map(item => fromConfigRecord(item)).map(async (flow) => {
+        await Promise.all(flowConfigs.items.map(item => configHelper.fromConfigRecord(item)).map(async (flow) => {
             Object.values(flow.steps).forEach(step => {
                 if (step.service.startsWith('$')) {
                     const service = flowCfg.services?.[step.service.substring(1)];

package/build/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/client-flow",
-  "version": "0.1.18-rc.53",
+  "version": "0.1.18-rc.54",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -22,25 +22,25 @@
     }
   },
   "dependencies": {
-    "@owlmeans/auth-common": "^0.1.18-rc.46",
-    "@owlmeans/client": "^0.1.18-rc.50",
-    "@owlmeans/client-context": "^0.1.18-rc.47",
-    "@owlmeans/client-entrypoint": "^0.1.18-rc.46",
-    "@owlmeans/client-resource": "^0.1.18-rc.46",
-    "@owlmeans/config": "^0.1.18-rc.43",
-    "@owlmeans/context": "^0.1.18-rc.33",
-    "@owlmeans/error": "^0.1.18-rc.37",
-    "@owlmeans/flow": "^0.1.18-rc.44",
-    "@owlmeans/entrypoint": "^0.1.18-rc.40",
-    "@owlmeans/resource": "^0.1.18-rc.39",
-    "@owlmeans/route": "^0.1.18-rc.34"
+    "@owlmeans/auth-common": "^0.1.18-rc.47",
+    "@owlmeans/client": "^0.1.18-rc.51",
+    "@owlmeans/client-context": "^0.1.18-rc.48",
+    "@owlmeans/client-entrypoint": "^0.1.18-rc.47",
+    "@owlmeans/client-resource": "^0.1.18-rc.47",
+    "@owlmeans/config": "^0.1.18-rc.44",
+    "@owlmeans/context": "^0.1.18-rc.34",
+    "@owlmeans/error": "^0.1.18-rc.38",
+    "@owlmeans/flow": "^0.1.18-rc.45",
+    "@owlmeans/entrypoint": "^0.1.18-rc.41",
+    "@owlmeans/resource": "^0.1.18-rc.40",
+    "@owlmeans/route": "^0.1.18-rc.35"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
     "@owlmeans/dep-config": "workspace:*",
-    "@owlmeans/static-resource": "^0.1.18-rc.38",
+    "@owlmeans/static-resource": "^0.1.18-rc.39",
     "@types/bun": "^1.4.2",
     "nodemon": "^3.1.14",
     "typescript": "^7.0.2"

package/src/index.ts

@@ -1,4 +1,5 @@
 export type * from './types.js'
+export type * from './landing/types.js'
 export * from './consts.js'
 export * from './client.js'
 export * from './service.js'

package/src/landing/types.ts

@@ -0,0 +1,52 @@
+import type { FlowModel } from '@owlmeans/flow'
+import type { SuspendedLanding } from '../types.js'
+
+/** A flow suspended across the platform's sign-in, and the landing it is resumed at. */
+export interface FlowLandingHelper {
+  /**
+   * Suspend a flow that is about to leave for the platform's own sign-in dispatcher, so whichever
+   * sign-in method completes can send the person back to where they started instead of `HOME`.
+   *
+   * Driven by the flow model rather than a raw URL: `model.next()` is the flow's own answer to
+   * "where does this step lead", so a caller never re-derives a destination the flow already knows,
+   * and a flow whose current step offers no way forward (`next()` throws) suspends nothing rather
+   * than persisting a landing that can never be reached. The persisted record is deliberately NOT a
+   * serialized flow token — the destination step is always one this application can enter fresh (an
+   * `initial`-marked screen reading its own `ref`/`kind` from the query), so nothing needs to
+   * reconstruct the exact `FlowModel` instance on the other side of a sign-in redirect, and this
+   * helper stays usable by any flow, not only one particular package's.
+   *
+   * Returns `false` when there is nowhere to persist this (no `FLOW_STATE` resource registered) or
+   * nothing to suspend to (the current step has no forward transition, or its destination has no
+   * `module`) — the caller falls back to its own default landing (ordinarily `HOME`).
+   */
+  suspendFlow: (model: FlowModel, opts: { expiresAt: number }) => Promise<boolean>
+  /**
+   * Suspend a landing whose destination is already known — an entrypoint alias, not a flow step —
+   * into the same side-band record {@link suspendFlow} writes and {@link resumeSuspendedFlow} reads.
+   *
+   * For a caller that has no flow to derive a destination from: a sign-in control aimed at one
+   * screen (`useLogin(target)` in `@owlmeans/client-auth`) parks that screen here and sends the person
+   * to the dispatcher, whose ordinary post-sign-in landing then resumes on it. One record, one reader:
+   * a landing parked this way and one parked by a flow are indistinguishable on the other side, and
+   * the later write replaces the earlier one.
+   *
+   * Returns `false` when there is nowhere to persist this (no `FLOW_STATE` resource registered).
+   */
+  suspendLanding: (landing: SuspendedLanding, opts: { expiresAt: number }) => Promise<boolean>
+  /**
+   * Drop a suspended landing without acting on it — for a sign-in that ended before it signed anyone
+   * in (a refused popup, a window the person closed), so the landing it parked cannot hijack the next,
+   * unrelated sign-in. Safe to call when nothing is suspended or nowhere to keep it exists.
+   */
+  discardSuspendedLanding: () => Promise<void>
+  /**
+   * Read back a suspended landing, once. Delete-on-read: the record answers exactly one sign-in,
+   * because a landing a stale browser tab left behind must never resurrect on somebody else's
+   * sign-in later in the same session.
+   *
+   * `null` covers every reason there is nothing to resume: no resource, no record, or a record
+   * whose window has closed — the caller's own default landing is exactly as safe an answer.
+   */
+  resumeSuspendedFlow: () => Promise<SuspendedLanding | null>
+}

package/src/landing.ts

@@ -1,78 +1,81 @@
 import type { ClientContext } from '@owlmeans/client'
 import type { ClientConfig } from '@owlmeans/client-context'
 import type { ClientResource } from '@owlmeans/client-resource'
+import { memoHelper } from '@owlmeans/context'
 import type { FlowModel } from '@owlmeans/flow'
 import { FLOW_STATE, RESUME_FLOW } from './consts.js'
 import type { SuspendedLanding, SuspendedLandingRecord } from './types.js'
+import type { FlowLandingHelper } from './landing/types.js'
 
-const landingResource = <C extends ClientConfig, T extends ClientContext<C>>(
+export const makeFlowLandingHelper = <C extends ClientConfig, T extends ClientContext<C>>(
   context: T
-): ClientResource<SuspendedLandingRecord> | null =>
-  context.hasResource(FLOW_STATE) ? context.resource<ClientResource<SuspendedLandingRecord>>(FLOW_STATE) : null
-
-/**
- * Suspend a flow that is about to leave for the platform's own sign-in dispatcher, so whichever
- * sign-in method completes can send the person back to where they started instead of `HOME`.
- *
- * Driven by the flow model rather than a raw URL: `model.next()` is the flow's own answer to
- * "where does this step lead", so a caller never re-derives a destination the flow already knows,
- * and a flow whose current step offers no way forward (`next()` throws) suspends nothing rather
- * than persisting a landing that can never be reached. The persisted record is deliberately NOT a
- * serialized flow token — the destination step is always one this application can enter fresh (an
- * `initial`-marked screen reading its own `ref`/`kind` from the query), so nothing needs to
- * reconstruct the exact `FlowModel` instance on the other side of a sign-in redirect, and this
- * helper stays usable by any flow, not only one particular package's.
- *
- * Returns `false` when there is nowhere to persist this (no `FLOW_STATE` resource registered) or
- * nothing to suspend to (the current step has no forward transition, or its destination has no
- * `module`) — the caller falls back to its own default landing (ordinarily `HOME`).
- */
-export const suspendFlow = async <C extends ClientConfig, T extends ClientContext<C>>(
-  context: T, model: FlowModel, opts: { expiresAt: number }
-): Promise<boolean> => {
-  const resource = landingResource(context)
-  if (resource == null) return false
-
-  let destinationModule: string | undefined
-  try {
-    const transition = model.next()
-    destinationModule = model.step(transition.step).module
-  } catch {
-    return false
+): FlowLandingHelper => {
+  const landingResource = (): ClientResource<SuspendedLandingRecord> | null =>
+    context.hasResource(FLOW_STATE) ? context.resource<ClientResource<SuspendedLandingRecord>>(FLOW_STATE) : null
+
+  const suspendFlow = async (model: FlowModel, opts: { expiresAt: number }): Promise<boolean> => {
+    const resource = landingResource()
+    if (resource == null) return false
+
+    let destinationModule: string | undefined
+    try {
+      const transition = model.next()
+      destinationModule = model.step(transition.step).module
+    } catch {
+      return false
+    }
+    if (destinationModule == null) return false
+
+    return await suspendLanding({ entrypoint: destinationModule, query: model.payload() }, opts)
   }
-  if (destinationModule == null) return false
 
-  await resource.save({
-    id: RESUME_FLOW, entrypoint: destinationModule, query: model.payload(), expiresAt: opts.expiresAt,
-  })
+  const suspendLanding = async (landing: SuspendedLanding, opts: { expiresAt: number }): Promise<boolean> => {
+    const resource = landingResource()
+    if (resource == null) return false
 
-  return true
-}
+    await resource.save({
+      id: RESUME_FLOW, entrypoint: landing.entrypoint, query: landing.query, expiresAt: opts.expiresAt,
+    })
 
-/**
- * Read back a suspended landing, once. Delete-on-read: the record answers exactly one sign-in,
- * because a landing a stale browser tab left behind must never resurrect on somebody else's
- * sign-in later in the same session.
- *
- * `null` covers every reason there is nothing to resume: no resource, no record, or a record
- * whose window has closed — the caller's own default landing is exactly as safe an answer.
- */
-export const resumeSuspendedFlow = async <C extends ClientConfig, T extends ClientContext<C>>(
-  context: T
-): Promise<SuspendedLanding | null> => {
-  const resource = landingResource(context)
-  if (resource == null) return null
-
-  let record: SuspendedLandingRecord | null
-  try {
-    record = await resource.load(RESUME_FLOW)
-  } catch {
-    return null
+    return true
+  }
+
+  const discardSuspendedLanding = async (): Promise<void> => {
+    const resource = landingResource()
+    if (resource == null) return
+
+    await resource.delete(RESUME_FLOW).catch(() => undefined)
   }
-  if (record == null) return null
 
-  await resource.delete(RESUME_FLOW).catch(() => undefined)
-  if (record.expiresAt < Date.now()) return null
+  const resumeSuspendedFlow = async (): Promise<SuspendedLanding | null> => {
+    const resource = landingResource()
+    if (resource == null) return null
 
-  return { entrypoint: record.entrypoint, query: record.query }
+    let record: SuspendedLandingRecord | null
+    try {
+      record = await resource.load(RESUME_FLOW)
+    } catch {
+      return null
+    }
+    if (record == null) return null
+
+    await resource.delete(RESUME_FLOW).catch(() => undefined)
+    if (record.expiresAt < Date.now()) return null
+
+    return { entrypoint: record.entrypoint, query: record.query }
+  }
+
+  return { suspendFlow, suspendLanding, discardSuspendedLanding, resumeSuspendedFlow }
 }
+
+export const flowLandingOf = memoHelper.oncePer(makeFlowLandingHelper)
+
+/** @deprecated compat:factory-refactor — use `flowLandingOf(context).suspendFlow(…)` */
+export const suspendFlow = <C extends ClientConfig, T extends ClientContext<C>>(
+  context: T, model: FlowModel, opts: { expiresAt: number }
+): Promise<boolean> => flowLandingOf(context).suspendFlow(model, opts)
+
+/** @deprecated compat:factory-refactor — use `flowLandingOf(context).resumeSuspendedFlow()` */
+export const resumeSuspendedFlow = <C extends ClientConfig, T extends ClientContext<C>>(
+  context: T
+): Promise<SuspendedLanding | null> => flowLandingOf(context).resumeSuspendedFlow()

package/src/service.ts

@@ -1,7 +1,7 @@
 import { assertContext, createLazyService } from '@owlmeans/context'
 import type { ConfigRecord } from '@owlmeans/context'
 import { DEFAULT_ALIAS } from './consts.js'
-import { DEFAULT_ALIAS as CONFIG_RESOURCE, fromConfigRecord } from '@owlmeans/config'
+import { DEFAULT_ALIAS as CONFIG_RESOURCE, configHelper } from '@owlmeans/config'
 import type { ConfigResource } from '@owlmeans/config'
 import type { FlowService, ResolvePair } from './types.js'
 import type { Flow, FlowConfigRecord, WithFlowConfig } from '@owlmeans/flow'
@@ -72,7 +72,7 @@ export const makeBasicFlowService = (alias: string = DEFAULT_ALIAS): FlowService
     const configRes = ctx.resource<ConfigResource>(CONFIG_RESOURCE)
     const flowConfigs = await configRes.list({ recordType: FLOW_RECORD })
     await Promise.all(flowConfigs.items.map(
-      item => fromConfigRecord<ConfigRecord, FlowConfigRecord>(item)
+      item => configHelper.fromConfigRecord<ConfigRecord, FlowConfigRecord>(item)
     ).map(async flow => {
       Object.values(flow.steps).forEach(step => {
         if (step.service.startsWith('$')) {

package/tests/landing.spec.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'bun:test'
 import { makeFlowModel } from '@owlmeans/flow'
 import type { ShallowFlow } from '@owlmeans/flow'
-import { resumeSuspendedFlow, suspendFlow } from '../src/landing.js'
+import { flowLandingOf } from '../src/landing.js'
 import { makeTestContext } from './context.js'
 
 const testFlow: ShallowFlow = {
@@ -29,27 +29,27 @@ describe('suspendFlow / resumeSuspendedFlow', () => {
     const model = await makeFlowModel(testFlow)
     model.updatePayload({ ref: 'abc-123' })
 
-    expect(await suspendFlow(context, model, { expiresAt: Date.now() + 60_000 })).toBe(true)
+    expect(await flowLandingOf(context).suspendFlow(model, { expiresAt: Date.now() + 60_000 })).toBe(true)
 
-    const landing = await resumeSuspendedFlow(context)
+    const landing = await flowLandingOf(context).resumeSuspendedFlow()
     expect(landing).toEqual({ entrypoint: 'target-entrypoint', query: { ref: 'abc-123' } })
   })
 
   test('resuming is single-use — a second call finds nothing', async () => {
     const context = makeTestContext()
     const model = await makeFlowModel(testFlow)
-    await suspendFlow(context, model, { expiresAt: Date.now() + 60_000 })
+    await flowLandingOf(context).suspendFlow(model, { expiresAt: Date.now() + 60_000 })
 
-    await resumeSuspendedFlow(context)
-    expect(await resumeSuspendedFlow(context)).toBeNull()
+    await flowLandingOf(context).resumeSuspendedFlow()
+    expect(await flowLandingOf(context).resumeSuspendedFlow()).toBeNull()
   })
 
   test('an expired landing resumes to nothing', async () => {
     const context = makeTestContext()
     const model = await makeFlowModel(testFlow)
-    await suspendFlow(context, model, { expiresAt: Date.now() - 1 })
+    await flowLandingOf(context).suspendFlow(model, { expiresAt: Date.now() - 1 })
 
-    expect(await resumeSuspendedFlow(context)).toBeNull()
+    expect(await flowLandingOf(context).resumeSuspendedFlow()).toBeNull()
   })
 
   test('a step with no forward transition suspends nothing', async () => {
@@ -59,15 +59,50 @@ describe('suspendFlow / resumeSuspendedFlow', () => {
     // has nothing to offer and suspending must decline rather than persist a landing to nowhere.
     deadModel.setState({ ...deadModel.state(), step: 'dead' })
 
-    expect(await suspendFlow(context, deadModel, { expiresAt: Date.now() + 60_000 })).toBe(false)
-    expect(await resumeSuspendedFlow(context)).toBeNull()
+    expect(await flowLandingOf(context).suspendFlow(deadModel, { expiresAt: Date.now() + 60_000 })).toBe(false)
+    expect(await flowLandingOf(context).resumeSuspendedFlow()).toBeNull()
   })
 
   test('with no FLOW_STATE resource registered, both are safe no-ops', async () => {
     const context = makeTestContext(false)
     const model = await makeFlowModel(testFlow)
 
-    expect(await suspendFlow(context, model, { expiresAt: Date.now() + 60_000 })).toBe(false)
-    expect(await resumeSuspendedFlow(context)).toBeNull()
+    expect(await flowLandingOf(context).suspendFlow(model, { expiresAt: Date.now() + 60_000 })).toBe(false)
+    expect(await flowLandingOf(context).resumeSuspendedFlow()).toBeNull()
+  })
+})
+
+describe('suspendLanding / discardSuspendedLanding', () => {
+  test('parks a known destination in the record resumeSuspendedFlow reads, once', async () => {
+    const context = makeTestContext()
+
+    expect(await flowLandingOf(context).suspendLanding({ entrypoint: 'guarded-screen', query: {} }, { expiresAt: Date.now() + 60_000 })).toBe(true)
+
+    expect(await flowLandingOf(context).resumeSuspendedFlow()).toEqual({ entrypoint: 'guarded-screen', query: {} })
+    expect(await flowLandingOf(context).resumeSuspendedFlow()).toBeNull()
+  })
+
+  test('the later write replaces a landing a flow suspended earlier', async () => {
+    const context = makeTestContext()
+    await flowLandingOf(context).suspendFlow(await makeFlowModel(testFlow), { expiresAt: Date.now() + 60_000 })
+    await flowLandingOf(context).suspendLanding({ entrypoint: 'guarded-screen', query: {} }, { expiresAt: Date.now() + 60_000 })
+
+    expect(await flowLandingOf(context).resumeSuspendedFlow()).toEqual({ entrypoint: 'guarded-screen', query: {} })
+  })
+
+  test('a discarded landing resumes to nothing', async () => {
+    const context = makeTestContext()
+    await flowLandingOf(context).suspendLanding({ entrypoint: 'guarded-screen', query: {} }, { expiresAt: Date.now() + 60_000 })
+    await flowLandingOf(context).discardSuspendedLanding()
+
+    expect(await flowLandingOf(context).resumeSuspendedFlow()).toBeNull()
+  })
+
+  test('with no FLOW_STATE resource registered, both are safe no-ops', async () => {
+    const context = makeTestContext(false)
+
+    expect(await flowLandingOf(context).suspendLanding({ entrypoint: 'guarded-screen', query: {} }, { expiresAt: Date.now() + 60_000 })).toBe(false)
+    await flowLandingOf(context).discardSuspendedLanding()
+    expect(await flowLandingOf(context).resumeSuspendedFlow()).toBeNull()
   })
 })