@12ui/design 0.2.55 → 0.2.57

package/dist/improve-conversion-stage.js

@@ -1,11 +1,15 @@
 import { copyFile, cp, readFile, stat } from 'node:fs/promises';
 import sharp from 'sharp';
 import { runConversionCommand } from './cli-convert-command.js';
+import { formatDuration } from './cli-progress.js';
+import { createImproveConvertProgress, } from './improve-convert-progress.js';
 import { CliRefusal } from './cli-refusal.js';
 import { prepareOutputDirectory } from './cli-output-paths.js';
-import { fixedImproveHtml, improveConversionIdFromText, improveErrorText, IMPROVE_RESPONSIVE_TIMEOUT_MS, prepareImproveTargetAttempt, recordedImproveConversionId, responsiveFallbackReason, } from './improve-convert-resilience.js';
+import { fixedImproveHtml, improveConversionIdFromText, improveConvertRetryKey, improveConvertStallCount, improveConvertStallHalted, improveErrorText, improveStalled, IMPROVE_FRESH_ABANDON_REASON, prepareImproveTargetAttempt, responsiveFallbackReason, } from './improve-convert-resilience.js';
+import { improveFreshConversionKey, noteImproveConversionAttemptId, openImproveConversionAttempt, settleImproveConversionAttempt, startImproveConversionAttempt, } from './improve-conversion-attempts.js';
 import { canvasOfDoc } from './improve-layerdoc-diff.js';
-import { improveSha256, noteImproveStage, } from './improve-stage-shared.js';
+import { abandonImproveConversion, noteAbandonedAttempts, withoutImproveStages, } from './improve-reset.js';
+import { improveSha256, noteImproveStage, noteImproveStageDispatched, } from './improve-stage-shared.js';
 import { readImproveRecord, writeImproveRecord } from './improve-workspace.js';
 export const runImproveConversion = async (args) => {
     const artifacts = [];
@@ -15,11 +19,19 @@ export const runImproveConversion = async (args) => {
         note: (facts) => {
             artifacts.push(...(facts.artifacts ?? []));
             purchaseIds.push(...(facts.purchased ?? []));
-            if (facts.runId)
+            if (facts.runId) {
+                if (!runIds.includes(facts.runId)) {
+                    args.onConversionId?.(facts.runId);
+                    args.progress?.noteConversionId(facts.runId);
+                }
                 runIds.push(facts.runId);
+            }
             args.journal?.note(facts);
         },
-        heartbeat: (progress) => { args.journal?.heartbeat(progress); },
+        heartbeat: (progress) => {
+            args.journal?.heartbeat(progress);
+            args.progress?.heartbeat(progress);
+        },
     };
     const flags = {
         output: args.output,
@@ -54,25 +66,19 @@ class ImproveConvertAttemptError extends Error {
         this.attempt = attempt;
     }
 }
+/**
+ * `--fresh` re-buys ONE conversion of the SAME settled winner under a new
+ * idempotency key. Capture, draft and pick stay settled and are not redrawn —
+ * `--redraw` is the flag for that.
+ */
 const recordFreshConversion = async (args) => {
     const durable = await readImproveRecord(args.options.paths.record) ?? args.record;
-    const abandonedId = await recordedImproveConversionId(durable);
-    const abandonedConversions = [...(durable.abandonedConversions ?? [])];
-    if (abandonedId && !abandonedConversions.some((entry) => entry.id === abandonedId)) {
-        abandonedConversions.push({
-            id: abandonedId,
-            abandonedAt: new Date().toISOString(),
-            reason: 'fresh requested after recorded conversion remained unavailable',
-        });
-        (args.dependencies.warn ?? console.warn)(`[fresh] convert: abandoning recorded conversion ${abandonedId}; requesting a new purchase`);
-    }
-    const record = {
-        ...durable,
-        ...(abandonedConversions.length > 0 ? { abandonedConversions } : {}),
-        convert: undefined,
-        plan: undefined,
-        stages: Object.fromEntries(Object.entries(durable.stages).filter(([stage]) => !['convert', 'plan'].includes(stage))),
-    };
+    const abandoned = await abandonImproveConversion({
+        record: durable,
+        reason: IMPROVE_FRESH_ABANDON_REASON,
+        warn: args.dependencies.warn ?? ((line) => { console.warn(line); }),
+    });
+    const record = withoutImproveStages(abandoned.record, ['convert', 'plan']);
     await writeImproveRecord(args.options.paths.record, record);
     return record;
 };
@@ -130,75 +136,253 @@ export const runImproveConvertStage = async (args) => {
         throw new Error('Improve has no design image to convert');
     const targetIdentity = improveSha256(Buffer.from(`${inputSha}:${args.record.conversionModel}:${args.options.responsiveQuality}`)).slice(0, 32);
     const baseKey = `improve-target:v2:${targetIdentity}`;
-    const key = args.options.fresh
-        ? `${baseKey}:fresh:${args.freshConversionNonce}`
-        : baseKey;
+    // How many conversions of this winner a PRE-F19 kit bought and abandoned to a
+    // stall, and which of them to wait on now. A resume re-attaches to the NEWEST
+    // one — it is bought, it is still running, and it is the only way to get
+    // anything back for it — instead of rebuilding the base key and waiting out
+    // the whole bound on the first, oldest conversion. Nothing adds to this count
+    // any more; a stall no longer abandons anything.
+    const bought = args.options.fresh ? 0 : improveConvertStallCount(recordBeforeConvert);
+    const index = Math.max(1, bought);
+    // WHICH CONVERSION THIS INVOCATION IS ABOUT TO WAIT ON. The attempt ledger
+    // decides, because it holds the exact key: a `--fresh` or retry attempt that
+    // was stopped mid-flight is reachable only through the key it was dispatched
+    // under, and the derived stall key below cannot express a nonce. Without it,
+    // `--from convert` rebuilt the base key, the server's dedupe handed back the
+    // older recorded conversion, and the fresh one kept running and kept billing
+    // with nothing able to collect it. The derived key stays the fallback for
+    // kits written before the ledger.
+    //
+    // Only an attempt minted for THIS winner counts: every recorded key is the
+    // base key itself or the base key plus a suffix, so the prefix is what says
+    // the conversion behind it is of the design this run is converting. A redraw
+    // or a re-pick already closes its attempts (`abandonImproveConversions`);
+    // this is the second lock on that door, because re-attaching to a conversion
+    // of a discarded design would deliver the wrong page and read as a replay.
+    const open = args.options.fresh ? undefined : openImproveConversionAttempt(recordBeforeConvert);
+    const resumed = open && (open.key === baseKey || open.key.startsWith(`${baseKey}:`))
+        ? open
+        : undefined;
+    const nonce = args.freshConversionNonce;
+    if (args.options.fresh && !nonce) {
+        throw new Error('improve --fresh needs a per-invocation conversion nonce, so the conversion it dispatches'
+            + ' can be recorded and resumed rather than orphaned');
+    }
+    const key = args.options.fresh && nonce
+        ? improveFreshConversionKey(baseKey, nonce)
+        : resumed?.key ?? (index === 1 ? baseKey : improveConvertRetryKey(baseKey, index));
+    // The transaction is taken ONCE: a second `prepareImproveTargetAttempt`
+    // while the first backup exists would delete the previous good target
+    // instead of preserving it.
     const transaction = await prepareImproveTargetAttempt(args.options.paths.targetDir);
+    const warn = args.dependencies.warn ?? ((line) => { console.warn(line); });
     try {
-        const converted = await runImproveConversion({
-            input,
-            outDir: args.options.paths.targetDir,
-            output: 'html',
-            model: args.record.conversionModel,
-            responsiveQuality: args.options.responsiveQuality,
-            timeoutMs: IMPROVE_RESPONSIVE_TIMEOUT_MS,
-            key,
-            runner: args.dependencies.runConvert ?? runConversionCommand,
-            journal: args.dependencies.journal,
-        }).catch(async (error) => {
-            const attempt = error instanceof ImproveConvertAttemptError
-                ? error.attempt
-                : { artifacts: [], purchaseIds: [], runIds: [] };
-            const warning = responsiveFallbackReason(error);
-            const sourceConversionId = attempt.runIds[0]
-                ?? improveConversionIdFromText(improveErrorText(error));
-            const layerDocPresent = (await stat(args.options.paths.targetLayerDoc).catch(() => undefined))?.isFile();
-            const assetsPresent = (await stat(`${args.options.paths.targetLayerDoc}.assets`).catch(() => undefined))?.isDirectory();
-            if (!warning || !sourceConversionId || !layerDocPresent || !assetsPresent)
-                throw error;
-            (args.dependencies.warn ?? console.warn)(`Responsive HTML was unavailable; deriving fixed-layout HTML free from ${sourceConversionId}`);
-            const fixed = await runImproveConversion({
-                input: sourceConversionId,
+        // The hosted id joins its key on the record as soon as the conversion
+        // reports one, so a reader of `improve.json` alone can say which conversion
+        // a recorded key bought. Only ledger attempts have anywhere to put it, so
+        // the ordinary base-key path writes nothing extra. The writes are chained
+        // and drained before the stage writes the record itself: a stamp landing
+        // after the settled record would write a record that has no convert block.
+        let pendingLedgerWrite = Promise.resolve();
+        const rememberConversionId = (attemptKey, id) => {
+            const noted = noteImproveConversionAttemptId(recordBeforeConvert, {
+                key: attemptKey,
+                conversionId: id,
+            });
+            if (noted === recordBeforeConvert)
+                return;
+            recordBeforeConvert = noted;
+            pendingLedgerWrite = pendingLedgerWrite
+                .then(async () => writeImproveRecord(args.options.paths.record, recordBeforeConvert))
+                .catch((error) => {
+                warn(`[ledger] convert: could not record conversion ${id} against its key:`
+                    + ` ${improveErrorText(error)}`);
+            });
+        };
+        const bound = args.options.convertStallSeconds;
+        // Progress goes where every other 12ui progress stream goes — stderr, via
+        // the same channel the fallback line uses — so stdout stays the record.
+        const tick = args.dependencies.warn ?? ((line) => { console.warn(line); });
+        const attemptConversion = async (attemptKey) => {
+            // The wait a lane actually sits through, ticked once a minute so the
+            // terminal never goes silent for the length of the bound (F8). The wall
+            // clock is the backstop for the elapsed the service reports, because a
+            // conversion that dies before its first heartbeat reports none at all.
+            const startedAt = Date.now();
+            const progress = createImproveConvertProgress({
+                label: 'responsive export',
+                boundSeconds: bound,
+                write: tick,
+            });
+            return runImproveConversion({
+                input,
                 outDir: args.options.paths.targetDir,
-                output: 'html_fixed',
-                key: `improve-fixed:v1:${sourceConversionId}`,
+                output: 'html',
+                model: args.record.conversionModel,
+                responsiveQuality: args.options.responsiveQuality,
+                timeoutMs: args.options.convertStallSeconds * 1_000,
+                key: attemptKey,
                 runner: args.dependencies.runConvert ?? runConversionCommand,
                 journal: args.dependencies.journal,
+                onConversionId: (id) => { rememberConversionId(attemptKey, id); },
+                progress,
+            }).catch(async (error) => {
+                const attempt = error instanceof ImproveConvertAttemptError
+                    ? error.attempt
+                    : { artifacts: [], purchaseIds: [], runIds: [] };
+                const warning = responsiveFallbackReason(error);
+                const sourceConversionId = attempt.runIds[0]
+                    ?? improveConversionIdFromText(improveErrorText(error));
+                const layerDocPresent = (await stat(args.options.paths.targetLayerDoc).catch(() => undefined))?.isFile();
+                const assetsPresent = (await stat(`${args.options.paths.targetLayerDoc}.assets`).catch(() => undefined))?.isDirectory();
+                if (!warning || !sourceConversionId || !layerDocPresent || !assetsPresent)
+                    throw error;
+                const waitedSeconds = Math.round(progress.waitedSeconds() ?? (Date.now() - startedAt) / 1_000);
+                (args.dependencies.warn ?? console.warn)(`Responsive HTML was unavailable after ${formatDuration(waitedSeconds)}`
+                    + ` (bound ${formatDuration(bound)});`
+                    + ` deriving fixed-layout HTML free from ${sourceConversionId}`);
+                // The derivation is free, not unbounded. Passing no timeout dropped it
+                // through to waitForOperation's twenty-minute default while the docs
+                // promised `--convert-stall-seconds` bounds the conversion wait, so a
+                // wedged derivation hung the run for twenty minutes with no STALL.md —
+                // the pipedrive shape, on the one path the reader was told was bounded.
+                const fixed = await runImproveConversion({
+                    input: sourceConversionId,
+                    outDir: args.options.paths.targetDir,
+                    output: 'html_fixed',
+                    timeoutMs: args.options.convertStallSeconds * 1_000,
+                    key: `improve-fixed:v1:${sourceConversionId}`,
+                    runner: args.dependencies.runConvert ?? runConversionCommand,
+                    journal: args.dependencies.journal,
+                    progress: createImproveConvertProgress({
+                        label: 'fixed-layout derivation',
+                        boundSeconds: bound,
+                        write: tick,
+                    }),
+                });
+                const fixedOutput = await fixedImproveHtml(args.options.paths.targetDir);
+                args.dependencies.journal?.note({ degradations: ['improve_fixed_layout_fallback'] });
+                return {
+                    artifacts: [...new Set([
+                            ...attempt.artifacts,
+                            ...fixed.artifacts,
+                            args.options.paths.targetLayerDoc,
+                            `${args.options.paths.targetLayerDoc}.assets`,
+                            fixedOutput.html,
+                            fixedOutput.assets,
+                        ])],
+                    purchaseIds: [...new Set([...attempt.purchaseIds, ...fixed.purchaseIds])],
+                    runIds: [...new Set([sourceConversionId, ...attempt.runIds, ...fixed.runIds])],
+                    fallback: { html: fixedOutput.html, warning, waitedSeconds },
+                };
             });
-            const fixedOutput = await fixedImproveHtml(args.options.paths.targetDir);
-            args.dependencies.journal?.note({ degradations: ['improve_fixed_layout_fallback'] });
-            return {
-                artifacts: [...new Set([
-                        ...attempt.artifacts,
-                        ...fixed.artifacts,
-                        args.options.paths.targetLayerDoc,
-                        `${args.options.paths.targetLayerDoc}.assets`,
-                        fixedOutput.html,
-                        fixedOutput.assets,
-                    ])],
-                purchaseIds: [...new Set([...attempt.purchaseIds, ...fixed.purchaseIds])],
-                runIds: [...new Set([sourceConversionId, ...attempt.runIds, ...fixed.runIds])],
-                fallback: { html: fixedOutput.html, warning },
-            };
+        };
+        // ONE DISPATCH PER INVOCATION, ALWAYS (F19, CLAUDE.md item 3).
+        //
+        // A stall used to buy a second parent conversion of the same winner. The
+        // justification was that the bound sits outside the model's typical window,
+        // so it could not fire on healthy work — a bound, never a measurement. What
+        // it produced on pipedrive was one operator command, two parent conversions,
+        // four conversion ids, and an abandoned-conversion list the CLI wrote
+        // against itself while the first conversion kept running and kept billing.
+        //
+        // So there is no retry, no abandonment, and no second key. A stall that left
+        // a LayerDoc derives the free fixed-layout fallback from the conversion that
+        // is already running (inside `attemptConversion`); a stall that left nothing
+        // ends the invocation with the conversion still open in the ledger, so
+        // `plan/STALL.md` and `--from convert` both re-attach to it.
+        //
+        // Why an attempt is being dispatched, which is what the ledger records it
+        // as. A resume of a recorded attempt re-declares the reason it was opened
+        // with and dedupes to a no-op.
+        const reason = args.options.fresh
+            ? 'fresh'
+            : resumed?.reason ?? (index === 1 ? 'primary' : 'stall-retry');
+        // BEFORE THE DISPATCH, because a conversion nothing wrote down before it
+        // started is a conversion a stop cannot leave resumable — and because a
+        // price nobody wrote down is a paid call with no receipt. `--fresh` also
+        // walks away here from whatever attempt this kit still had open: it is
+        // buying a replacement for it, and an attempt left open would send the
+        // next resume back to the run this one supersedes.
+        const started = startImproveConversionAttempt(recordBeforeConvert, {
+            key,
+            reason,
+            priceCeilingUsd: args.price,
+            ...(args.options.fresh ? { supersedes: IMPROVE_FRESH_ABANDON_REASON } : {}),
+        });
+        if (started.record !== recordBeforeConvert) {
+            recordBeforeConvert = noteAbandonedAttempts({
+                record: started.record,
+                attempts: started.superseded,
+                reason: IMPROVE_FRESH_ABANDON_REASON,
+                warn,
+            });
+        }
+        // The stage's own priced entry, written now rather than on settlement: a
+        // kit that stalled had no `convert` entry at all, so its recorded ceiling
+        // was the draft's and a lane converting a page twice could not say so.
+        recordBeforeConvert = noteImproveStageDispatched({
+            record: recordBeforeConvert, stage: 'convert', priceCeilingUsd: args.price,
         });
-        const html = 'fallback' in converted ? converted.fallback.html : args.options.paths.targetHtml;
+        await writeImproveRecord(args.options.paths.record, recordBeforeConvert);
+        let converted;
+        try {
+            converted = await attemptConversion(key);
+            await pendingLedgerWrite;
+        }
+        catch (error) {
+            await pendingLedgerWrite;
+            if (!improveStalled(error))
+                throw error;
+            // The stalled attempt knows its own id even when the record does not:
+            // nothing settled, so `recordedImproveConversionId` has nowhere to look.
+            // It stays OPEN in the ledger — it is running, it is paid for, and the
+            // resume this error prints is the only way to get anything back for it.
+            const stalledId = (error instanceof ImproveConvertAttemptError
+                ? error.attempt.runIds[0]
+                : undefined) ?? improveConversionIdFromText(improveErrorText(error));
+            warn(`[stall] convert: nothing settled in ${args.options.convertStallSeconds}s;`
+                + `${stalledId ? ` conversion ${stalledId}` : ' the conversion'} is still running,`
+                + ' and improve is not buying another');
+            throw improveConvertStallHalted({
+                seconds: args.options.convertStallSeconds,
+                ...(stalledId ? { conversionId: stalledId } : {}),
+                input: args.record.input.value,
+                runDir: args.options.paths.runDir,
+                cause: error,
+            });
+        }
+        const convertedKey = key;
+        const html = converted.fallback ? converted.fallback.html : args.options.paths.targetHtml;
         for (const expected of [args.options.paths.targetLayerDoc, html]) {
             if (!(await stat(expected).catch(() => undefined))?.isFile()) {
                 throw new Error(`Improve conversion completed without ${expected}`);
             }
         }
-        let record = {
+        let record = settleImproveConversionAttempt({
             ...recordBeforeConvert,
             convert: {
                 layerDoc: args.options.paths.targetLayerDoc,
                 html,
-                layout: 'fallback' in converted ? 'fixed' : 'responsive',
+                layout: converted.fallback ? 'fixed' : 'responsive',
                 ...(converted.runIds[0] ? { sourceConversionId: converted.runIds[0] } : {}),
-                ...('fallback' in converted ? { responsiveWarning: converted.fallback.warning } : {}),
+                ...(converted.fallback ? { responsiveWarning: converted.fallback.warning } : {}),
+                // What the responsive half did before the derivation replaced it, kept
+                // durably so `plan/STALL.md`, the README and the run summary all read
+                // one account of the same wait rather than three (F8).
+                ...(converted.fallback && converted.runIds[0]
+                    ? {
+                        responsiveStall: {
+                            conversionId: converted.runIds[0],
+                            waitedSeconds: converted.fallback.waitedSeconds,
+                            boundSeconds: bound,
+                        },
+                    }
+                    : {}),
                 artifacts: converted.artifacts,
                 purchaseIds: converted.purchaseIds,
             },
-        };
+        }, { key: convertedKey });
         record = await noteImproveStage({
             record, stage: 'convert', priceCeilingUsd: args.price, replayed: false, write: false,
         });

package/dist/improve-conversion-stage.js.map

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

package/dist/improve-convert-progress.d.ts

@@ -0,0 +1,36 @@
+import type { RunJournalProgress } from './run-journal.js';
+/**
+ * A visible tick while the convert stage waits on hosted work.
+ *
+ * The convert stage runs `12ui convert` with `quiet: true`, so its own progress
+ * stream is suppressed and the only record of the wait is the journal. F8
+ * (wave-2, 2026-09-03) is what that costs: two lanes sat through a silent wait
+ * PAST the bound the CLI publishes, and the first thing either of them saw was
+ * the fixed-layout fallback line. One of them wrote it up as the CLI going
+ * quiet and overrunning its own promise — it had not, but nothing on the
+ * terminal could say so.
+ *
+ * The journal heartbeat already carries everything a waiting reader needs, so
+ * this is a rate limiter over it rather than a second clock: the stage the
+ * service is in, how long this wait has run, the bound it is running against,
+ * and the conversion id that every recovery command takes.
+ */
+/** One line a minute. Frequent enough to read as alive, rare enough to skim. */
+export declare const IMPROVE_CONVERT_PROGRESS_INTERVAL_MS = 60000;
+export type ImproveConvertProgress = {
+    /** Feed it every journal heartbeat; it decides which ones are worth a line. */
+    heartbeat: (progress: RunJournalProgress) => void;
+    /** The hosted id, as soon as the conversion reports one. */
+    noteConversionId: (id: string) => void;
+    /** The newest elapsed the service reported, for the durable stall record. */
+    waitedSeconds: () => number | undefined;
+};
+export declare const createImproveConvertProgress: (args: {
+    /** What is being waited on, e.g. `responsive export`. */
+    label: string;
+    boundSeconds: number;
+    write: (line: string) => void;
+    now?: () => number;
+    intervalMs?: number;
+}) => ImproveConvertProgress;
+//# sourceMappingURL=improve-convert-progress.d.ts.map

package/dist/improve-convert-progress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"improve-convert-progress.d.ts","sourceRoot":"","sources":["../src/improve-convert-progress.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;;;;;;;;;;;;;GAeG;AAEH,gFAAgF;AAChF,eAAO,MAAM,oCAAoC,QAAS,CAAC;AAE3D,MAAM,MAAM,sBAAsB,GAAG;IACnC,+EAA+E;IAC/E,SAAS,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAClD,4DAA4D;IAC5D,gBAAgB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,6EAA6E;IAC7E,aAAa,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;CACzC,CAAC;AAIF,eAAO,MAAM,4BAA4B,GAAI,MAAM;IACjD,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,KAAG,sBAsBH,CAAC"}

package/dist/improve-convert-progress.js

@@ -0,0 +1,43 @@
+import { formatDuration } from './cli-progress.js';
+/**
+ * A visible tick while the convert stage waits on hosted work.
+ *
+ * The convert stage runs `12ui convert` with `quiet: true`, so its own progress
+ * stream is suppressed and the only record of the wait is the journal. F8
+ * (wave-2, 2026-09-03) is what that costs: two lanes sat through a silent wait
+ * PAST the bound the CLI publishes, and the first thing either of them saw was
+ * the fixed-layout fallback line. One of them wrote it up as the CLI going
+ * quiet and overrunning its own promise — it had not, but nothing on the
+ * terminal could say so.
+ *
+ * The journal heartbeat already carries everything a waiting reader needs, so
+ * this is a rate limiter over it rather than a second clock: the stage the
+ * service is in, how long this wait has run, the bound it is running against,
+ * and the conversion id that every recovery command takes.
+ */
+/** One line a minute. Frequent enough to read as alive, rare enough to skim. */
+export const IMPROVE_CONVERT_PROGRESS_INTERVAL_MS = 60_000;
+const stageWords = (stage) => stage.replace(/_/gu, ' ');
+export const createImproveConvertProgress = (args) => {
+    const now = args.now ?? Date.now;
+    const intervalMs = args.intervalMs ?? IMPROVE_CONVERT_PROGRESS_INTERVAL_MS;
+    const startedAt = now();
+    let lastLineAt = startedAt;
+    let conversionId;
+    let elapsed;
+    return {
+        noteConversionId: (id) => { conversionId = id; },
+        waitedSeconds: () => elapsed,
+        heartbeat: (progress) => {
+            elapsed = progress.elapsedSeconds;
+            if (now() - lastLineAt < intervalMs)
+                return;
+            lastLineAt = now();
+            args.write(`[wait] ${args.label}: ${formatDuration(progress.elapsedSeconds)} elapsed`
+                + `, bound ${formatDuration(args.boundSeconds)}`
+                + `; conversion ${conversionId ?? 'not reported yet'}`
+                + (progress.stage ? `; stage ${stageWords(progress.stage)}` : ''));
+        },
+    };
+};
+//# sourceMappingURL=improve-convert-progress.js.map

package/dist/improve-convert-progress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"improve-convert-progress.js","sourceRoot":"","sources":["../src/improve-convert-progress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD;;;;;;;;;;;;;;;GAeG;AAEH,gFAAgF;AAChF,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CAAC;AAW3D,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,IAO5C,EAA0B,EAAE;IAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACjC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,oCAAoC,CAAC;IAC3E,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC;IACxB,IAAI,UAAU,GAAG,SAAS,CAAC;IAC3B,IAAI,YAAgC,CAAC;IACrC,IAAI,OAA2B,CAAC;IAChC,OAAO;QACL,gBAAgB,EAAE,CAAC,EAAU,EAAQ,EAAE,GAAG,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9D,aAAa,EAAE,GAAuB,EAAE,CAAC,OAAO;QAChD,SAAS,EAAE,CAAC,QAA4B,EAAQ,EAAE;YAChD,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC;YAClC,IAAI,GAAG,EAAE,GAAG,UAAU,GAAG,UAAU;gBAAE,OAAO;YAC5C,UAAU,GAAG,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CACR,UAAU,IAAI,CAAC,KAAK,KAAK,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU;kBACxE,WAAW,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;kBAC9C,gBAAgB,YAAY,IAAI,kBAAkB,EAAE;kBACpD,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAClE,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}