@smallpen/cli 0.1.0-alpha.15 → 0.1.0-alpha.18

package/bin/design-output.mjs

@@ -3,6 +3,7 @@ import {
   asciiWireframe,
   createSemanticTree,
   defaultTokenThemeIds,
+  elementPath,
   listTokenThemes,
   layoutProjectionDiagnostics,
   projectComponentVariant,
@@ -13,7 +14,7 @@ import {
   SmallPenError,
   tokenLibraryOf,
 } from "@smallpen/core";
-import { inspectProjection } from "@smallpen/local-package";
+import { inspectProjection, layoutSizingRules } from "@smallpen/local-package";
 
 export async function resolveDesignLayout(workspace, design, options = {}) {
   if (design.layoutSnapshot && (!options.raster || design.render?.bytes?.length)) return design;
@@ -642,6 +643,52 @@ export function platformHints(workspace, design) {
   return hints;
 }
 
+const SIZING = { width: "layout-item-h-sizing", height: "layout-item-v-sizing" };
+const LIMITS = { minWidth: "layout-item-min-w", maxWidth: "layout-item-max-w", minHeight: "layout-item-min-h", maxHeight: "layout-item-max-h" };
+const layoutContainer = (node) => node?.layout === "flex" || node?.layout === "grid";
+
+// Stored sizes the App cannot set: hug on an element without a row or
+// column layout, fill without a layout parent, min / max on an axis that
+// does not fill, and a container that hugs what a child fills (the App's
+// own rule, fixSizing, would make it fixed). Hidden elements and elements
+// inside copies count too: a copy may show what its component hides, and
+// repeats inside copies are reported once, against the component.
+export function appLayoutIssues(nodes, fixSizing) {
+  const issues = [];
+  const own = Object.keys(nodes);
+  const parentOf = new Map();
+  for (const [id, node] of Object.entries(nodes)) for (const child of node.children ?? []) parentOf.set(child, id);
+  const add = (nodeId, message, detail) => issues.push({ code: "layout_not_in_app", severity: "error", check: "app-layout", nodeId, message, ...detail });
+  for (const id of own) {
+    const node = nodes[id], parent = nodes[parentOf.get(id)];
+    for (const [axis, field] of Object.entries(SIZING)) {
+      if (node[field] === "auto" && !layoutContainer(node))
+        add(id, node.type === "TEXT"
+          ? `${node.name}: a text cannot hug its ${axis} in the App; it hugs by ${axis === "width" ? "auto width" : "auto height"}. Run project repair --action text-sizing to store every such text the App's way (nothing moves)`
+          : `${node.name} hugs its ${axis} without a row or column layout; the App offers hug only to such containers. Give it a ${axis} or a layout`, { field: axis });
+      if (node[field] === "fill" && parent && !layoutContainer(parent))
+        add(id, `${node.name} fills its ${axis} but ${parent.name} has no row or column layout; the App offers fill only inside one. Give it a ${axis} or give ${parent.name} a layout`, { field: axis });
+    }
+    for (const [name, field] of Object.entries(LIMITS)) {
+      const axis = name.endsWith("Width") ? "width" : "height";
+      if (node[field] !== undefined && node[field] !== null && node[SIZING[axis]] !== "fill")
+        add(id, `${node.name} has ${name} ${node[field]} but its ${axis} does not fill; the App sets min and max sizes only on an axis that fills. Set ${axis} to fill or ${name}=null`, { field: name });
+    }
+  }
+  const containers = own.filter((id) => nodes[id].layout === "flex");
+  const changes = containers.length ? fixSizing({ nodes, parents: containers, children: [] }) : {};
+  for (const [id, fields] of Object.entries(changes)) {
+    if (!own.includes(id)) continue;
+    for (const [field, axis] of [["layout-item-h-sizing", "width"], ["layout-item-v-sizing", "height"]]) {
+      if (!fields[field]) continue;
+      const fillers = (nodes[id].children ?? []).filter((child) => nodes[child]?.[field] === "fill");
+      const filling = fillers.map((child) => nodes[child].name);
+      add(id, `${nodes[id].name} hugs its ${axis} while ${filling.join(", ")} fill${filling.length === 1 ? "s" : ""} it; the App makes such a container fixed, and the filling element shrinks to nothing when drawn. Give ${nodes[id].name} a ${axis}, or let ${filling.join(", ")} hug`, { field: axis });
+    }
+  }
+  return issues;
+}
+
 export async function validateDesign(workspace, design) {
   design = await resolveDesignLayout(workspace, design);
   if (design.layoutSnapshot.status !== "resolved") {
@@ -714,6 +761,19 @@ export async function validateDesign(workspace, design) {
         measured: { width: item.width, height: item.height },
         box: { width: node.width, height: node.height },
       });
+    } else if (
+      // A wrapping box narrower than one word splits the word itself.
+      item.growType !== "auto-width" && item.longestPiece &&
+      item.longestPiece.width > node.width + Math.max(1, node.width * 0.02)
+    ) {
+      issues.push({
+        code: "text_word_split",
+        severity: "warning",
+        nodeId: node.id,
+        message: `"${item.longestPiece.text}" is ${Math.ceil(item.longestPiece.width)}px wide but its box is ${Math.round(node.width)}px, so the word breaks across lines; give the text a width or min width, or let it hug its content (width=hug)`,
+        measured: { width: item.longestPiece.width, text: item.longestPiece.text },
+        box: { width: node.width, height: node.height },
+      });
     }
   }
   for (const diagnostic of metrics.diagnostics)
@@ -880,8 +940,11 @@ export async function validateDesign(workspace, design) {
     for (const child of children) walk(child, [...ancestors, node], semantic);
   };
   walk(design.tree.root, design.ancestors);
+  issues.push(...appLayoutIssues(design.authoredProjection?.nodes ?? nodes, await layoutSizingRules()));
   for (const issue of issues) {
     if (issue.nodeId && places.has(issue.nodeId)) issue.where = where(issue.nodeId);
+    // A hidden element is not drawn, so it is named by its path.
+    else if (issue.nodeId && nodes[issue.nodeId]) issue.where = elementPath(nodes, design.projection.rootId, issue.nodeId).replaceAll(" / ", " › ");
     if (issue.otherNodeId && places.has(issue.otherNodeId)) issue.otherWhere = where(issue.otherNodeId);
     const text = nodes[issue.nodeId]?.type === "TEXT" ? nodes[issue.nodeId].text : undefined;
     if (text) issue.text = text.length > 40 ? `${text.slice(0, 39)}…` : text;
@@ -902,7 +965,7 @@ export async function validateDesign(workspace, design) {
       continue;
     }
     // Copies differ in their text overrides, not in the definition at fault.
-    const key = [issue.code, segments.at(-1), issue.ratio ?? ""].join("\0");
+    const key = [issue.code, segments.at(-1), issue.ratio ?? "", issue.field ?? ""].join("\0");
     const first = byDefinition.get(key);
     if (!first) {
       const entry = { ...issue, occurrences: 1 };

package/bin/help.mjs

@@ -325,9 +325,12 @@ Output:
   smallpen asset font import <package.smallpen> --file FONT_FILE --family NAME
                       [--weight 400] [--style normal] [--name NAME] [--json]
 
-Public Font entry for an existing Product. TTF and OTF are validated by SFNT
-signature and converted to WOFF (the renderer loads ttf/otf/woff). WOFF imports
-as-is after table validation. A valid WOFF2 reaches an explicit
+Public Font entry for an existing Product. TTF, OTF and WOFF are validated
+and stored as one original file per weight/style. App and CLI share native
+font loading; browser WOFF and native SFNT are derived on demand in a bounded
+system cache outside the Package. Reading or rendering does not change the
+Package revision or add derived blobs. Existing multi-format fonts still open.
+A valid WOFF2 reaches an explicit
 unsupported_font_conversion boundary (no WOFF2 decoder is bundled); corrupt
 fonts fail invalid_font_blob. Either way nothing is written. Success returns
 the family, files, revision, batchId, and the exact inverseBatch. Use the
@@ -429,7 +432,7 @@ Purpose:
 
 Batch contract:
   {"baseRevision":"...","batchId":"unique-id","operations":[...]}
-  baseRevision is package.revision from smallpen inspect PACKAGE --json.
+  baseRevision is the revision from the last write reply or smallpen inspect PACKAGE --json.
   The whole candidate validates and commits atomically. Success returns revision,
   affected stable IDs/files, a revision-guarded reverse edit, and changed
   (false, with noChange, when the batch leaves the Package as it was).
@@ -553,6 +556,8 @@ Actions:
   remove-dependent-usage  no additional arguments
   choose-foundation        --foundation PATH
   recreate-product-asset  --asset-kind token|component --asset FILE
+  text-sizing              no conflicts needed: store texts written as hug the
+                           App's way (fixed, sized by their grow type); nothing moves
 
 Without --action, returns all typed conflicts and choices. Each action is checked
 against the selected conflict and committed through one atomic Operation Batch.

package/bin/inspection-output.mjs

@@ -153,21 +153,24 @@ export function inspectionReport(
     const copies = [...ancestry(node), raw].filter(
       (candidate) => (stored[candidate.id] ?? candidate).instance,
     );
-    const overrides = copies.flatMap((copy) =>
-      Object.entries((stored[copy.id] ?? copy).instance?.overrides ?? {})
-        .filter(
-          ([key]) =>
-            copy.id === node.id ||
-            key.slice(0, key.lastIndexOf(":")) === raw.sourceNodeId,
-        )
-        .map(([key, value]) => ({
-          element:
-            variant?.nodes?.[key.slice(0, key.lastIndexOf(":"))]?.name ??
-            "component element",
+    const overrides = [];
+    const fieldOverrides = [];
+    for (const copy of copies) {
+      for (const [key, value] of Object.entries((stored[copy.id] ?? copy).instance?.overrides ?? {})) {
+        const path = key.slice(0, key.lastIndexOf(":"));
+        const target = path === copy.sourceNodeId ? copy.id : `${copy.id}__${path}`;
+        const item = {
+          element: target === raw.id ? source?.name ?? "component element"
+            : variant?.nodes?.[path]?.name ?? projection.nodes[target]?.name ?? "component element",
           field: key.slice(key.lastIndexOf(":") + 1),
           value,
-        })),
-    );
+        };
+        // The instance summary includes edits inside it. A field's source
+        // depends only on overrides that target that exact projected node.
+        if (copy.id === raw.id || target === raw.id) overrides.push(item);
+        if (target === raw.id) fieldOverrides.push(item);
+      }
+    }
     const placed = stored[raw.id];
     if (placed?.instance && source) {
       for (const name of [
@@ -177,16 +180,25 @@ export function inspectionReport(
         "visible",
         "textStyle",
         "tokenBindings",
+        "layout-gap",
+        "layout-padding",
+        "layout-item-margin",
+        "cornerRadius",
+        "shadow",
       ])
         if (
           Object.hasOwn(placed, name) &&
+          (name !== "tokenBindings" || Object.keys(placed[name] ?? {}).length > 0) &&
           JSON.stringify(placed[name]) !== JSON.stringify(source[name])
-        )
-          overrides.push({
+        ) {
+          const item = {
             element: source.name,
             field: name,
             value: placed[name],
-          });
+          };
+          overrides.push(item);
+          fieldOverrides.push(item);
+        }
     }
     return {
       name: set?.name ?? "unknown component",
@@ -196,6 +208,7 @@ export function inspectionReport(
         .filter((axis) => selection[axis.id] !== undefined)
         .map((axis) => `${axis.name}=${selection[axis.id]}`),
       overrides,
+      fieldOverrides,
       // A located App copy may lack its full source chain. Absence of
       // metadata is not proof that no overrides exist.
       overridesKnown:
@@ -293,12 +306,16 @@ export function inspectionReport(
           };
       }
     }
-    const overridden = component?.overrides.some(
+    const overridden = (component?.fieldOverrides ?? component?.overrides)?.some(
       (item) =>
         item.element === component.element &&
         (keys.includes(item.field) ||
           (name === "fill" && item.field === "fills") ||
           (name === "stroke" && item.field === "strokes") ||
+          (name === "gap" && item.field === "layout-gap") ||
+          (name.startsWith("padding") && item.field === "layout-padding") ||
+          (name.startsWith("margin") && item.field === "layout-item-margin") ||
+          (name.startsWith("radius") && item.field === "cornerRadius") ||
           (item.field === "textStyle" &&
             Object.hasOwn(item.value ?? {}, name)) ||
           (item.field === "tokenBindings" &&
@@ -357,6 +374,7 @@ export function inspectionReport(
   const nodes = layers.map(({ node, depth, index }) => {
     const raw = projection.nodes[node.id];
     const component = componentInfo(node);
+    const { fieldOverrides: _fieldOverrides, ...componentSource } = component ?? {};
     const actual = snapshot.nodes[node.id];
     const parent = parents.get(node.id);
     const parentBounds =
@@ -406,7 +424,7 @@ export function inspectionReport(
       add(
         "gap",
         raw["layout-gap"]?.[column ? "row-gap" : "column-gap"],
-        ["itemSpacing", column ? "rowGap" : "columnGap"],
+        [column ? "rowGap" : "columnGap", "itemSpacing"],
         0,
       );
       for (const [side, key] of [
@@ -557,7 +575,7 @@ export function inspectionReport(
       ...(layout ? { layout } : {}),
       fields,
       source: component
-        ? { kind: "component", ...component }
+        ? { kind: "component", ...componentSource }
         : { kind: "page" },
       visibility: {
         value: node.visible,

package/bin/schema.mjs

@@ -39,7 +39,7 @@ const FORMAT = SMALLPEN_FORMAT_CAPABILITIES;
 const OPERATION_TYPES = FORMAT.canonicalWrite.operationTypes;
 // The default `smallpen init` layout: one self-contained Package.
 const PACKAGE = "acme/acme.smallpen";
-const REVISION = "<package.revision from smallpen inspect PACKAGE --json>";
+const REVISION = "<revision from the last write reply or smallpen project show PACKAGE --json>";
 
 export const PACKAGE_ROLES = Object.freeze({
   foundation:
@@ -157,7 +157,7 @@ export const WORKED_EXAMPLE = Object.freeze([
         "canvas-v1",
       ),
     },
-    note: "Copy the revision from the previous reply (or inspect PACKAGE) into baseRevision before applying the batch. Existing IDs replace whole definitions; use update for partial edits.",
+    note: "Copy the revision from the previous reply (or project show PACKAGE --json) into baseRevision before applying the batch. Existing IDs replace whole definitions; use update for partial edits.",
   },
   {
     title: "Add text to that canvas",
@@ -272,7 +272,7 @@ function operationDetail(type) {
     ...(schema.oneOf ? { requiresOneOf: schema.oneOf } : {}),
     unknownFields: "rejected with unknown_operation_field",
     example: batchFor([schema.example], `example-${type}`),
-    run: `smallpen apply <${schema.package === "foundation" ? "foundation" : "product"}.smallpen> --batch BATCH.json --dry-run --json`,
+    run: `smallpen advanced apply <${schema.package === "foundation" ? "foundation" : "product"}.smallpen> --batch BATCH.json --dry-run --json`,
   };
 }
 
@@ -720,18 +720,16 @@ function batchTopic() {
       "Every write is one atomic Operation Batch. Nothing is written unless every operation is valid.",
     batch: {
       baseRevision:
-        "package.revision from smallpen inspect PACKAGE --json; a stale value is rejected",
-      batchId: "1-192 characters [A-Za-z0-9_.-], new for every write",
+        "revision from the last write reply or smallpen project show PACKAGE --json; a stale value is rejected",
+      batchId: "1-192 characters [A-Za-z0-9_.-], new for every write. Batch IDs are remembered per package path: a fresh copy put at the same path keeps that path's IDs, so rehearse in a copy at a new path to reuse them on the real package",
       operations: "array; see: smallpen schema operations",
     },
     packages: PACKAGE_ROLES,
     commands: {
       apply:
-        "smallpen apply PACKAGE --batch BATCH.json [--dry-run] [--explain] [--diff]",
-      token:
-        "smallpen token PACKAGE --intent {operations:[...]}: like apply, with baseRevision and batchId filled in",
-      page: "smallpen page PRODUCT --intent {screenId, presentationId?, parentId?, index?, nodes:[node, ...]}: one add-presentation-node per node, all siblings under parentId (default: the root); overrides on an INSTANCE node become set-instance-override operations",
-      flow: "smallpen flow PRODUCT --intent: same as page, for flowchart nodes",
+        "smallpen advanced apply PACKAGE --batch BATCH.json [--dry-run] [--explain] [--diff]",
+      named:
+        "page, component, token, theme, flow, asset and canvas commands build the batch from names, with baseRevision and batchId filled in",
     },
     result:
       "batchId, revision, changedFiles, affectedIds, changed (false for no-op or replay), alreadyApplied, dryRun and summary. changeReportPath records exact before/after values. reverseEdit/inverseBatchPath describe an explicit new apply write with its own identity and a fixed baseRevision, not history rollback. After later edits, read current fields and construct a new scoped edit; do not force an old snapshot by changing its baseRevision. --inverse-out FILE chooses a durable file. --full includes exact details. Reuse batchId only for identical retries; ledger retains at most 500 identities.",
@@ -779,7 +777,11 @@ function setTopic(command) {
     notes: [
       "Only the named fields change; everything else, links included, stays. Texts are measured again and containers that hug grow or shrink, as page draw does.",
       "Versions and variants often differ on purpose: an element (or the page or component itself) in several of them needs --platform (--variant) to name one, or --all to change every one; the refusal lists where it is.",
-      "A value written over a Token binding replaces the binding.",
+      "A value written over a Token binding replaces the binding, on an element and on a copy (visible, opacity) alike.",
+      "fill=none or stroke=none removes the paint; a color is \"#RRGGBB\", \"#RRGGBBAA\" (the last two digits are its opacity), rgb() or a CSS color name.",
+      "--variant names some or all properties (\"State=default\"); every variant it names is changed, and several need --all like an element in several variants.",
+      "Sizes follow the App: hug only on a row/column container or a text, min and max sizes only on an axis that fills; a container that hugs what a child fills becomes fixed, as the App makes it. Anything else is refused with what to write instead, and validate reports stored sizes the App cannot set (layout_not_in_app).",
+      "An element path lists parents in order (\"Content / Heading\"); when several elements match, the one directly inside those parents wins.",
     ],
   };
 }
@@ -805,10 +807,10 @@ const TOPICS = {
         layout: "row | column | none; in none the CLI places children so they do not overlap: give place (\"below Header\", {rightOf: \"Sidebar\", gap: 24}) or nothing, x/y only to pin one",
         "gap / padding": "number or {token}; padding takes 1, 2 or 4 values",
         "align / justify": "start | center | end (align also stretch; justify also space-between)",
-        "width / height": 'number, "fill" (or "100%") or "hug"; the only text in a row fills by default, several texts in a row hug',
+        "width / height": 'number, "fill" (or "100%") or "hug", as the App offers them: fill only inside a row/column parent; hug only on a row/column container, a copy of one, or a text (stored as the App\'s auto width / auto height; a text that hugs its width also hugs its height). Texts hug by default; the only text in a row with a set width fills it',
         "fill / stroke / radius / opacity / shadow": 'value or {token}; stroke is a color or {color, width, style}, width one value or four sides [top, right, bottom, left]; radius is one value or four corners [top-left, top-right, bottom-right, bottom-left]',
         margin: "number or {token}; 1, 2 or 4 values, like padding",
-        "minWidth / maxWidth / minHeight / maxHeight": "number or {token}",
+        "minWidth / maxWidth / minHeight / maxHeight": "number or {token}; only on an axis that is fill, as in the App (invalid_size_limit otherwise)",
         "letterSpacing / lineHeight / textTransform / textDecoration": "text only; value or {token} (textTransform: uppercase|lowercase|capitalize|none, textDecoration: underline|line-through|none)",
         rotation: "degrees or {token}",
         visible: "false hides it (for example per platform in a variant), or {flag} for a boolean Token",
@@ -856,7 +858,7 @@ const TOPICS = {
         ],
       },
       notes: [
-        "Drawing a page again redraws it; elements drawn again under the same names keep their ids and interactions.",
+        "Drawing a page again redraws it; elements drawn again under the same names keep their ids and interactions. A copy of the same component drawn again also keeps a Token-bound or fill width and height unless the element gives width or height (\"hug\" lets it follow its content again).",
         "An instance whose new text is longer than its slot grows by the measured difference.",
         "Link elements with flow link --from \"Page / Element\" --to Page.",
         "Move an element later with page move --page Page --element Name --direction up|down|left|right [--steps N]; the CLI picks the coordinates.",

package/bin/smallpen.mjs

@@ -25,6 +25,7 @@ import {
   flowStartIntent,
   pageDrawOperation,
   componentSetOperation,
+  textSizingRepairOperations,
   pageSetOperation,
   themeAddIntents,
   themeDefaultIntent,
@@ -115,10 +116,10 @@ import {
   openPackage,
   readBatchHistory,
   openRemoteLibrary,
+  layoutSizingRules,
   measureProjectionText,
   replayRecordedBatch,
   resolveWorkspace,
-  sfntToWoff,
 } from "@smallpen/local-package";
 
 import { COMMAND_NAMES, commandGuidance, printHelp } from "./help.mjs";
@@ -613,6 +614,8 @@ function printJson(value) {
       omitted: true,
       bytes: Buffer.byteLength(json) + 1,
       limitBytes,
+      // Callers that always want one path can ask for the whole reply.
+      inline: "--stdout prints the whole result instead",
     };
     json = encode(brief);
     if (brief.matrixPath && Buffer.byteLength(json) + 1 > limitBytes) {
@@ -2419,13 +2422,45 @@ function repairChoiceCommand(locator, productPackageId, conflictIndex, choice) {
   return { argv: base };
 }
 
+// Stored settings the App cannot make, rewritten the App's way without a
+// visible change: texts stored as hug (text-sizing).
+const STORAGE_REPAIRS = ["text-sizing"];
+
 async function repairCommand(packagePath, args) {
   const resolution = await resolveCliWorkspace(packagePath);
+  const action = option(args, "--action");
+  if (STORAGE_REPAIRS.includes(action) && resolution.status !== "ready")
+    throw new SmallPenError("repair_conflicts_first", `Resolve the package's conflicts before ${action}; run project repair without --action to list them`);
   if (resolution.status === "ready") {
+    const product = resolution.workspace.product;
+    const textSizing = textSizingRepairOperations(product);
+    if (action === "text-sizing") {
+      if (!textSizing.count) return { action, changed: false, count: 0, revision: product.revision, status: "ready" };
+      const result = await trackedWrite(() =>
+        applyOperationBatch(product.locator, {
+          baseRevision: product.revision,
+          batchId: option(args, "--batch-id") ?? `repair_${randomUUID()}`,
+          operations: textSizing.operations,
+        }),
+      );
+      return {
+        action, count: textSizing.count, places: textSizing.places.length,
+        done: `${textSizing.count} text sizes in ${textSizing.places.length} pages and variants stored the App's way (hug is a text's grow type); the design looks the same`,
+        batchId: result.batchId, revision: result.revision, changed: result.changed,
+        inverseBatchPath: result.inverseBatchPath, status: "ready",
+      };
+    }
+    if (action !== undefined)
+      throw new SmallPenError("unknown_repair_action", `The package has no conflicts; the repairs it can take are ${STORAGE_REPAIRS.join(", ")}`, { actions: STORAGE_REPAIRS });
     return {
-      packageId: resolution.workspace.product.manifest.packageId,
-      revision: resolution.workspace.product.revision,
+      packageId: product.manifest.packageId,
+      revision: product.revision,
       status: "ready",
+      ...(textSizing.count ? { repairs: [{
+        action: "text-sizing", count: textSizing.count, places: textSizing.places.length,
+        message: `${textSizing.count} text sizes are stored as hug, which the App does not offer for a text; this stores them the App's way without a visible change`,
+        command: ["project", "repair", resolve(packagePath), "--action", "text-sizing", "--json"],
+      }] } : {}),
     };
   }
   if (!option(args, "--action")) {
@@ -2451,7 +2486,6 @@ async function repairCommand(packagePath, args) {
     };
   }
   const { index, selected } = selectedRepairConflict(resolution, args);
-  const action = option(args, "--action");
   const operations = await repairOperations(resolution, selected, action, args);
   const result = await trackedWrite(() =>
     applyOperationBatch(resolution.product.locator, {
@@ -3190,6 +3224,11 @@ async function rebuildBefore(snapshot, history, cut) {
   let complete = true;
   for (const entry of [...newer].reverse()) {
     if (!entry.inverseBatch) {
+      if (entry.history?.status === "partial")
+        throw new SmallPenError("batch_history_unavailable", "The design was saved, but this earlier revision cannot be reconstructed from the bounded history cache", {
+          batchId: entry.batchId, revision: snapshot.revision, history: entry.history,
+          nextOperations: [{ argv: ["view", snapshot.locator, "--as", "spec", "--json"], operation: "smallpen.view" }],
+        });
       complete = false;
       break;
     }
@@ -3243,6 +3282,7 @@ async function changesCommand(packagePath, args) {
       packageId: snapshot.manifest.packageId,
       ...BATCH_HISTORY_LIMITS,
       retainedBatches: histories[index].length,
+      incompleteBatches: histories[index].filter((entry) => entry.history?.status === "partial").length,
       oldestRevision: histories[index][0]?.baseRevision,
       newestRevision: histories[index].at(-1)?.revision,
     })),
@@ -4380,6 +4420,8 @@ async function main(args) {
       const wraps = [];
       const asked = [];
       let calls = 0;
+      // The App's flex sizing rules, so the CLI stores what the App would.
+      const fixSizing = await layoutSizingRules();
       const plan = () => {
         calls = 0;
         return ({ "component-define": componentDefineOperation, "page-draw": pageDrawOperation, "page-set": pageSetOperation, "component-set": componentSetOperation })[command](
@@ -4387,6 +4429,7 @@ async function main(args) {
           intent,
           {
             ...lookups,
+            fixSizing,
             measure: (tree) => {
               const index = calls++;
               trees[index] ??= tree;
@@ -5203,17 +5246,9 @@ async function main(args) {
     if (signatureTtf) {
       inspectFont(bytes, "font/ttf");
       files.ttf = { bytes, mimeType: "font/ttf" };
-      files.woff = {
-        bytes: sfntToWoff(bytes, "font/ttf"),
-        mimeType: "font/woff",
-      };
     } else if (signatureOtf) {
       inspectFont(bytes, "font/otf");
       files.otf = { bytes, mimeType: "font/otf" };
-      files.woff = {
-        bytes: sfntToWoff(bytes, "font/otf"),
-        mimeType: "font/woff",
-      };
     } else if (signatureWoff2) {
       inspectFont(bytes, "font/woff2");
       files.woff2 = { bytes, mimeType: "font/woff2" };

package/bin/validation-runner.mjs

@@ -1,23 +1,31 @@
 import { Worker } from "node:worker_threads";
 
+// A renderer that panicked or ran out of memory stays broken in its worker.
+const RENDERER_FAILURE = /panic|wasm|render_failed|validation_worker_failed/;
+
 // A persistent worker reuses the shared App runtime. Terminating the worker
 // also stops synchronous WASM; a Promise timeout in this process cannot.
+// WASM memory only grows, so a worker is replaced after jobsPerWorker
+// targets, and a target the renderer failed on is tried once more in a
+// fresh worker.
 export async function runValidationJobs(workspace, jobs, {
-  timeoutMs = 30_000, signal, progress = () => {},
+  timeoutMs = 30_000, signal, progress = () => {}, jobsPerWorker = 12,
   workerUrl = new URL("./validation-worker.mjs", import.meta.url),
 } = {}) {
   const results = [];
-  let worker;
+  let worker, served = 0;
   const emit = (event, extra = {}) => progress({
     type: "validation-progress", event, total: jobs.length, completed: results.length, ...extra,
   });
   emit("start");
   try {
-    for (const job of jobs) {
-      if (signal?.aborted) break;
-      emit("target", { target: job.label });
-      worker ??= new Worker(workerUrl, { workerData: workspace });
-      const result = await new Promise(resolve => {
+    const runOne = job => {
+      if (!worker) {
+        worker = new Worker(workerUrl, { workerData: workspace });
+        served = 0;
+      }
+      served += 1;
+      return new Promise(resolve => {
         let finished = false;
         const finish = value => {
           if (finished) return;
@@ -44,10 +52,22 @@ export async function runValidationJobs(workspace, jobs, {
         if (signal?.aborted) onAbort();
         else worker.postMessage(job);
       });
-      if (result.restart) {
-        await worker.terminate();
-        worker = undefined;
+    };
+    const restart = async () => {
+      await worker?.terminate();
+      worker = undefined;
+    };
+    for (const job of jobs) {
+      if (signal?.aborted) break;
+      emit("target", { target: job.label });
+      if (served >= jobsPerWorker) await restart();
+      let result = await runOne(job);
+      if (!result.interrupted && RENDERER_FAILURE.test(result.error?.code ?? "")) {
+        await restart();
+        emit("retry", { target: job.label, reason: result.error.code });
+        result = await runOne(job);
       }
+      if (result.restart || RENDERER_FAILURE.test(result.error?.code ?? "")) await restart();
       if (result.interrupted) break;
       results.push({ job, ...result });
       emit("completed", { target: job.label, status: result.error ? result.error.code : "checked" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smallpen/cli",
-  "version": "0.1.0-alpha.15",
+  "version": "0.1.0-alpha.18",
   "publishConfig": {
     "access": "public"
   },
@@ -15,8 +15,8 @@
     "bin"
   ],
   "dependencies": {
-    "@smallpen/core": "0.1.0-alpha.15",
-    "@smallpen/local-package": "0.1.0-alpha.15"
+    "@smallpen/core": "0.1.0-alpha.18",
+    "@smallpen/local-package": "0.1.0-alpha.18"
   },
   "repository": {
     "type": "git",