@12ui/design 0.2.27 → 0.2.29

package/README.md

@@ -16,7 +16,7 @@ Or use the genuinely npm-free macOS/Linux installer:
 curl -fsSL https://12ui.com/install.sh | sh
 ```
 
-Both paths pin the exact CLI version, install `design` into every detected
+Both paths pin the exact CLI version, install `12ui-design` into every detected
 Codex, Claude Code, Grok CLI, Cursor CLI, Antigravity, and GitHub Copilot CLI
 installation, and
 open the 12ui device-approval page. The resulting user-owned credential has
@@ -69,7 +69,7 @@ unless `--force` is explicit.
 
 ## One visual interface skill
 
-`design` routes every UI, web, and mobile request and covers the whole
+`12ui-design` routes every UI, web, and mobile request and covers the whole
 pipeline. Finished screenshots go straight to conversion, tiny edits stay
 code-only, and a rough brief explores corpus-grounded directions as images
 before anything is built:
@@ -78,11 +78,14 @@ before anything is built:
   references, preserving endpoint order and metrics, when the references
   themselves are the deliverable.
 - Drafting claims one `/api/v1/create` run, dispatches each candidate slot
-  once, and downloads the images without re-buying a settled slot.
+  once, and downloads the images without re-buying a settled slot. The caller
+  authenticates only to 12ui; the service owns its image-provider credentials.
 - Branching is required whenever the deliverable is more than one viewport.
   One `12ui branch execute` run expands one approved design into the 2-8
   screens the server plans, dispatching each only once its dependency and
-  footer gates clear, and converts each page as one ordered package.
+  footer gates clear. Conversion keeps ordered `web_page` viewports in one
+  package and emits each complete `web_app`, `mobile_app`, or `immersive` state
+  as its own page.
 - Conversion turns a finished PNG, JPEG, or WebP into LayerDoc and any
   supported responsive, fixed, project, or document export, and converts the
   ordered viewports of one page as a single package.
@@ -106,53 +109,40 @@ manual recreation.
   --reference-image ./current-homepage.png \
   --out-dir ./references \
   --count 4
-12ui image generate-batch --manifest ./generation.json
-12ui image batch-status --manifest ./generation.json
+12ui draft \
+  --concept "Editorial architecture homepage with warm materiality" \
+  --candidates 4
+12ui next <run-dir> --wait
 12ui branch execute \
-  --winner-image ./candidates/A.png \
+  --start <run-dir>/candidates/A.png \
   --concept "Editorial architecture studio site" \
   --scope site \
-  --out-dir ./branch \
   --convert html
-12ui branch status --out-dir ./branch
-12ui export <base-layerdoc-conversion-id> \
-  --output html,pdf,psd,pptx,sketch,web_project \
-  --out-dir ./exports \
-  --web-profile ./web-profile.json \
-  --idempotency-key product-exports-v1
+12ui next <branch-run-dir> --wait
+12ui convert <conversion-id> \
+  --output html_fixed,pdf,psd,pptx,sketch \
+  --out-dir ./exports
 ```
 
-`image generate-batch` accepts 2-16 manifest jobs, preflights one provider,
-reserves every attempt before dispatch, starts all provider calls concurrently,
-and waits for the complete batch. Each job has one prompt, one reference, one
-PNG output, and one stable idempotency key. Per-candidate and batch evidence
-records provider-start and completion times. It never retries a candidate or
-switches providers after dispatch.
-
-Candidates are written into a hidden staging directory and moved into place only
-once the batch is terminal, so a caller listing the output directory can never
-observe a half-written batch. Completion is published as a
-`generation.complete.json` sentinel beside the candidates, carrying each
-candidate's status, sha256, and byte count. `--resume` recovers an interrupted
-batch: it delivers candidates that were already generated and re-requests only
-those the provider provably never billed, so it can never buy a candidate twice,
-and it refuses a batch that already completed.
-
-The single-candidate `image generate` command remains available. Both commands
-resolve authenticated Codex first, then `OPENAI_API_KEY` from the process or
-exactly `<project-root>/.env`. They refuse a Git-tracked `.env`, never store or
-print the key, and always write PNG bytes.
-
-`export` downloads one successful base LayerDoc once and dispatches the chosen
-formats in parallel. Project exports require exact web/native profiles; image
-extraction is not repeated. The command creates parent directories as needed
-and accepts an existing destination directory, but refuses before any API
-request when a selected output, its asset directory, or
-`export-manifest.json` already exists.
-
-`capabilities --json` reports the exact `projectProfileSchema`, including the
-required fields and `version: 1` constraint, beside the supported
-`projectProfiles` combinations.
+`draft` accepts 2-16 candidates and defaults to four. It records the corpus set,
+hosted run id, stable service slots, output paths, and claim key in `draft.json`
+before dispatch. The detached worker posts only slots whose durable service
+state is still `pending`; in-flight, succeeded, and failed slots are never
+posted again. Successful PNGs are digest-checked and written atomically under
+`<run-dir>/candidates/`, with terminal evidence in `draft.complete.json`.
+
+The retired local `image` commands and provider preflight are not part of the
+CLI. Draft never inspects Codex authentication, `OPENAI_API_KEY`, project
+`.env` files, or any other caller-side image-provider credential.
+
+`convert <conversion-id>` downloads one successful base LayerDoc once and
+dispatches the chosen formats concurrently. It creates the destination
+directory as needed, but refuses before any API request when a selected output,
+its asset directory, or `export-manifest.json` already exists.
+
+`capabilities --json` reports the CLI's exact inputs and outputs, model and
+responsive-quality choices, duration hints, status commands, and durable
+journal/receipt contracts.
 
 ## Design Corpus inspiration
 
@@ -280,68 +270,64 @@ strict manifest, asset mapping, normalization, page-join, and limit contract.
 
 ```bash
 export TWELVE_UI_API_KEY=your-key
-12ui convert ./screen.png --output layerdoc --out ./screen.layerdoc.json
-12ui convert ./screen.png --output html --model pro --width 1440 --out ./screen.html --timeout-ms 7200000
-12ui convert ./screen.layerdoc.json --output html --out ./screen.html --idempotency-key screen-html-v1
-12ui convert ./screen.layerdoc.json --output pptx --out ./screen.pptx --idempotency-key screen-pptx-v1
-12ui convert ./screen.layerdoc.json --output web_project --profile ./react-tailwind.json --out ./screen-react.zip
-12ui convert ./screen.layerdoc.json --output app_project --profile '{"version":1,"framework":"swiftui","styling":"native","language":"swift","packaging":"project"}' --out ./screen-ios.zip
+12ui convert ./screen.png --output layerdoc --out-dir ./converted
+12ui convert ./screen.png --output html --model pro --width 1440 --out-dir ./responsive --timeout-ms 7200000
+12ui convert ./screen.layerdoc.json --output html_fixed --out-dir ./fixed --idempotency-key screen-html-v1
+12ui convert ./screen.layerdoc.json --output pptx --out-dir ./slides --idempotency-key screen-pptx-v1
+12ui convert <layerdoc-conversion-id> --output html_fixed,pdf,psd,pptx,sketch --out-dir ./exports
 12ui convert package --manifest ./package.json --out-dir ./pages
-12ui resume conversion-id --output layerdoc --out ./screen.layerdoc.json
+12ui resume conversion-id
 ```
 
 `convert package` submits the ordered viewports of one continuous page as ONE
 package conversion per page, which is what preserves page order and stitching;
-converting a stacked page one image at a time loses both. Every viewport of a
+converting a continuous page one image at a time loses both. `branch execute`
+uses that shape only for declared `web_page` documents; complete app states are
+separate one-viewport pages. Every viewport of a
 page must share one width, checked locally before anything is bought. A viewport
 may name `sourceConversionId` to reuse an already succeeded conversion of
 exactly those bytes instead of paying for it twice.
 
-Long commands block until they finish, and `--wait` names that default
-explicitly. While one runs, `12ui branch status --out-dir <dir>` and
-`12ui image batch-status --manifest <file>` report forward motion — per-item
-state, elapsed against typical, and what to do next — without touching the run.
-Do not infer progress from a directory listing: staged work is materialized in
-one atomic pass at the end.
+Draft and branch runs detach by default; `--wait` keeps either in the current
+shell. While one runs, `12ui next <run-dir>` reports per-item state, elapsed
+against typical, and what to do next without dispatching replacement work. Do
+not infer progress from a directory listing.
 
 Each conversion also writes a verified `<out>.assets/manifest.json` plus every
 signed raster artifact beside the requested result. Set `TWELVE_UI_ORIGIN` to
 override `https://12ui.com`; waits default to the operation expiry and can be
 bounded explicitly with `--timeout-ms`.
 
-For a detached conversion, omit `--out` from `convert`, capture its JSON stdout,
-and pass the returned ID plus both `--output` and `--out` to `resume`. The
-detached create does not materialize the output file:
+`convert` blocks and records the original filenames before admission. If its
+shell is interrupted after a conversion ID is returned, bare `resume` restores
+every artifact in that original purchase. `--out-dir` keeps the recorded
+basenames but moves recovery into another directory. For an older or externally
+created operation without a local recovery record, the power form names its
+exact output and destination:
 
 ```bash
-set -o pipefail
-12ui convert ./screen.png \
-  --output layerdoc \
-  --model standard \
-  --idempotency-key screen-layerdoc-v1 \
-  --detach | tee ./screen.operation.json
 12ui resume conversion-id --output layerdoc --out ./screen.layerdoc.json
 ```
 
-If create fails before emitting an operation ID, `resume` is not possible.
-Repeat the exact create request with the same explicit `--idempotency-key` so
-the service can return the original operation without repeating completed paid
-work. When the key is omitted, the client generates a new UUID. The CLI prints
-operation/result metadata to stdout; persist it when durable local evidence is
-required.
+If admission fails before emitting an operation ID, repeat the exact request
+with the same explicit `--idempotency-key` so the service can replay the
+original operation without repeating settled paid work. When the key is
+omitted, the client generates a new UUID.
 
 Image conversions accept `--model fast|standard|pro`; omission selects
-`standard`. In `layerdoc-worker-v148`, Fast, Standard, and Pro all use
+`standard`. Beginning with `layerdoc-worker-v148` and still in the current
+`layerdoc-worker-v190`, Fast, Standard, and Pro all use
 `gpt-5.6-terra-low` for primary extraction. Fast retains color-guided
 deterministic inpainting, source-grounded flat-border cutouts, and 1x source crops without
 secondary metadata refinement, generative cleanup, provider background
 removal, or upscaling. Standard has no secondary metadata refinement and uses
-one atomic GPT Image 2 result for each opaque clean target, with Pixelcut-first
+one target-scoped atomic GPT Image 2 result for each opaque clean target, with Pixelcut-first
 alpha isolation and Bria admitted only after a durable hard-invalid or
 reconciled terminal Pixelcut failure. Standard performs no Luna candidate
 review. Pro retains a separate `gpt-5.6-terra-low` metadata-refinement call, a
-three-sample atomic opaque-clean portfolio with one comparative Luna review,
-and the complete revision-frozen FAL alpha portfolio. GPT Image 2 is opaque-only.
+target-scoped atomic clean plus the shared whole-image clean for atomic-region
+targets, one comparative Luna review, and the complete revision-frozen FAL
+alpha portfolio. GPT Image 2 is opaque-only.
 Provider-routed cutouts keep enhanced upscaling; accepted deterministic Fast
 cutouts are resized locally. The option is not accepted for LayerDoc input
 because downstream compilation is deterministic.
@@ -361,16 +347,85 @@ raster references must still be valid and must belong to the same authenticated
 account. The service resolves those owned artifacts directly; it does not fetch
 arbitrary remote URLs. LayerDoc input produces `layerdoc`, `html`,
 `html_fixed`, `svg`, `png`, `jpg` (JPEG), `webp`, `pdf`, `psd`, `pptx`,
-`sketch`, `web_project`, or `app_project`. Project outputs require
-`--profile <json|file>`; the CLI also accepts `--profile @file.json`.
+or `sketch`. The typed Node client and MCP integration documented below retain
+the exact-profile `web_project` and `app_project` integration surface.
+
+### Review stored work
+
+```bash
+12ui review ./my-run
+12ui review --all
+```
+
+`review` starts a read-only-by-default server on an ephemeral localhost port,
+prints its URL, and opens it in the browser. The page places draft candidates
+side by side, shows branch screens and exported page HTML, and renders conversion
+outputs. Pass one run or workspace directory, or use `--all` to find automatic
+draft workspaces in the current system temp directory and runs under the current
+project's `.12ui` directory. The server never binds to a network interface.
+
+This discovery follows the CLI's existing storage contracts: automatic drafts
+live under the system temp root as `12ui-*` directories with `draft.json` and
+`candidates/` (`src/draft-workspace.ts`); branch artifacts live under
+`<run-dir>/branch/{screens,pages}` (`src/branch-run-record.ts`); workspace
+commands append artifacts to `<workspace>/journal.jsonl` (`src/run-journal.ts`),
+and conversions write outputs beside their input unless `--out-dir` selects a
+workspace (`src/cli-convert-command.ts`). An explicit directory is searched for
+those markers so a parent containing several stored runs can be reviewed at
+once.
+
+Notes and marks are the only automatic writes. Each run stores them atomically
+in `<run-dir>/review.json`, mode `0600`, and reloads them whenever the page is
+opened. `pick` and `approve` are deliberately separate marks; Clear records no
+mark. Agents can consume the file directly:
+
+```json
+{
+  "version": 1,
+  "updatedAt": "2026-08-21T01:23:45.000Z",
+  "items": {
+    "draft-candidate-a-0123abcd": {
+      "feedback": {
+        "note": "Keep the hierarchy and reduce the footer.",
+        "mark": "pick",
+        "updatedAt": "2026-08-21T01:23:45.000Z"
+      },
+      "edits": [
+        {
+          "id": "edit-0123abcd",
+          "prompt": "Change the heading to Northstar notes.",
+          "createdAt": "2026-08-21T01:25:00.000Z",
+          "editOperationId": "edit-operation-id",
+          "renderOperationId": "render-operation-id",
+          "original": "screen.layerdoc.json",
+          "layerdoc": "review/edits/edit-0123abcd.layerdoc.json",
+          "html": "review/edits/edit-0123abcd.html"
+        }
+      ]
+    }
+  }
+}
+```
+
+Item keys are stable hashes of their kind and run-relative path. `mark` is
+`"pick"`, `"approve"`, or `null`; `edits` is omitted until an edit succeeds.
+
+When an item is a LayerDoc and conversion credentials are configured, the page
+offers an explicit text edit. It shows the price first and asks for confirmation
+before calling the existing `POST /api/v1/edit` contract. A Design edit is a
+metered action: it uses the daily allowance when available or costs $0.03;
+requested image actions may cost another $0.02-$0.30. The review server never
+applies an edit by itself. A successful edit and its deterministic fixed HTML
+render are written under `<run-dir>/review/edits/` and displayed beside the
+original.
 
 ### The run journal
 
 Every command that owns a workspace directory — a draft run directory, a branch
-out-dir, a convert or export output directory — appends what it did to
+out-dir, or a convert output directory — appends what it did to
 `<workspace>/journal.jsonl`. One JSON line when the command begins and one when
-it exits, including refusals and failures. The detached workers that
-`branch execute`, `branch resume`, and `image generate-batch` spawn append to
+it exits, including refusals and failures. The detached workers that `draft`,
+`branch execute`, and `branch resume` spawn append to
 the same file as the command that started them, so a run's whole history is in
 one place whether or not the shell that launched it survived.
 
@@ -631,8 +686,7 @@ create metered work. Set an `idempotencyKey` for any ambiguous conversion
 create that may need to be repeated; otherwise the conversion client generates
 a new UUID. Corpus retrieval always persists its key before the request.
 
-Draft preparation/generation and Branch execute/resume remain deliberate CLI
-workflows (`12ui draft`, `12ui image generate-batch`, and `12ui branch`). They
-coordinate local provider tools, durable run directories, progress streaming,
-and multi-page packaging; the MCP surface does not duplicate those
+Draft and Branch execute/resume remain deliberate CLI workflows (`12ui draft`
+and `12ui branch`). They coordinate hosted service runs, durable local run
+directories, progress streaming, and multi-page packaging; the MCP surface does not duplicate those
 orchestrators or quietly dispatch paid work from a status call.

package/SKILL.md

@@ -7,16 +7,16 @@ description: "Runs the complete 12UI visual-interface workflow inside Open
 
 # 12UI for Open Design
 
-`skills/design/SKILL.md` is the whole contract: it covers reference search,
+`skills/12ui-design/SKILL.md` is the whole contract: it covers reference search,
 hosted candidate generation, branching an approved direction across a page,
 site, or multi-state app, and converting a finished image into LayerDoc and
 production exports. The four stage skills it replaced were retired on
 2026-08-16.
 
-For a normal interface request, follow `skills/design/SKILL.md` end to end:
+For a normal interface request, follow `skills/12ui-design/SKILL.md` end to end:
 create four corpus-conditioned candidates, present their actual images through
 Open Design's `twelve-ui-direction` choice surface, record the selected slot and
-rationale with `12ui select`, then convert or branch exactly that candidate.
+rationale in the Open Design choice, then convert or branch exactly that image.
 Do not substitute Open Design's generic direction cards for the generated 12UI
 candidates.
 
@@ -28,7 +28,7 @@ dispatch paid work when it is absent, rejected, or times out.
 Use `12ui` when it is available on `PATH`. Otherwise invoke the pinned CLI that
 the plugin's `open-design.json` MCP entry uses:
 
-    npx -y @12ui/design@0.2.27 <command> ...
+    npx -y @12ui/design@0.2.29 <command> ...
 
 Run `12ui auth status --json` (or its pinned `npx` equivalent) before the paid
 preflight. A desktop user can authenticate with `12ui auth login`; a headless
@@ -37,6 +37,6 @@ the plugin manifest, command output, or generated artifacts.
 
 Treat the generated HTML or project export as the implementation, materialize
 it in the Open Design project workspace, and publish it as a live artifact for
-preview and critique. Preserve the 12UI run directory, selection evidence,
+preview and critique. Preserve the 12UI run directory, chosen-image rationale,
 conversion IDs, and export manifests with the project so reruns can resume
 settled work instead of buying it again.

package/dist/branch-completion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-completion.d.ts","sourceRoot":"","sources":["../src/branch-completion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAE1B,MAAM,wBAAwB,CAAC;AAEhC;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,eAAe,GAAI,MAAM;IACpC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,MAAM,EAAE,qBAAqB,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACrD,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC,CAAC;IACrE,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACpC,KAAG,gBA4JH,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,MAAM;IACpC,UAAU,EAAE,gBAAgB,CAAC;IAC7B,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB,KAAG,KAAK,GAAG,IAwBX,CAAC"}
+{"version":3,"file":"branch-completion.d.ts","sourceRoot":"","sources":["../src/branch-completion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAKzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAE1B,MAAM,wBAAwB,CAAC;AAEhC;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,eAAe,GAAI,MAAM;IACpC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,MAAM,EAAE,qBAAqB,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACrD,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC,CAAC;IACrE,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACpC,KAAG,gBAoLH,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,MAAM;IACpC,UAAU,EAAE,gBAAgB,CAAC;IAC7B,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB,KAAG,KAAK,GAAG,IAwBX,CAAC"}

package/dist/branch-completion.js

@@ -1,4 +1,5 @@
 import { BRANCH_WORKFLOW_REVISION, branchConceptDigest } from './branch-identity.js';
+import { branchConversionPages, branchPackageSourcePage, } from './branch-page-packaging.js';
 import { branchBlockedSlots } from './branch-schedule.js';
 import { branchPlanPath, } from './branch-run-record.js';
 /**
@@ -22,10 +23,14 @@ export const buildCompletion = (args) => {
         footer: screen.footer,
         dependsOnSlot: screen.dependsOnSlot,
     }))).map((entry) => [entry.slot, entry]));
-    const pageIdByIndex = new Map(args.plan.pages.map((page) => [page.index, page.id]));
+    const packagePages = branchConversionPages(args.plan);
+    const packagePlacementBySlot = new Map(packagePages.flatMap((page, index) => (page.slots.map((slot) => [slot, { page, index }]))));
     const screens = args.plan.screens.map((screen) => {
         const downloaded = args.screens.get(screen.slot);
         const block = blocked.get(screen.slot);
+        const packaged = packagePlacementBySlot.get(screen.slot);
+        const packagedPageIndex = packaged?.index ?? screen.pageIndex;
+        const packagedViewportOrdinal = packaged?.page.packageLineage ? 1 : screen.viewportOrdinal;
         const status = screen.status === 'succeeded' && downloaded
             ? 'succeeded'
             : block
@@ -33,9 +38,15 @@ export const buildCompletion = (args) => {
                 : 'failed';
         return {
             slot: screen.slot,
-            pageIndex: screen.pageIndex,
-            pageId: pageIdByIndex.get(screen.pageIndex) ?? `p${screen.pageIndex}`,
-            viewportOrdinal: screen.viewportOrdinal,
+            pageIndex: packagedPageIndex,
+            pageId: packaged?.page.id ?? `p${screen.pageIndex}`,
+            viewportOrdinal: packagedViewportOrdinal,
+            ...(packagedPageIndex === screen.pageIndex
+                ? {}
+                : { generationPageIndex: screen.pageIndex }),
+            ...(packagedViewportOrdinal === screen.viewportOrdinal
+                ? {}
+                : { generationViewportOrdinal: screen.viewportOrdinal }),
             status,
             direction: screen.direction,
             ...(downloaded
@@ -56,16 +67,27 @@ export const buildCompletion = (args) => {
     const succeededCount = screens.filter((screen) => screen.status === 'succeeded').length;
     const blockedCount = screens.filter((screen) => screen.status === 'blocked').length;
     const failedCount = screens.length - succeededCount - blockedCount;
-    const pages = args.plan.pages.map((page) => ({
-        index: page.index,
-        id: page.id,
-        kind: page.kind,
-        title: page.title,
-        slots: page.slots,
-        startsFromWinner: page.startsFromWinner,
-        ...(page.synthesized ? { synthesized: true } : {}),
-        ...(args.conversions.has(page.id) ? { conversion: args.conversions.get(page.id) } : {}),
-    }));
+    const pages = packagePages.map((page, index) => {
+        const source = branchPackageSourcePage(page);
+        const sourceViewportOrdinal = page.packageLineage?.viewportOrdinal;
+        return {
+            index,
+            id: page.id,
+            kind: page.kind,
+            title: page.title,
+            slots: page.slots,
+            startsFromWinner: page.startsFromWinner,
+            ...(page.synthesized ? { synthesized: true } : {}),
+            ...(source.index === index && source.id === page.id && sourceViewportOrdinal === undefined
+                ? {}
+                : {
+                    sourcePageIndex: source.index,
+                    sourcePageId: source.id,
+                    ...(sourceViewportOrdinal === undefined ? {} : { sourceViewportOrdinal }),
+                }),
+            ...(args.conversions.has(page.id) ? { conversion: args.conversions.get(page.id) } : {}),
+        };
+    });
     const convertedPageCount = pages.filter((page) => (page.conversion?.status === 'succeeded')).length;
     const notes = [];
     if (blockedCount > 0) {
@@ -132,6 +154,7 @@ export const buildCompletion = (args) => {
         failedCount,
         blockedCount,
         pageCount: pages.length,
+        logicalPageCount: args.plan.pages.length,
         convertedPageCount,
         ...(winnerPagesFailed.length > 0 ? { winnerPageFailed: true } : {}),
         ...(trim ? { trimmed: trim } : {}),

package/dist/branch-completion.js.map

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

package/dist/branch-execution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-execution.d.ts","sourceRoot":"","sources":["../src/branch-execution.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,oBAAoB,CAAC;AAY5B,OAAO,EAGL,KAAK,oBAAoB,EAE1B,MAAM,kBAAkB,CAAC;AAU1B,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AAgBnC,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,KAAK,EACV,oBAAoB,EACpB,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AAErC,YAAY,EACV,oBAAoB,EACpB,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AAiBrC;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,oBAAoB,KAAG,MAiB/D,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,QAAQ,qBAAqB,KAAG,MAQlE,CAAC;AAqCF,eAAO,MAAM,gBAAgB,GAAU,MAAM;IAC3C,YAAY,EAAE,oBAAoB,CAAC;IACnC,aAAa,CAAC,EAAE,+BAA+B,CAAC;IAChD,MAAM,EAAE,qBAAqB,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,+EAA+E;IAC/E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,KAAG,OAAO,CAAC,qBAAqB,CA2WhC,CAAC"}
+{"version":3,"file":"branch-execution.d.ts","sourceRoot":"","sources":["../src/branch-execution.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,oBAAoB,CAAC;AAa5B,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,kBAAkB,CAAC;AAU1B,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AAgBnC,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,KAAK,EACV,oBAAoB,EACpB,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AAErC,YAAY,EACV,oBAAoB,EACpB,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AAiBrC;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,oBAAoB,KAAG,MAsB/D,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,QAAQ,qBAAqB,KAAG,MAQlE,CAAC;AAqCF,eAAO,MAAM,gBAAgB,GAAU,MAAM;IAC3C,YAAY,EAAE,oBAAoB,CAAC;IACnC,aAAa,CAAC,EAAE,+BAA+B,CAAC;IAChD,MAAM,EAAE,qBAAqB,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAChD,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,+EAA+E;IAC/E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,KAAG,OAAO,CAAC,qBAAqB,CAyXhC,CAAC"}

package/dist/branch-execution.js

@@ -5,6 +5,7 @@ import { buildCompletion, terminalFailure } from './branch-completion.js';
 import { createRunMaterializer } from './branch-materialize.js';
 import { branchScreenPath } from './branch-downloads.js';
 import { createBranchPageConversions } from './branch-page-conversion.js';
+import { branchConversionPages } from './branch-page-packaging.js';
 import { invalidateConversionReceipts, readLegacyConversionReceipts, recordConversionReceipt, } from './conversion-receipt.js';
 import { BRANCH_PAGE_CONCURRENCY_DEFAULT } from './cli-progress.js';
 import { applyBranchEnvelope, normalizeBranchPlan, } from './branch-plan.js';
@@ -31,8 +32,9 @@ const BUILD_PLAN_RETRIES = 3;
  * rather than only in the record nobody reads until afterwards.
  */
 export const describeBranchPlan = (plan) => {
-    const approved = plan.pages.filter((page) => page.startsFromWinner).length;
-    const rest = plan.pages.length - approved;
+    const outputPages = branchConversionPages(plan);
+    const approved = outputPages.filter((page) => page.startsFromWinner).length;
+    const rest = outputPages.length - approved;
     const composition = approved === 0
         ? ', '
         : rest === 0
@@ -46,7 +48,11 @@ export const describeBranchPlan = (plan) => {
             : `; --max-screens ${trim.maxScreens} leaves out ${trim.slots.length} planned screen(s):`
                 + ` ${trim.slots.join(', ')}`
         : '';
-    return `${plan.pages.length} page(s)${composition}${plan.screens.length} screen(s) to generate${left}`;
+    const packaging = outputPages.length === plan.pages.length
+        ? `${plan.pages.length} page(s)`
+        : `${plan.pages.length} logical page group(s) packaged as ${outputPages.length}`
+            + ' conversion page(s), with complete app states separate';
+    return `${packaging}${composition}${plan.screens.length} screen(s) to generate${left}`;
 };
 export const deriveBranchRunKey = (inputs) => (inputs.idempotencyKey ?? branchRunKey({
     winner: inputs.winner.kind === 'run'
@@ -125,6 +131,8 @@ export const executeBranchRun = async (args) => {
     let progressPhase = 'claiming';
     let progressRunId = '';
     let progressScreens = [];
+    let progressPageCount;
+    let progressLogicalPageCount;
     const publish = () => {
         pendingProgress = {
             version: 1,
@@ -133,6 +141,10 @@ export const executeBranchRun = async (args) => {
             startedAt,
             updatedAt: new Date().toISOString(),
             screens: progressScreens,
+            ...(progressPageCount === undefined ? {} : { pageCount: progressPageCount }),
+            ...(progressLogicalPageCount === undefined
+                ? {}
+                : { logicalPageCount: progressLogicalPageCount }),
             ...(packageProgress.size > 0 ? { packages: [...packageProgress.values()] } : {}),
         };
         drainProgress();
@@ -228,6 +240,9 @@ export const executeBranchRun = async (args) => {
     });
     await writeBranchPlanRecord(branchPlanPath(outDir), plan);
     emit({ kind: 'phase', phase: 'plan', detail: describeBranchPlan(plan) });
+    const packagePageCount = branchConversionPages(plan).length;
+    progressPageCount = packagePageCount;
+    progressLogicalPageCount = plan.pages.length;
     const convert = inputs.convert;
     const packageClient = args.packageClient;
     // Refused before the run buys anything rather than after every screen is paid
@@ -236,7 +251,8 @@ export const executeBranchRun = async (args) => {
         throw new Error('A conversion package client is required for --convert');
     // True whenever the run converts: `normalizeBranchPlan` guarantees a source
     // page in both scopes, so the winner's bytes are always part of the work.
-    const needsWinner = Boolean(convert) && plan.pages.some((page) => page.startsFromWinner);
+    const needsWinner = Boolean(convert) && branchConversionPages(plan)
+        .some((page) => page.startsFromWinner);
     const materializer = createRunMaterializer({
         client: args.branchClient,
         runId: envelope.id,
@@ -344,14 +360,17 @@ export const executeBranchRun = async (args) => {
      * ones this overlap missed.
      */
     const convertWholePages = (livePlan) => {
-        for (const page of livePlan.pages) {
+        for (const page of branchConversionPages(livePlan)) {
             const own = livePlan.screens.filter((screen) => page.slots.includes(screen.slot));
-            if (own.length === 0 || !own.every((screen) => screen.status === 'succeeded'))
+            if (!own.every((screen) => screen.status === 'succeeded'))
                 continue;
             pages?.start(livePlan, page);
         }
     };
     let stopped = null;
+    // A winner-only conversion page is ready before any generated state. This is
+    // common after app-state splitting, so let it overlap generation too.
+    convertWholePages(plan);
     publishProgress('dispatching', envelope.id, branchProgressScreens(plan, {}));
     if (plan.screens.length > 0) {
         const dispatched = await runBranchDispatch({
@@ -390,9 +409,10 @@ export const executeBranchRun = async (args) => {
         emit({
             kind: 'phase',
             phase: 'convert',
-            detail: `one package conversion per whole page, up to ${args.pageConcurrency ?? BRANCH_PAGE_CONCURRENCY_DEFAULT} at a time`,
+            detail: `${packagePageCount} package conversion page(s): continuous documents stay joined,`
+                + ` complete app states stay separate; up to ${args.pageConcurrency ?? BRANCH_PAGE_CONCURRENCY_DEFAULT} at a time`,
         });
-        for (const page of plan.pages)
+        for (const page of branchConversionPages(plan))
             pages?.start(plan, page);
     }
     // Every page settles, including any that started while screens were still