@owlmeans/client-flow 0.1.18-rc.2 → 0.1.18-rc.20

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
+bun add @owlmeans/client-flow@^0.1.18-rc.16
 ```
 
 ## 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
+npx @owlmeans/agent-skills@^0.1.18-rc.15
 ```
 
 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.0",
-  "generatedAt": "2026-08-16T22:20:50.497Z",
+  "version": "0.1.18-rc.20",
+  "generatedAt": "2026-09-12T08:39:52.712Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

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

@@ -1,6 +1,6 @@
 ---
 name: client-flow
-description: How to use @owlmeans/client-flow — client-side flow execution service that drives @owlmeans/flow definitions through state transitions. Auto-invoked when importing client flow primitives.
+description: How to use @owlmeans/client-flow — the platform-agnostic flow service (makeBasicFlowService) that loads @owlmeans/flow definitions from config records, and createFlowClient(context, nav), the runner a screen drives to advance a flow and navigate to each step. Auto-invoked when importing client flow primitives, registering a flow service, or moving a screen to the next flow step.
 user-invocable: false
 ---
 <!-- AUTO-GENERATED — do not edit. Regenerate via sync-agent-meta. -->
@@ -8,23 +8,126 @@ user-invocable: false
 # @owlmeans/client-flow
 
 **Layer:** Client
-**Install:** `"@owlmeans/client-flow": "^0.1.18-rc.0"` in `dependencies`
+**Install:** `"@owlmeans/client-flow": "^0.1.18-rc.20"` 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
+a `Navigator`, and is what a component actually calls.
 
 ## Key Exports
 
 | Export | Description |
 |--------|-------------|
-| `makeFlowService()` | Client flow execution service factory |
-| `client` helpers | Client-side flow client/runner |
-| Constants | Flow service aliases |
+| `makeBasicFlowService(alias?)` | The service factory — the platform-agnostic half. `alias` defaults to `DEFAULT_ALIAS`, which is the only value the runner can find |
+| `FlowService` | `ready()` `state()` `begin(slug?, from?)` `load(token)` `provideFlow` `config()` `proceed(req?, dryRun?)` `resolvePair()` `supplied` `flow` |
+| `createFlowClient(context, nav)` | The runner a screen drives. `nav` is the `Navigator` from `useNavigate()` in `@owlmeans/client` |
+| `FlowClient` | `boot(target: string \| null, from?)` `setup(model)` `flow()` `service()` `proceed(transition, req?)` `persist()` |
+| `StateRecord` / `StateResource` | The `FlowState` stored as a record, and the client resource holding it |
+| `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 |
+| `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 |
+
+## Wiring
+
+```typescript
+import { makeBasicFlowService } from '@owlmeans/client-flow'
+context.registerService(makeBasicFlowService())
+```
+
+**Register it under `DEFAULT_ALIAS`, which is what the no-argument call does.** `createFlowClient`
+resolves its service with a hardcoded `context.service(DEFAULT_ALIAS)`, and `useFlow` in
+`@owlmeans/web-flow` looks the same alias up, so a service registered under any other name is never
+reached and the lookup throws `SyntaxError('Service <alias> not found')`. The `alias` argument
+builds a second instance for a caller that addresses it itself — nothing on the runner path can.
+
+A browser app registers the web service instead — `appendFlowService` from `@owlmeans/web-flow`,
+which builds on this one and also creates the `FLOW_STATE` resource.
+
+## What the service does
+
+Initialization reads every `FLOW_RECORD` config record through the config resource and turns each
+into a `Flow`: `$`-prefixed `service`, `module` and `path` values are resolved against
+`FlowConfig.services` / `modules` / `pathes`, and one serialized entry state is precomputed per
+initial step. `provideFlow` then answers by name out of that table and throws `UnknownFlow` for a
+name it does not hold — which is exactly what `makeFlowModel` needs in order to fall back to
+reading the string as a serialized token.
+
+`begin(slug?, from?)` starts a flow — `slug` defaults to `FlowConfig.defaultFlow`, then to
+`STD_AUTH_FLOW`, and `from` names which **initial** step to enter — while `load(token)` restores one.
+Both set `service.flow` and replace `supplied` with an already-resolved promise. `state()` awaits
+`supplied` before answering, so a screen can ask for the state before the URL has been read; the
+platform half is what resolves the original `supplied` (through `resolvePair()`) when there was
+nothing to restore.
+
+`proceed` on the basic service throws `FlowUnsupported('service.proceed')`. Leaving the flow for
+another service is platform work, and `@owlmeans/web-flow` is what supplies it.
+
+## What the client does
 
-## Usage
+`createFlowClient` needs a `Navigator` — the one `useNavigate()` from `@owlmeans/client` returns.
+In a browser `useFlow()` from `@owlmeans/web-flow` builds the whole thing for the rendering screen;
+build it by hand only outside that.
 
 ```typescript
-import { makeFlowService } from '@owlmeans/client-flow'
-context.registerService(makeFlowService())
+import { useContext, useNavigate } from '@owlmeans/client'
+import { createFlowClient } from '@owlmeans/client-flow'
+
+const context = useContext()
+const nav = useNavigate()
+
+const client = await createFlowClient(context, nav).boot(targetServiceAlias)  // `null` for none
+// ...or createFlowClient(context, nav).setup(model) when a model is already loaded
+
+await client.proceed(client.flow().next())     // advance and go to the next step
+await client.persist()                         // survive a reload
 ```
 
+`boot(target, from?)` takes `string | null`, and `null` is a meaningful argument — it says "no
+target named", which is what the browser hook passes when no `service` query parameter is present.
+
+It waits for the service and asks for the state it already holds. **A live model is adopted as it
+is and nothing else runs** — no target is recorded on that path, and `FlowTargetError` cannot be
+raised from it. Everything below happens only when the service holds no model:
+
+1. When `FLOW_STATE` is registered and holds a record, its flow is begun and the record set as the
+   model's state; a `null` `target` argument then falls back to `record.service`.
+2. With no such record, a fresh flow is begun (`begin(undefined, from)`).
+3. If a target alias resolved by then, `cfg.shortAlias` is translated to `cfg.service`, the alias is
+   looked up with `context.serviceRoute`, and a lookup that throws is re-raised as
+   `FlowTargetError`. The resolved service is recorded on the model with `target()`.
+
+With no alias and no restored record, step 3 is skipped and the state's `service` stays the empty
+string it starts as — `client.service()` then asks `context.serviceRoute('')`, which throws. That
+is the shape of "this flow was booted without a target".
+
+`proceed(transition, req?)` looks the transition's **destination** step up first and raises
+`FlowStepMissconfigured(<that step>)` when it carries no `module` — the check is on the step being
+entered, not the one being left. It then transits the model, merging the previous payload with
+`req.params` and `req.query`, and addresses the destination's entrypoint. When that step's `service`
+is `TARGET_SERVICE`, an entrypoint is synthesized under `REHACK_MOD` pointing at the dispatcher path
+of the state's own target service, so "go back to whoever started this" needs no declaration.
+
+A **relative** URL is an in-app `nav.navigate`: the document stays and nothing serializes the flow
+onto the URL — the live model on the service is what carries it, which is why `persist()` exists.
+Only a URL starting with `http` is handed on to `service.proceed`, the browser redirect that puts
+the serialized flow in the query string. There is no `dryRun` on this method; that argument belongs
+to the service's own `proceed`.
+
+`persist()` saves the state under `FLOW_STATE` and answers `false` when no such resource is
+registered, so persistence is opt-in rather than a hard requirement.
+
 ## Depends On
 
-- `@owlmeans/flow`, `@owlmeans/client-context`, `@owlmeans/client-entrypoint`
+- `@owlmeans/flow` — the definitions, the model and the error family
+- `@owlmeans/client`, `@owlmeans/client-context`, `@owlmeans/client-entrypoint`,
+  `@owlmeans/client-resource`
+- `@owlmeans/config` (the config resource the definitions are read from), `@owlmeans/auth-common`
+  (the dispatcher path), `@owlmeans/context`, `@owlmeans/entrypoint`, `@owlmeans/error`,
+  `@owlmeans/resource`, `@owlmeans/route`
+- `react` (peer)
+
+## Related
+
+- [[flow]] — the definition, state and serialization contract
+- [[web-flow]] — the browser service that supplies `proceed` and `goHome`

package/build/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAQ5D,OAAO,KAAK,EAAE,UAAU,EAA8B,MAAM,YAAY,CAAA;AAIxE,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,SAAS,KAAG,UAgHjH,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAS5D,OAAO,KAAK,EAAE,UAAU,EAA8B,MAAM,YAAY,CAAA;AAIxE,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,SAAS,KAAG,UAiHjH,CAAA"}

package/build/client.js

@@ -1,4 +1,5 @@
-import { entrypoint, stab } from '@owlmeans/client-entrypoint';
+import { bindScreen, stab } from '@owlmeans/client-entrypoint';
+import { openProtocol } from '@owlmeans/entrypoint';
 import { route, frontend } from '@owlmeans/route';
 import { FlowStepMissconfigured, FlowTargetError, TARGET_SERVICE } from '@owlmeans/flow';
 import { ResilientError } from '@owlmeans/error';
@@ -67,15 +68,16 @@ export const createFlowClient = (context, nav) => {
             let redirectTo;
             // @TODO Properly use target service - as a way to build the redirect URL
             if (step.service === TARGET_SERVICE) {
-                context.registerEntrypoint(entrypoint(route(REHACK_MOD, DISPATCHER_PATH, frontend({ service: model.state().service })), stab));
-                redirectTo = context.entrypoint(REHACK_MOD);
-                await redirectTo.resolve();
+                const redirectProtocol = openProtocol(route(REHACK_MOD, DISPATCHER_PATH, frontend({ service: model.state().service })));
+                const bound = bindScreen(redirectProtocol, stab);
+                context.registerEntrypoint(bound);
+                redirectTo = bound;
                 step.module = REHACK_MOD;
             }
             else {
                 redirectTo = context.entrypoint(step.module);
             }
-            const [url] = await redirectTo.call(req);
+            const url = await redirectTo.url(req);
             if (url.startsWith('http')) {
                 await service.proceed(req);
             }

package/build/client.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/client-flow",
-  "version": "0.1.18-rc.2",
+  "version": "0.1.18-rc.20",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -21,18 +21,18 @@
     }
   },
   "dependencies": {
-    "@owlmeans/auth-common": "^0.1.18-rc.2",
-    "@owlmeans/client": "^0.1.18-rc.2",
-    "@owlmeans/client-context": "^0.1.18-rc.2",
-    "@owlmeans/client-entrypoint": "^0.1.18-rc.2",
-    "@owlmeans/client-resource": "^0.1.18-rc.2",
-    "@owlmeans/config": "^0.1.18-rc.2",
-    "@owlmeans/context": "^0.1.18-rc.2",
-    "@owlmeans/error": "^0.1.18-rc.2",
-    "@owlmeans/flow": "^0.1.18-rc.2",
-    "@owlmeans/entrypoint": "^0.1.18-rc.2",
-    "@owlmeans/resource": "^0.1.18-rc.2",
-    "@owlmeans/route": "^0.1.18-rc.2"
+    "@owlmeans/auth-common": "^0.1.18-rc.16",
+    "@owlmeans/client": "^0.1.18-rc.19",
+    "@owlmeans/client-context": "^0.1.18-rc.16",
+    "@owlmeans/client-entrypoint": "^0.1.18-rc.16",
+    "@owlmeans/client-resource": "^0.1.18-rc.16",
+    "@owlmeans/config": "^0.1.18-rc.15",
+    "@owlmeans/context": "^0.1.18-rc.11",
+    "@owlmeans/error": "^0.1.18-rc.11",
+    "@owlmeans/flow": "^0.1.18-rc.17",
+    "@owlmeans/entrypoint": "^0.1.18-rc.14",
+    "@owlmeans/resource": "^0.1.18-rc.12",
+    "@owlmeans/route": "^0.1.18-rc.12"
   },
   "peerDependencies": {
     "react": "*"

package/src/client.ts

@@ -1,7 +1,8 @@
 import type { ClientContext, Navigator } from '@owlmeans/client'
 import type { ClientConfig } from '@owlmeans/client-context'
 import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
-import { entrypoint, stab } from '@owlmeans/client-entrypoint'
+import { bindScreen, stab } from '@owlmeans/client-entrypoint'
+import { openProtocol } from '@owlmeans/entrypoint'
 import type { ResolvedServiceRoute } from '@owlmeans/route'
 import { route, frontend } from '@owlmeans/route'
 import { FlowStepMissconfigured, FlowTargetError, TARGET_SERVICE } from '@owlmeans/flow'
@@ -90,17 +91,18 @@ export const createFlowClient = <C extends ClientConfig, T extends ClientContext
       let redirectTo: ClientEntrypoint<string>
       // @TODO Properly use target service - as a way to build the redirect URL
       if (step.service === TARGET_SERVICE) {
-        context.registerEntrypoint(entrypoint(
-          route(REHACK_MOD, DISPATCHER_PATH, frontend({ service: model.state().service })), stab
-        ))
-        redirectTo = context.entrypoint<ClientEntrypoint<string>>(REHACK_MOD)
-        await redirectTo.resolve()
+        const redirectProtocol = openProtocol(
+          route(REHACK_MOD, DISPATCHER_PATH, frontend({ service: model.state().service })),
+        )
+        const bound = bindScreen(redirectProtocol, stab)
+        context.registerEntrypoint(bound)
+        redirectTo = bound as unknown as ClientEntrypoint<string>
         step.module = REHACK_MOD
       } else {
         redirectTo = context.entrypoint<ClientEntrypoint>(step.module)
       }
 
-      const [url] = await redirectTo.call<string>(req)
+      const url = await redirectTo.url(req)
 
       if (url.startsWith('http')) {
         await service.proceed(req)