@neta-art/cohub-cli 1.8.0 → 1.9.0

package/README.md

@@ -142,6 +142,12 @@ cohub generate "restyle this image" \
   --image ./input.png \
   --param size=1024x1024 \
   --json
+
+cohub generate "a calm lake" \
+  --model <model> \
+  --async
+
+cohub tasks get <taskRunId> --json
 ```
 
 Supported inputs:

package/dist/commands/generations.js

@@ -48,8 +48,8 @@ async function contentFromPathOrUrl(type, value) {
     if (/^https?:\/\//.test(value))
         return { type, source: { type: "url", url: value } };
     const data = await readFile(value);
-    const media_type = mimeByExt[extname(value).toLowerCase()] ?? "application/octet-stream";
-    return { type, source: { type: "base64", media_type, data: data.toString("base64") } };
+    const mediaType = mimeByExt[extname(value).toLowerCase()] ?? "application/octet-stream";
+    return { type, source: { type: "base64", mediaType, data: data.toString("base64") } };
 }
 async function saveOutputs(output, outputPath) {
     const outputs = output.filter((block) => block.type === "text" || block.type === "image" || block.type === "video" || block.type === "audio");
@@ -72,7 +72,7 @@ async function saveOutputs(output, outputPath) {
             continue;
         }
         const source = block.source;
-        const target = isDir ? join(outputPath, outputName(block.type, source.type === "url" ? source.url : undefined, i)) : outputPath;
+        const target = isDir ? join(outputPath, outputName(block, source.type === "url" ? source.url : undefined, i)) : outputPath;
         if (source.type === "url") {
             const response = await fetch(source.url);
             if (!response.ok)
@@ -80,35 +80,69 @@ async function saveOutputs(output, outputPath) {
             await writeFile(target, Buffer.from(await response.arrayBuffer()));
             savedPaths.push(target);
         }
-        else if (source.type === "base64") {
+        else {
             await writeFile(target, Buffer.from(source.data, "base64"));
             savedPaths.push(target);
         }
-        else {
-            throw new Error(`Cannot save space file output locally: ${source.space_id}:${source.path}`);
-        }
     }
     return savedPaths;
 }
-function outputName(type, url, index) {
+function outputName(block, url, index) {
     const fromUrl = url ? basename(new URL(url).pathname) : "";
+    const label = slugOutputLabel(block);
     if (fromUrl?.includes("."))
-        return `generation-${index + 1}-${fromUrl}`;
-    const ext = type === "video" ? "mp4" : type === "audio" ? "bin" : "png";
-    return `generation-${index + 1}.${ext}`;
+        return `generation-${index + 1}-${label}-${fromUrl}`;
+    const ext = block.type === "video" ? "mp4" : block.type === "audio" ? "bin" : block.type === "text" ? "txt" : "png";
+    return `generation-${index + 1}-${label}.${ext}`;
+}
+function metaRole(block) {
+    const role = block.meta?.role;
+    return typeof role === "string" && role.length > 0 ? role : undefined;
+}
+function humanizeRole(role) {
+    return role.replaceAll("_", " ").replaceAll("-", " ");
+}
+function slugify(value) {
+    return value.toLowerCase().replaceAll(/[^a-z0-9]+/g, "-").replaceAll(/^-|-$/g, "") || "output";
+}
+function formatOutputLabel(block) {
+    const role = metaRole(block);
+    if (!role)
+        return block.type;
+    const label = humanizeRole(role);
+    return block.type === "image" && ["first_frame", "last_frame", "reference_image"].includes(role)
+        ? label
+        : `${block.type} (role: ${role})`;
+}
+function slugOutputLabel(block) {
+    return slugify(metaRole(block) ?? block.type);
 }
 function printGeneration(output) {
     for (const block of output) {
-        if (block.type === "text")
+        if (block.type === "text") {
             console.log(block.text);
-        else if (block.source.type === "url")
-            console.log(`${block.type}: ${block.source.url}`);
-        else if (block.source.type === "base64")
-            console.log(`${block.type}: base64 ${block.source.media_type} (${block.source.data.length} chars)`);
-        else
-            console.log(`${block.type}: ${block.source.space_id}:${block.source.path}`);
+        }
+        else if (block.source.type === "url") {
+            console.log(`${formatOutputLabel(block)}: ${block.source.url}`);
+        }
+        else {
+            console.log(`${formatOutputLabel(block)}: base64 ${block.source.mediaType} (${block.source.data.length} chars)`);
+        }
     }
 }
+function resumeHint(taskRunId) {
+    return `Use \`cohub tasks get ${taskRunId} --json\` to inspect the task later.`;
+}
+function formatElapsed(ms) {
+    if (ms < 1000)
+        return `${ms}ms`;
+    const seconds = Math.floor(ms / 1000);
+    if (seconds < 60)
+        return `${seconds}s`;
+    const minutes = Math.floor(seconds / 60);
+    const restSeconds = seconds % 60;
+    return restSeconds > 0 ? `${minutes}m ${restSeconds}s` : `${minutes}m`;
+}
 function parseTimeoutMs(value) {
     if (!value)
         return undefined;
@@ -161,16 +195,25 @@ Examples:
             if (opts.async) {
                 if (jsonRequested(opts))
                     return outJson(created);
-                return ok(`Generation queued — taskRunId: ${created.taskRunId}`);
+                return ok(`Generation queued — task ID: ${created.taskRunId}\n    ${resumeHint(created.taskRunId)}`);
             }
             const spin = spinner();
-            if (!jsonRequested(opts))
-                spin.start("Generating");
+            let pollCount = 0;
+            const waitStartedAt = Date.now();
+            if (!jsonRequested(opts)) {
+                process.stderr.write(`  Generation queued — task ID: ${created.taskRunId}\n`);
+                process.stderr.write(`  ${resumeHint(created.taskRunId)}\n`);
+                spin.start("Generating...");
+            }
             const result = await client.generations.wait(created.taskRunId, {
                 timeoutMs: parseTimeoutMs(opts.timeoutMs),
+                onPoll: () => {
+                    pollCount += 1;
+                    spin.update(`Generating... ${formatElapsed(Date.now() - waitStartedAt)}, ${pollCount} polls`);
+                },
             });
             if (!jsonRequested(opts))
-                spin.stop("Generation completed");
+                spin.stop(`Generation completed — task ID: ${created.taskRunId}, ${formatElapsed(Date.now() - waitStartedAt)}, ${pollCount} polls`);
             const savedPaths = opts.output ? await saveOutputs(result.output, opts.output) : [];
             if (jsonRequested(opts))
                 return outJson(savedPaths.length > 0 ? { ...result, taskRunId: created.taskRunId, savedPaths } : { ...result, taskRunId: created.taskRunId });

package/dist/output.d.ts

@@ -12,5 +12,6 @@ export declare function error(msg: string, detail?: string): never;
 export declare function handleHttp(e: unknown): never;
 export declare function spinner(): {
     start(msg: string): void;
+    update(msg: string): void;
     stop(msg: string): void;
 };

package/dist/output.js

@@ -73,6 +73,18 @@ function debugErrorMetaFromBody(body) {
         items.push(`traceId: ${errorBody.traceId}`);
     return items;
 }
+function fetchFailureDetail(e) {
+    if (!(e instanceof Error) || e.message !== "fetch failed")
+        return null;
+    const cause = e.cause;
+    const code = typeof cause?.code === "string" ? cause.code : null;
+    const hostname = typeof cause?.hostname === "string" ? cause.hostname : null;
+    const message = typeof cause?.message === "string" ? cause.message : null;
+    const parts = [code, hostname && `host: ${hostname}`, message].filter(Boolean);
+    return parts.length > 0
+        ? `Network request failed (${parts.join(" · ")}). Check DNS/proxy/firewall settings and try again.`
+        : "Network request failed. Check DNS/proxy/firewall settings and try again.";
+}
 export function handleHttp(e) {
     if (e instanceof Error && e.name === "AuthRequiredError") {
         return error("not authenticated", "run `cohub auth login`");
@@ -80,32 +92,38 @@ export function handleHttp(e) {
     const status = e.status;
     const body = e.body;
     const message = errorMessageFromBody(body) ?? (e instanceof Error ? e.message : String(e));
+    const fetchDetail = fetchFailureDetail(e);
     const detailParts = [];
     if (process.env.COHUB_DEBUG_ERRORS) {
         if (status)
             detailParts.push(`HTTP ${status}`);
         detailParts.push(...debugErrorMetaFromBody(body));
     }
-    error(message, detailParts.length > 0 ? detailParts.join(" · ") : undefined);
+    error(message, detailParts.length > 0 ? detailParts.join(" · ") : fetchDetail ?? undefined);
 }
 // -- Spinner -----------------------------------------------------------------
 export function spinner() {
     let interval = null;
     const frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
     let i = 0;
+    let currentMsg = "";
     return {
         start(msg) {
+            currentMsg = msg;
             if (process.env.CI || !process.stderr.isTTY) {
-                process.stderr.write(`  ${msg}...\n`);
+                process.stderr.write(`  ${currentMsg}...\n`);
                 return;
             }
-            process.stderr.write(`  ${msg}  `);
+            process.stderr.write(`  ${currentMsg}  `);
             interval = setInterval(() => {
                 process.stderr.clearLine?.(0);
                 process.stderr.cursorTo?.(0);
-                process.stderr.write(`  ${frames[i++ % frames.length] ?? ""} ${msg}  `);
+                process.stderr.write(`  ${frames[i++ % frames.length] ?? ""} ${currentMsg}  `);
             }, 80);
         },
+        update(msg) {
+            currentMsg = msg;
+        },
         stop(msg) {
             if (interval)
                 clearInterval(interval);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neta-art/cohub-cli",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "CLI for Cohub — spaces, sessions, and agent collaboration.",
   "type": "module",
   "license": "UNLICENSED",
@@ -13,9 +13,10 @@
     "README.md"
   ],
   "dependencies": {
+    "@neta-art/generation": "^0.1.2",
     "commander": "^13.1.0",
     "sharp": "^0.34.5",
-    "@neta-art/cohub": "1.16.0"
+    "@neta-art/cohub": "1.16.1"
   },
   "publishConfig": {
     "access": "public"