@12ui/design 0.2.27 → 0.2.29

package/dist/cli-detach.js

@@ -1,8 +1,9 @@
 import { spawn } from 'node:child_process';
 import { mkdir, open, readFile, stat } from 'node:fs/promises';
 import path from 'node:path';
+import { INTERNAL_DRAFT_WORKER_ENV } from './cli-draft-command.js';
 import { CliRefusal } from './cli-refusal.js';
-import { nextActionLine } from './cli-progress.js';
+import { createLongRunningProgress, nextActionLine, } from './cli-progress.js';
 /** How much of a refused worker's output to put in front of the caller. */
 const REFUSAL_LOG_LINES = 24;
 const readJson = async (file) => {
@@ -26,6 +27,12 @@ const delay = async (milliseconds) => (new Promise((resolve) => { setTimeout(res
 export const spawnDetachedRun = async (args) => {
     const write = args.write ?? ((line) => { process.stderr.write(`${line}\n`); });
     const { work } = args;
+    const progress = args.progress ?? createLongRunningProgress({
+        label: work.label,
+        typicalSeconds: work.typicalSeconds,
+        write,
+    });
+    progress.update({ stage: 'background_start', detail: `output ${work.logFile}` });
     // The run directory does not exist yet on a first run: the worker creates it.
     await mkdir(path.dirname(work.logFile), { recursive: true });
     const logHandle = await open(work.logFile, 'a');
@@ -33,7 +40,7 @@ export const spawnDetachedRun = async (args) => {
         cwd: process.cwd(),
         detached: true,
         stdio: ['ignore', logHandle.fd, logHandle.fd],
-        env: process.env,
+        env: args.environment ?? process.env,
     });
     let exitCode = null;
     child.on('exit', (code) => { exitCode = code ?? 0; });
@@ -44,7 +51,10 @@ export const spawnDetachedRun = async (args) => {
     let started = false;
     while (Date.now() < deadline) {
         identity = await readJson(identityFile);
-        if (identity?.runId) {
+        const hosted = identity?.hosted && typeof identity.hosted === 'object'
+            ? identity.hosted
+            : null;
+        if (identity?.runId || hosted?.runId) {
             started = true;
             break;
         }
@@ -72,21 +82,40 @@ export const spawnDetachedRun = async (args) => {
         // first line would drop what was actually missing.
         const log = await readFile(work.logFile, 'utf8').catch(() => '');
         child.unref();
+        progress.finish('stopped', {
+            detail: log.trim().split('\n').slice(-1)[0]
+                || `${work.label} exited ${exitCode} before it started`,
+            next: `full worker log: ${work.logFile}`,
+        });
         throw new CliRefusal(log.trim().split('\n').slice(-REFUSAL_LOG_LINES).join('\n')
             || `${work.label} exited ${exitCode} before it started. Log: ${work.logFile}`, 'detached_worker_refused');
     }
     child.unref();
-    const runId = typeof identity?.runId === 'string' ? identity.runId : undefined;
+    const hosted = identity?.hosted && typeof identity.hosted === 'object'
+        ? identity.hosted
+        : null;
+    const runId = typeof identity?.runId === 'string'
+        ? identity.runId
+        : typeof hosted?.runId === 'string'
+            ? hosted.runId
+            : undefined;
     const nextAction = nextActionLine({
         what: `A ${work.label}`,
         typicalSeconds: work.typicalSeconds,
         statusCommand: work.statusCommand,
         waitHint: 'or re-run with --wait to block in this shell instead',
     });
-    write(`${work.label} started${runId ? ` (${runId})` : ''} in the background`
-        + `${child.pid ? `, pid ${child.pid}` : ''}. It keeps running after this command returns.`
-        + `\n${nextAction}`
-        + `\nOutput: ${work.logFile}`);
+    progress.finish('detached', {
+        detail: 'the run continues in a background worker; nothing settles in this shell',
+        artifacts: [
+            {
+                name: work.label,
+                state: `running detached${runId ? ` (run ${runId})` : ''}${child.pid ? `, pid ${child.pid}` : ''}`,
+            },
+            { name: 'worker log', state: 'streaming', path: work.logFile },
+        ],
+        next: `${work.statusCommand} reports progress; re-run with --wait to block instead`,
+    });
     return {
         detached: true,
         pid: child.pid ?? null,
@@ -102,28 +131,31 @@ export const detachBranchRun = async (args) => spawnDetachedRun({
     cliPath: args.cliPath,
     argv: args.argv,
     ...(args.spawnImpl ? { spawnImpl: args.spawnImpl } : {}),
+    ...(args.progress ? { progress: args.progress } : {}),
     work: {
-        label: 'branch run',
+        label: args.label ?? 'branch execute',
         startedFile: path.join(args.outDir, 'branch.attempt.json'),
         // The progress record carries the run id, which appears once the claim
         // lands (10-20s) — worth waiting for so the report names the run.
         identityFile: path.join(args.outDir, 'branch.progress.json'),
         logFile: path.join(args.outDir, 'branch.log'),
-        statusCommand: `12ui next ${args.outDir}`,
+        statusCommand: `12ui next ${args.statusTarget ?? args.outDir}`,
         typicalSeconds: args.typicalSeconds,
         startTimeoutMs: 40_000,
     },
 });
-/** `12ui image generate-batch` without `--wait`. */
-export const detachImageBatch = async (args) => spawnDetachedRun({
+/** `12ui draft` without `--wait`: the same command resumes its recorded hosted run. */
+export const detachDraftRun = async (args) => spawnDetachedRun({
     cliPath: args.cliPath,
-    argv: args.argv,
+    argv: [...args.argv, '--resume-run', args.prepared.runDir],
     ...(args.spawnImpl ? { spawnImpl: args.spawnImpl } : {}),
+    ...(args.progress ? { progress: args.progress } : {}),
+    environment: { ...process.env, [INTERNAL_DRAFT_WORKER_ENV]: '1' },
     work: {
-        label: 'image batch',
-        startedFile: `${args.manifestPath}.attempt.json`,
-        logFile: path.join(path.dirname(args.manifestPath), 'generate-batch.log'),
-        statusCommand: `12ui next ${args.manifestPath}`,
+        label: 'hosted draft',
+        startedFile: path.join(args.prepared.runDir, 'draft.dispatch.json'),
+        logFile: path.join(args.prepared.runDir, 'draft.log'),
+        statusCommand: `12ui next ${args.prepared.runDir}`,
         typicalSeconds: args.typicalSeconds,
         startTimeoutMs: 20_000,
     },

package/dist/cli-detach.js.map

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

package/dist/cli-draft-command.d.ts

@@ -1,88 +1,71 @@
+import { TwelveUiBranchClient, type BranchRunEnvelope } from './branch-client.js';
 import { type CliFlags } from './cli-arguments.js';
+import { type LongRunningProgressReporter } from './cli-progress.js';
 import { readConversionConfig } from './config.js';
 import { TwelveUiCorpusClient } from './corpus-client.js';
-/**
- * The route correction, printed once and before anything paid moves.
- *
- * MEASURED 2026-08-14: the two runs of a ten-run wave that built the wrong
- * thing both typed `--redesign-source <target>.png --mode reskin` while holding
- * the finished design they had been asked to BUILD. They did not skip the
- * existing-image route; they took the only one the skill named, and that route
- * redraws the image instead of converting it. The fact is in this command's own
- * argv, so the correction belongs here rather than in a skill sentence that
- * cannot reach an agent who has already decided.
- *
- * It is not a refusal: `--mode reskin` is a legitimate capability, and a run
- * that genuinely wants a redraw gets one. It is a named alternative, at the
- * only moment it is still free.
- */
+import { type DraftRecord } from './draft-workspace.js';
+/** `12ui draft` owns corpus retrieval, the hosted run, and local image materialization. */
+export declare const INTERNAL_DRAFT_WORKER_ENV = "TWELVE_UI_INTERNAL_DRAFT_WORKER";
 export declare const redesignRouteNotice: (source: string) => string;
 export type DraftPrepared = {
     runDir: string;
-    manifestPath: string;
+    recordPath: string;
+    runId: string;
     candidateCount: number;
-    /** True when this run continued an incomplete previous run in place. */
     adopted: boolean;
+    runKey: string;
+    record: DraftRecord;
     nextAction: string;
 };
-/**
- * Prepare the run: create the directory, buy one corpus search, write the
- * generation manifest. Dispatching the images is the caller's next move, so
- * this stays testable without a provider.
- */
-export declare const prepareDraftCommand: (flags: CliFlags, dependencies?: {
+type DraftCommandDependencies = {
     readConfig?: typeof readConversionConfig;
-    createClient?: (config: ReturnType<typeof readConversionConfig>) => TwelveUiCorpusClient;
+    createCorpusClient?: (config: ReturnType<typeof readConversionConfig>) => TwelveUiCorpusClient;
+    createHostedClient?: (config: ReturnType<typeof readConversionConfig>) => TwelveUiBranchClient;
     workspaceRoot?: string;
     write?: (line: string) => void;
-    /** Route corrections and other notices; stderr in production. */
     warn?: (line: string) => void;
-    /**
-     * The run directory, the moment it exists. `12ui draft` mints its own
-     * workspace, so nothing outside can name it beforehand — the run journal
-     * binds it here and flushes the start line it has been holding.
-     */
     onRunDirectory?: (runDir: string) => void;
-}) => Promise<DraftPrepared>;
+    environment?: NodeJS.ProcessEnv;
+    progress?: LongRunningProgressReporter;
+};
+/** Claim one corpus set and exactly one hosted run, then persist the resumable handle. */
+export declare const prepareDraftCommand: (flags: CliFlags, dependencies?: DraftCommandDependencies) => Promise<DraftPrepared>;
+export type DraftExecutionResult = {
+    prepared: DraftPrepared;
+    artifacts: string[];
+    detached?: {
+        logFile: string;
+    };
+};
+export declare const runDraftCommand: (flags: CliFlags, dependencies?: DraftCommandDependencies & {
+    hostedClient?: TwelveUiBranchClient;
+    sleep?: (milliseconds: number) => Promise<void>;
+    detach?: (prepared: DraftPrepared, progress: LongRunningProgressReporter) => Promise<{
+        logFile: string;
+    }>;
+}) => Promise<DraftExecutionResult>;
 export type DraftStatusReport = {
     runDir: string;
-    query?: string;
-    phase: 'searching' | 'generating' | 'ready' | 'selected';
+    runId: string;
+    query: string;
+    phase: 'generating' | 'materializing' | 'ready' | 'failed';
     complete: boolean;
+    elapsedSeconds?: number;
     candidates: {
         id: string;
+        slot: string;
         status: string;
         path: string;
     }[];
-    winner?: string;
     narrative: string;
-    nextAction?: string;
 };
-/**
- * The draft run's state, read and never printed here.
- *
- * `12ui draft status` was the most-typed of four spellings of "what now" — 18
- * invocations in one measured wave, `--json` on eight of them, a flag it never
- * read. `12ui next` replaced all four, so this is a reader the merge calls.
- */
-export declare const readDraftStatus: (runDirArgument: string) => Promise<DraftStatusReport>;
-export declare const draftBanner: (prepared: DraftPrepared) => string;
-export declare const draftDetachRequested: (flags: CliFlags) => boolean;
-/**
- * The whole explore step. Prepare (one paid corpus search), then hand the
- * generation to `image generate-batch` — detached by default, because an
- * agent's shell cannot hold 90 seconds and a cut dispatch reads as a failure.
- */
-export declare const runDraftCommand: (flags: CliFlags, dependencies: {
+export declare const readDraftStatus: (runDirArgument: string, flags?: CliFlags, dependencies?: {
     readConfig?: typeof readConversionConfig;
-    createClient?: (config: ReturnType<typeof readConversionConfig>) => TwelveUiCorpusClient;
-    workspaceRoot?: string;
-    write?: (line: string) => void;
-    onRunDirectory?: (runDir: string) => void;
-    /** Injected by the CLI entry: how the candidates actually get generated. */
-    generate: (args: {
-        manifestPath: string;
-        detach: boolean;
-    }) => Promise<unknown>;
-}) => Promise<DraftPrepared>;
+    hostedClient?: Pick<TwelveUiBranchClient, "getRun">;
+}) => Promise<DraftStatusReport>;
+export declare const readHostedRunStatus: (args: {
+    runId: string;
+    client: Pick<TwelveUiBranchClient, "getRun">;
+}) => Promise<BranchRunEnvelope>;
+export {};
 //# sourceMappingURL=cli-draft-command.d.ts.map

package/dist/cli-draft-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-draft-command.d.ts","sourceRoot":"","sources":["../src/cli-draft-command.ts"],"names":[],"mappings":"AAIA,OAAO,EAA2B,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAQ5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAkD1D;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,KAAG,MAGpD,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,wEAAwE;IACxE,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,QAAQ,EACf,eAAc;IACZ,UAAU,CAAC,EAAE,OAAO,oBAAoB,CAAC;IACzC,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,KAAK,oBAAoB,CAAC;IACzF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,iEAAiE;IACjE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC,KACL,OAAO,CAAC,aAAa,CA0EvB,CAAC;AAoBF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,WAAW,GAAG,YAAY,GAAG,OAAO,GAAG,UAAU,CAAC;IACzD,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,GAC1B,gBAAgB,MAAM,KACrB,OAAO,CAAC,iBAAiB,CA6E3B,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,UAAU,aAAa,KAAG,MAOrD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,OAAO,QAAQ,KAAG,OAAsC,CAAC;AAE9F;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,OAAO,QAAQ,EACf,cAAc;IACZ,UAAU,CAAC,EAAE,OAAO,oBAAoB,CAAC;IACzC,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,KAAK,oBAAoB,CAAC;IACzF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,4EAA4E;IAC5E,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACjF,KACA,OAAO,CAAC,aAAa,CASvB,CAAC"}
+{"version":3,"file":"cli-draft-command.d.ts","sourceRoot":"","sources":["../src/cli-draft-command.ts"],"names":[],"mappings":"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"}