@assethub/cli 0.1.31 → 0.1.33

package/dist/hooks/trim.js

@@ -1,4 +1,5 @@
-// Keep only the conversation from a Claude Code transcript before it is saved
+// Keep only the conversation from a Claude Code transcript (or a Codex rollout,
+// converted to the same shape) before it is saved
 // or uploaded: the artist's prompts, the agent's replies, its tool calls and
 // their results, and compaction summaries. Everything else Claude Code writes
 // to the file (skill, tool and agent listings, the system prompt, hook
@@ -85,9 +86,118 @@ export const trimTranscriptEntry = (entry) => {
         },
     };
 };
+/** Top-level record types of a Codex rollout (`~/.codex/sessions/.../rollout-*.jsonl`). */
+const CODEX_LINE_TYPES = new Set(['session_meta', 'response_item', 'event_msg', 'turn_context', 'compacted']);
+// Codex sends its context as user messages: AGENTS.md, and tagged blocks such
+// as <environment_context> or <user_instructions>. They are not the artist's words.
+const CODEX_CONTEXT_BLOCK = /<([A-Za-z][\w-]*(?:context|instructions|plugins))(?:\s[^>]*)?>[\s\S]*?<\/\1>\s*/g;
+const codexUserText = (text) => /^\s*# AGENTS\.md instructions/.test(text) ? '' : cleanText(text.replace(CODEX_CONTEXT_BLOCK, ''));
+const codexText = (content, blockType, clean) => (Array.isArray(content) ? content : [])
+    .map(block => (isObject(block) && block.type === blockType && typeof block.text === 'string' ? clean(block.text) : ''))
+    .filter(text => text.trim())
+    .join('\n');
+// An exec result is JSON text with timing and token bookkeeping around the
+// command's output; only the output is conversation.
+const codexOutputText = (text) => {
+    if (text.trimStart().startsWith('{')) {
+        try {
+            const parsed = JSON.parse(text);
+            if (isObject(parsed) && typeof parsed.output === 'string')
+                return parsed.output;
+        }
+        catch {
+            // plain text that happens to start with a brace
+        }
+    }
+    return text;
+};
+/** Tool output: a string, `{output}`, or a list of `{type, text}` items (images are dropped). */
+const codexToolOutput = (output) => {
+    if (typeof output === 'string')
+        return cleanText(codexOutputText(output));
+    if (Array.isArray(output))
+        return cleanText(output
+            .map(item => (isObject(item) && typeof item.text === 'string' ? codexOutputText(item.text) : ''))
+            .filter(Boolean)
+            .join('\n'));
+    if (isObject(output)) {
+        for (const key of ['output', 'content'])
+            if (typeof output[key] === 'string')
+                return cleanText(output[key]);
+    }
+    return output === undefined ? '' : JSON.stringify(output);
+};
+const codexArguments = (value) => {
+    if (typeof value !== 'string')
+        return value ?? {};
+    try {
+        return JSON.parse(value);
+    }
+    catch {
+        return { arguments: value };
+    }
+};
+const codexMessage = (type, timestamp, content) => ({
+    type,
+    ...(typeof timestamp === 'string' ? { timestamp } : {}),
+    message: { role: type, content },
+});
+/**
+ * One Codex rollout record as a conversation entry in the same shape as a
+ * trimmed Claude Code transcript, or undefined to drop it. Kept: the artist's
+ * prompts, the agent's replies, its tool calls and their output, and compaction
+ * summaries. Dropped: session metadata (base instructions, git, cwd), developer
+ * and context messages, reasoning, turn settings and the event stream, which
+ * repeats the messages.
+ */
+export const codexEntry = (entry) => {
+    if (!isObject(entry) || !isObject(entry.payload))
+        return undefined;
+    const { payload, timestamp } = entry;
+    if (entry.type === 'compacted')
+        return typeof payload.message === 'string' && payload.message.trim() ? { type: 'summary', summary: payload.message } : undefined;
+    if (entry.type !== 'response_item')
+        return undefined;
+    switch (payload.type) {
+        case 'message': {
+            if (payload.role === 'user') {
+                const text = codexText(payload.content, 'input_text', codexUserText).trim();
+                return text ? codexMessage('user', timestamp, text) : undefined;
+            }
+            if (payload.role !== 'assistant')
+                return undefined;
+            const text = codexText(payload.content, 'output_text', cleanText);
+            return text.trim() ? codexMessage('assistant', timestamp, [{ type: 'text', text }]) : undefined;
+        }
+        case 'function_call':
+        case 'custom_tool_call':
+        case 'local_shell_call': {
+            const id = typeof payload.call_id === 'string' ? payload.call_id : payload.id;
+            if (typeof id !== 'string')
+                return undefined;
+            const name = typeof payload.name === 'string' ? payload.name : payload.type === 'local_shell_call' ? 'shell' : 'unknown';
+            const input = payload.type === 'function_call'
+                ? codexArguments(payload.arguments)
+                : payload.type === 'custom_tool_call'
+                    ? { input: payload.input }
+                    : (payload.action ?? {});
+            return codexMessage('assistant', timestamp, [{ type: 'tool_use', id, name, input }]);
+        }
+        case 'function_call_output':
+        case 'custom_tool_call_output': {
+            if (typeof payload.call_id !== 'string')
+                return undefined;
+            return codexMessage('user', timestamp, [{ type: 'tool_result', tool_use_id: payload.call_id, content: codexToolOutput(payload.output) }]);
+        }
+        default:
+            // reasoning, web search and anything else that is not conversation
+            return undefined;
+    }
+};
 /**
- * Trim a JSONL transcript. A file that is not a Claude Code transcript (for
- * example a Codex rollout saved by hand) is returned unchanged.
+ * Trim a JSONL transcript: a Claude Code transcript, or a Codex rollout turned
+ * into the same conversation shape. A file in any other format is returned
+ * unchanged.
  */
 export const trimTranscript = (raw) => {
     const entries = raw
@@ -101,8 +211,10 @@ export const trimTranscript = (raw) => {
             return undefined;
         }
     });
-    if (!entries.some(entry => isObject(entry) && CLAUDE_LINE_TYPES.has(String(entry.type))))
+    const isClaude = entries.some(entry => isObject(entry) && CLAUDE_LINE_TYPES.has(String(entry.type)));
+    const isCodex = !isClaude && entries.some(entry => isObject(entry) && CODEX_LINE_TYPES.has(String(entry.type)) && isObject(entry.payload));
+    if (!isClaude && !isCodex)
         return raw;
-    const kept = entries.map(trimTranscriptEntry).filter((entry) => entry !== undefined);
+    const kept = entries.map(isCodex ? codexEntry : trimTranscriptEntry).filter((entry) => entry !== undefined);
     return kept.map(entry => `${JSON.stringify(entry)}\n`).join('');
 };

package/dist/hooks/types.d.ts

@@ -15,7 +15,7 @@ export type SessionImage = {
 export type SessionMeta = {
     sessionId: string;
     cwd: string;
-    client: 'claude';
+    client: HookClient;
     lastEvent: string;
     savedAt: string;
     canvasId?: string;

package/dist/hooks/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/hooks/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAA;AAE3C,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,gBAAgB,GAAG,UAAU,CAAA;AAEnE,MAAM,MAAM,YAAY,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAA;AAEvF,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,QAAQ,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,aAAa,CAAA;IACrB,MAAM,EAAE,YAAY,EAAE,CAAA;IACtB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,gGAAgG;IAChG,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,kEAAkE;IAClE,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,mEAAmE;IACnE,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,uFAAuF;IACvF,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iEAAiE;IACjE,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,8FAA8F;IAC9F,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,OAAO,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,sFAAsF;IACtF,SAAS,CAAC,EAAE,IAAI,CAAA;CACjB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/hooks/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAA;AAE3C,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,gBAAgB,GAAG,UAAU,CAAA;AAEnE,MAAM,MAAM,YAAY,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAA;AAEvF,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,UAAU,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,aAAa,CAAA;IACrB,MAAM,EAAE,YAAY,EAAE,CAAA;IACtB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,gGAAgG;IAChG,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,kEAAkE;IAClE,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,mEAAmE;IACnE,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,uFAAuF;IACvF,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iEAAiE;IACjE,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,8FAA8F;IAC9F,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,OAAO,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,sFAAsF;IACtF,SAAS,CAAC,EAAE,IAAI,CAAA;CACjB,CAAA"}

package/dist/hooks/upload.js

@@ -177,7 +177,7 @@ const uploadSessionUnlocked = async (sessionDir, options) => {
                     graphId: sessionGraphId(basename(sessionDir)),
                     rev,
                     description: `Agent session ${meta.sessionId}`,
-                    tags: ['session', 'agent:claude'],
+                    tags: ['session', `agent:${meta.client ?? 'claude'}`],
                     now: now(),
                 });
             }

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -13,7 +13,7 @@ import { downloadCanvas } from './canvasDownload.js';
 import { downloadCanvasGraphZip } from './canvasGraphDownload.js';
 import { executeNodeMeshBatch, resumeNodeMeshBatch, } from './nodeMeshBatch.js';
 import { writeCanvasComparison } from './canvasComparison.js';
-import { productionBatchLabels, readProductionBatch, runProductionBatch, } from './productionBatch.js';
+import { productionBatchImageName, productionBatchLabels, readProductionBatch, runProductionBatch, } from './productionBatch.js';
 import { importCanvasAssetWithState } from './canvasAssetImport.js';
 import { execFile, spawn } from 'node:child_process';
 import { createHash, randomUUID } from 'node:crypto';
@@ -27,7 +27,7 @@ import { promisify } from 'node:util';
 import { AssetHubApiError, WorkspaceClientError, createWorkspaceClient, createAssetHubClient, } from '@assethub/api-client';
 import { resolveCanvasSelection, saveCanvasSelection } from './canvas.js';
 import { activeExecution, CliExecutionError, executeRecorded, hasRecordedOperation, openExecutionSession, resumeRecorded, waitForExecution, } from './execution.js';
-import { runProgressLine } from './runProgress.js';
+import { batchReporter, runReporter } from './progressReport.js';
 import { buildRunUploadPlan, formatBytes } from './runsUpload/buildRunUpload.js';
 import { readGraphFolder } from './runsUpload/graphFolder.js';
 import { uploadRun } from './runsUpload/uploadRun.js';
@@ -2081,19 +2081,8 @@ const defaultWaitMs = (flags) => {
 const watchOptions = (flags) => ({
     intervalMs: parsePositiveIntegerFlag(flags, 'interval-ms', 5000),
     timeoutMs: parsePositiveIntegerFlag(flags, 'timeout-ms', defaultWaitMs(flags)),
-    onProgress: progressPrinter(run => `[run] ${run.runId} ${run.status}${run.progress ? ` · ${runProgressLine(run)}` : ''}`),
+    onProgress: runReporter({ write: text => stderr.write(text) }),
 });
-/** Prints a run's line only when it changed since the last poll. */
-const progressPrinter = (line) => {
-    let last = '';
-    return (run) => {
-        const next = line(run);
-        if (next === last)
-            return;
-        last = next;
-        stderr.write(`${next}\n`);
-    };
-};
 const readJsonArgument = async (value, flag) => {
     const text = value === '@-'
         ? await readStdin()
@@ -3673,10 +3662,29 @@ const commandProductionBatch = async (ctx) => {
     if (saved && requestedCanvasId != null && requestedCanvasId !== saved.canvasId)
         throw new Error(`Batch ${operationId} runs on canvas ${saved.canvasId}; drop --canvas or pass that canvas`);
     const session = await productionSession(ctx, 'production.analyze', saved?.canvasId ?? requestedCanvasId);
-    stderr.write(`[batch] ${operationId} · ${entries.length} run(s) on canvas ${session.canvas.id}. Rerun with --operation-id ${operationId} to resume.\n`);
     const wait = hasFlag(ctx.flags, 'wait');
     const concurrency = parsePositiveIntegerFlag(ctx.flags, 'concurrency', 2);
-    const printItem = (item) => stderr.write(`[batch] ${item.key} ${item.label} ${item.status}${item.runId ? ` ${item.runId}` : ''}${item.execution?.progress ? ` · ${runProgressLine(item.execution)}` : ''}${item.message ? ` · ${item.message}` : ''}\n`);
+    const report = batchReporter({
+        write: text => stderr.write(text),
+        operationId,
+        agent: partExtractorOptions.find(option => option.apiValue === options.agentVersion)
+            ?.publicName ?? String(options.agentVersion),
+        canvasId: session.canvas.id,
+        ...(wait ? { concurrency } : {}),
+        images: entries.map(entry => ({
+            key: entry.key,
+            imageIndex: entry.index,
+            repeat: entry.repeat,
+            name: productionBatchImageName(sources[entry.index]),
+        })),
+    });
+    report.header();
+    const printItem = (item) => report.item(item);
+    // A status table every 5 minutes while waiting; runs take about an hour.
+    const tableTimer = wait
+        ? setInterval(() => report.table('still running'), 5 * 60_000)
+        : undefined;
+    tableTimer?.unref();
     const result = await runProductionBatch(session, {
         operationId,
         request: { sources, repeat, options, agent, parentRunId },
@@ -3714,8 +3722,10 @@ const commandProductionBatch = async (ctx) => {
             }
             : {}),
     });
+    clearInterval(tableTimer);
     if (!wait)
         result.items.forEach(printItem);
+    report.table(!wait ? 'started' : result.timedOut ? 'stopped waiting' : 'done');
     const downloads = [];
     if (hasFlag(ctx.flags, 'download')) {
         const outDir = getFlag(ctx.flags, 'out-dir') ?? getFlag(ctx.flags, 'out');

package/dist/productionBatch.d.ts

@@ -52,6 +52,8 @@ export type ProductionBatchSource = {
  * two images must never share one. Files that share a name get their folder.
  */
 export declare const productionBatchLabels: (sources: readonly ProductionBatchSource[]) => string[];
+/** The image as the user named it, for progress lines: `image (28).png`. */
+export declare const productionBatchImageName: ({ flag, value }: ProductionBatchSource) => string;
 export declare const readProductionBatch: (stateDir: string, operationId: string) => Promise<ProductionBatchState | undefined>;
 export declare const runProductionBatch: (session: Session, options: {
     operationId: string;

package/dist/productionBatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"productionBatch.d.ts","sourceRoot":"","sources":["../src/productionBatch.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EAGtB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAAkB,eAAe,EAAC,MAAM,gBAAgB,CAAA;AAG/D,KAAK,OAAO,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;AAEpD,MAAM,MAAM,mBAAmB,GAAG;IAChC,GAAG,EAAE,MAAM,CAAA;IACX,8DAA8D;IAC9D,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,gEAAgE;IAChE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,mEAAmE;IACnE,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED;;;;GAIG;AACH,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,CAAC,CAAA;IACV,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,8DAA8D;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,mBAAmB,EAAE,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,8BAA8B;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,8DAA8D;IAC9D,MAAM,EAAE,SAAS,GAAG,YAAY,GAAG,UAAU,GAAG,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAA;IACpF,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,eAAe,CAAA;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,YAAY,CAAA;IACzC,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAKD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,SAAS,SAAS,qBAAqB,EAAE,KACxC,MAAM,EAuBR,CAAA;AASD,eAAO,MAAM,mBAAmB,GAC9B,UAAU,MAAM,EAChB,aAAa,MAAM,KAClB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAwB1C,CAAA;AAOD,eAAO,MAAM,kBAAkB,GAC7B,SAAS,OAAO,EAChB,SAAS;IACP,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,0EAA0E;IAC1E,UAAU,EAAE,MAAM,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAA;IAChD,KAAK,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACjC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,sFAAsF;IACtF,IAAI,CAAC,EAAE;QACL,WAAW,EAAE,MAAM,CAAA;QACnB,UAAU,EAAE,MAAM,CAAA;QAClB,SAAS,EAAE,MAAM,CAAA;QACjB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,yBAAyB,KAAK,IAAI,CAAA;KACvD,CAAA;CACF,KACA,OAAO,CAAC;IACT,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,yBAAyB,EAAE,CAAA;IAClC,QAAQ,EAAE,OAAO,CAAA;CAClB,CA2JA,CAAA"}
+{"version":3,"file":"productionBatch.d.ts","sourceRoot":"","sources":["../src/productionBatch.ts"],"names":[],"mappings":"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"}

package/dist/productionBatch.js

@@ -7,6 +7,16 @@ import { activeExecution, executeRecorded } from './execution.js';
 import { runProgressLine } from './runProgress.js';
 const stem = (path) => basename(path, extname(path));
 const safeLabel = (label) => label.replace(/[^\w.-]+/g, '_');
+/**
+ * A source URL's file name, or its host when the path has none. Never the whole
+ * URL: a signed URL carries its credentials in the query string, and this name
+ * is printed in progress lines and used as a download folder.
+ */
+const urlFileName = (value, strip = name => name) => {
+    const url = new URL(value);
+    const file = basename(url.pathname);
+    return file ? strip(file) : url.hostname;
+};
 /**
  * One distinct label per image: it names the order and the download folder, so
  * two images must never share one. Files that share a name get their folder.
@@ -15,7 +25,7 @@ export const productionBatchLabels = (sources) => {
     const base = sources.map(({ flag, value }) => flag === 'file'
         ? stem(value)
         : flag === 'source-url'
-            ? stem(new URL(value).pathname) || value
+            ? urlFileName(value, stem)
             : value);
     const count = (labels, label) => labels.filter(entry => entry === label).length;
     const withFolder = base.map((label, index) => {
@@ -30,6 +40,12 @@ export const productionBatchLabels = (sources) => {
         : label)
         .map(safeLabel);
 };
+/** The image as the user named it, for progress lines: `image (28).png`. */
+export const productionBatchImageName = ({ flag, value }) => flag === 'file'
+    ? basename(value)
+    : flag === 'source-url'
+        ? urlFileName(value)
+        : value;
 const uuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const statePath = (stateDir, operationId) => {
     if (!uuid.test(operationId))

package/dist/progressReport.d.ts

@@ -0,0 +1,42 @@
+import type { CanvasExecution } from '@assethub/api-client';
+import type { ProductionBatchItemResult } from './productionBatch.js';
+type Clock = () => Date;
+type Write = (text: string) => void;
+/** Where the run is: the summary with `Step 3 of 4` shortened to `3/4`. */
+export declare const stepText: (execution: CanvasExecution) => string;
+/**
+ * Why a run stopped, in plain words. The backend sends V4 findings as a
+ * Python-style list (`[{'code': ..., 'message': ...}]`); each becomes
+ * `message (code)`.
+ */
+export declare const failureText: (execution: CanvasExecution) => string;
+/** `runs watch`, `production analyze --wait` and friends: one run. */
+export declare const runReporter: ({ write, now, }: {
+    write: Write;
+    now?: Clock;
+}) => (execution: CanvasExecution) => void;
+export type BatchImage = {
+    key: string;
+    imageIndex: number;
+    repeat: number;
+    name: string;
+};
+/**
+ * `production batch`: a header naming each image by letter (A, B, …; `A#2`
+ * for the second repeat), a line per real change, and a status table.
+ */
+export declare const batchReporter: (options: {
+    write: Write;
+    now?: Clock;
+    operationId: string;
+    agent: string;
+    canvasId: number;
+    concurrency?: number;
+    images: BatchImage[];
+}) => {
+    header: () => void;
+    item: (result: ProductionBatchItemResult) => void;
+    table: (title: string) => void;
+};
+export {};
+//# sourceMappingURL=progressReport.d.ts.map

package/dist/progressReport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"progressReport.d.ts","sourceRoot":"","sources":["../src/progressReport.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAA;AAEzD,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,sBAAsB,CAAA;AAEnE,KAAK,KAAK,GAAG,MAAM,IAAI,CAAA;AACvB,KAAK,KAAK,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;AAqBnC,2EAA2E;AAC3E,eAAO,MAAM,QAAQ,GAAI,WAAW,eAAe,KAAG,MAGhC,CAAA;AAEtB;;;;GAIG;AACH,eAAO,MAAM,WAAW,GAAI,WAAW,eAAe,KAAG,MAMtD,CAAA;AAuFH,sEAAsE;AACtE,eAAO,MAAM,WAAW,GAAI,iBAGzB;IACD,KAAK,EAAE,KAAK,CAAA;IACZ,GAAG,CAAC,EAAE,KAAK,CAAA;CACZ,MAGS,WAAW,eAAe,SAanC,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS;IACrC,KAAK,EAAE,KAAK,CAAA;IACZ,GAAG,CAAC,EAAE,KAAK,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,UAAU,EAAE,CAAA;CACrB;;mBA2CuB,yBAAyB;mBAqDzB,MAAM;CAsC7B,CAAA"}

package/dist/progressReport.js

@@ -0,0 +1,201 @@
+// What `--wait` prints while runs work: one line per real change (a new step,
+// another mesh ready, a part kept with an issue, the end of the run), with the
+// local time, and for a batch the image's letter and file name. Part states
+// that flicker (drawing, checking, redoing) never print a line on their own.
+// A stopped run reports phase `done` and step 4 whatever stopped it, so where
+// it stopped is the last step seen while it worked.
+const stepNames = {
+    1: 'Planning the parts',
+    2: 'Making the base body',
+    3: 'Making the parts',
+    4: 'Assembling in Blender',
+};
+const pad2 = (value) => String(value).padStart(2, '0');
+const clockTime = (date) => `${pad2(date.getHours())}:${pad2(date.getMinutes())}`;
+const shortId = (id) => id.slice(0, 8);
+const duration = (ms) => {
+    const minutes = Math.max(0, Math.round(ms / 60_000));
+    return minutes < 60
+        ? `${minutes} min`
+        : `${Math.floor(minutes / 60)} h ${pad2(minutes % 60)} min`;
+};
+/** Where the run is: the summary with `Step 3 of 4` shortened to `3/4`. */
+export const stepText = (execution) => execution.progress
+    ? execution.progress.summary.replace(/^Step (\d+) of (\d+) · /, '$1/$2 ')
+    : execution.status;
+/**
+ * Why a run stopped, in plain words. The backend sends V4 findings as a
+ * Python-style list (`[{'code': ..., 'message': ...}]`); each becomes
+ * `message (code)`.
+ */
+export const failureText = (execution) => plainError(execution.error?.message ??
+    execution.progress?.outcome?.detail ??
+    execution.history.error ??
+    execution.status);
+const plainError = (message, code) => {
+    const findings = [...message.matchAll(/\{([^{}]*)\}/g)].flatMap(([, body]) => {
+        const field = (name) => new RegExp(`['"]${name}['"]:\\s*['"]([^'"]*)['"]`).exec(body)?.[1];
+        const text = field('message');
+        return text
+            ? [`${text}${field('code') ? ` (${field('code')})` : ''}`]
+            : [];
+    });
+    if (message.trim().startsWith('[') && findings.length)
+        return findings.join('; ');
+    return code ? `${message} (${code})` : message;
+};
+const isFailure = (status) => status === 'failed' || status === 'cancelled';
+const stoppedAt = (lastStep) => lastStep && stepNames[lastStep]
+    ? `at ${lastStep}/4 ${stepNames[lastStep]} · `
+    : '';
+const terminalText = (execution, status, lastStep) => {
+    if (isFailure(status)) {
+        return `✗ FAILED · ${stoppedAt(lastStep)}${failureText(execution)}`;
+    }
+    if (status === 'completed')
+        return `✓ done · ${stepText(execution)}`;
+    if (status === 'needs_review')
+        return `⚠ needs review · ${stepText(execution)}`;
+    return `⚠ ${status} · ${stepText(execution)}`;
+};
+const isTerminal = (status) => !['queued', 'running', 'dispatched'].includes(status);
+/** The step a still-working run is on, to say later where it stopped. */
+const workingStep = (execution, status) => !isTerminal(status) ? execution.progress?.step : undefined;
+/** Parts that became kept-with-an-issue or failed since the last report. */
+const newIssues = (previous, next) => {
+    const before = new Map(previous?.progress?.parts.map(part => [part.label, part.state]));
+    return (next.progress?.parts ?? [])
+        .filter(part => (part.state === 'kept' || part.state === 'failed') &&
+        before.get(part.label) !== part.state)
+        .map(part => `${part.state === 'kept' ? '⚠ kept with an issue' : '✗ part needs a person'}: ${part.label}${part.note ? ` · ${part.note}` : ''}`);
+};
+/**
+ * The lines one run's new receipt adds: its step or its end when either
+ * changed, then any part that newly needs attention. `status` is the batch
+ * item's status when it differs from the receipt's; `lastStep` the last step
+ * seen while the run worked.
+ */
+const changeLines = (previous, next, status = next.status, previousStatus = previous?.status, lastStep) => {
+    const text = isTerminal(status)
+        ? terminalText(next, status, lastStep)
+        : stepText(next);
+    const before = previous && previousStatus
+        ? isTerminal(previousStatus)
+            ? terminalText(previous, previousStatus)
+            : stepText(previous)
+        : undefined;
+    return [...(text !== before ? [text] : []), ...newIssues(previous, next)];
+};
+/** `runs watch`, `production analyze --wait` and friends: one run. */
+export const runReporter = ({ write, now = () => new Date(), }) => {
+    let last;
+    let lastStep;
+    return (execution) => {
+        const lines = changeLines(last, execution, execution.status, last?.status, lastStep);
+        last = execution;
+        lastStep = workingStep(execution, execution.status) ?? lastStep;
+        for (const line of lines)
+            write(`${clockTime(now())}  run ${shortId(execution.runId)}  ${line}\n`);
+    };
+};
+/**
+ * `production batch`: a header naming each image by letter (A, B, …; `A#2`
+ * for the second repeat), a line per real change, and a status table.
+ */
+export const batchReporter = (options) => {
+    const { write, images } = options;
+    const now = options.now ?? (() => new Date());
+    const repeats = images.some(image => image.repeat > 1);
+    const letter = (image) => `${image.imageIndex < 26 ? String.fromCharCode(65 + image.imageIndex) : image.imageIndex + 1}${repeats ? `#${image.repeat}` : ''}`;
+    const letterWidth = Math.max(...images.map(image => letter(image).length));
+    const nameWidth = Math.max(...images.map(image => image.name.length));
+    const who = (key) => {
+        const image = images.find(entry => entry.key === key);
+        return `${letter(image).padEnd(letterWidth)}  ${image.name.padEnd(nameWidth)}`;
+    };
+    const state = new Map();
+    const say = (key, line) => write(`${clockTime(now())}  ${who(key)}  ${line}\n`);
+    const header = () => {
+        const runs = `${images.length} run${images.length === 1 ? '' : 's'}${options.concurrency ? `, ${options.concurrency} at a time` : ''}`;
+        write([
+            `Batch ${shortId(options.operationId)} · ${options.agent} · ${runs} · canvas ${options.canvasId}`,
+            ...images
+                .filter(image => !repeats || image.repeat === 1)
+                .map(image => `  ${String.fromCharCode(65 + image.imageIndex).padEnd(1)}  ${image.name}`),
+            `  Resume with: --operation-id ${options.operationId}`,
+            '',
+            '',
+        ].join('\n'));
+    };
+    const item = (result) => {
+        const entry = state.get(result.key);
+        const previous = entry?.result;
+        const lines = [];
+        if (result.execution) {
+            if (!previous?.execution)
+                lines.push(isTerminal(result.status)
+                    ? terminalText(result.execution, result.status)
+                    : `started run ${shortId(result.execution.runId)} · ${stepText(result.execution)}`, ...newIssues(undefined, result.execution));
+            else
+                lines.push(...changeLines(previous.execution, result.execution, result.status, previous.status, entry?.lastStep));
+        }
+        else if (result.status === 'deferred') {
+            lines.push(`waiting for a free run slot · ${result.message ?? result.reason ?? ''}`);
+        }
+        else if (result.status === 'failed') {
+            lines.push(`✗ could not start · ${plainError(result.message ?? 'failed', result.code)}`);
+        }
+        const next = {
+            result,
+            startedAt: entry?.startedAt ??
+                (result.execution ? new Date(result.execution.createdAt) : undefined),
+            endedAt: entry?.endedAt ??
+                (result.execution && isTerminal(result.status) ? now() : undefined),
+            lastLine: entry?.lastLine,
+            lastStep: (result.execution && workingStep(result.execution, result.status)) ??
+                entry?.lastStep,
+        };
+        for (const line of lines) {
+            if (line === next.lastLine)
+                continue;
+            next.lastLine = line;
+            say(result.key, line);
+        }
+        state.set(result.key, next);
+    };
+    /** Every image's state now: printed every few minutes and at the end. */
+    const table = (title) => {
+        const rows = images.map(image => {
+            const entry = state.get(image.key);
+            const result = entry?.result;
+            const execution = result?.execution;
+            const [mark, detail] = !result
+                ? ['○ not started', '']
+                : execution
+                    ? isFailure(result.status)
+                        ? [
+                            '✗ failed',
+                            `${entry?.lastStep ? `at ${entry.lastStep}/4 · ` : ''}${failureText(execution)}`,
+                        ]
+                        : result.status === 'completed'
+                            ? ['✓ done', stepText(execution)]
+                            : isTerminal(result.status)
+                                ? [`⚠ ${result.status.replace('_', ' ')}`, stepText(execution)]
+                                : ['● running', stepText(execution)]
+                    : result.status === 'deferred'
+                        ? ['… waiting', result.message ?? result.reason ?? '']
+                        : result.status === 'failed'
+                            ? [
+                                '✗ failed',
+                                plainError(result.message ?? 'failed', result.code),
+                            ]
+                            : ['○ not started', ''];
+            const took = entry?.startedAt && !Number.isNaN(entry.startedAt.getTime())
+                ? `  ${duration((entry.endedAt ?? now()).getTime() - entry.startedAt.getTime())}`
+                : '';
+            return `  ${who(image.key)}  ${mark.padEnd(12)}${detail}${took}`;
+        });
+        write(['', `── ${clockTime(now())} · ${title} ──`, ...rows, '', ''].join('\n'));
+    };
+    return { header, item, table };
+};

package/dist/setupCommand.d.ts

@@ -53,6 +53,8 @@ type DoctorReport = {
 export type SetupDeps = {
     interactive: boolean;
     installHooks: InstallHooks;
+    /** Session saving is installed for this folder only. */
+    cwd: string;
     codexHome: string;
     now: () => Date;
     hasWorkingKey: () => Promise<boolean>;
@@ -108,6 +110,7 @@ export declare const runProcess: (file: string, args: string[]) => Promise<{
 export declare const defaultFileDeps: () => {
     platform: NodeJS.Platform;
     home: string;
+    cwd: string;
     codexHome: string;
     now: () => Date;
     findBinary: (name: string) => Promise<string | undefined>;

package/dist/setupCommand.d.ts.map

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