@genex-ai/cli-demo 1.34.6-dev.713 → 1.34.6-dev.717

package/dist/index.js

@@ -9046,7 +9046,7 @@ async function reportGlassTerminal(view, outDir, log, json) {
     process.exitCode = 1;
   }
 }
-async function awaitAndReport(apiUrl, token, id, kind, log, open = false, json = false, local) {
+async function awaitAndReport(apiUrl, token, id, kind, log, open = false, json = false, local, bound) {
   if (!json) log.step(waitCopy(kind));
   const started = Date.now();
   const view = await waitForTerminalView(
@@ -9058,9 +9058,11 @@ async function awaitAndReport(apiUrl, token, id, kind, log, open = false, json =
     } : (p) => {
       const minutes = Math.floor((Date.now() - started) / 6e4);
       log.dim(`  ${p}%${minutes >= 1 ? `  (${minutes} min)` : ""}`);
-    }
+    },
+    bound?.timeoutMs
   );
   if (!view) {
+    if (bound) return bound.onExpiry();
     if (json) writeJson({ kind, id, status: "failed", error: "Timed out waiting for the generation." });
     else log.error("Timed out waiting for the generation.");
     process.exitCode = 1;
@@ -9088,11 +9090,18 @@ function waitCopy(kind) {
   }
 }
 async function waitForTerminalView(apiUrl, token, id, kind, onProgress = () => {
-}) {
-  const timeoutMs = waitTimeoutFor(kind);
+}, boundMs) {
+  const timeoutMs = boundMs ?? waitTimeoutFor(kind);
   const deadline = Date.now() + timeoutMs;
   const streamed = await waitViaSSE(apiUrl, token, id, onProgress, deadline);
-  return streamed === "unsupported" ? poll(apiUrl, token, id, onProgress, timeoutMs) : streamed;
+  if (streamed !== "unsupported") return streamed;
+  return poll(
+    apiUrl,
+    token,
+    id,
+    onProgress,
+    boundMs === void 0 ? timeoutMs : Math.max(0, deadline - Date.now())
+  );
 }
 async function reportTerminal(kind, view, log, open = false, json = false, local) {
   if (view.status !== "completed") {
@@ -9378,7 +9387,9 @@ async function poll(apiUrl, token, id, onProgress, timeoutMs) {
       }
     } catch {
     }
-    await sleep3(3e3);
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) break;
+    await sleep3(Math.min(3e3, remaining));
   }
   return null;
 }
@@ -9825,6 +9836,8 @@ async function runModelAnimate(opts) {
 
 // src/commands/wait.ts
 import path27 from "path";
+var MAX_TIMEOUT_SEC = 2e6;
+var STILL_RUNNING_EXIT = 2;
 var TERMINAL2 = /* @__PURE__ */ new Set(["completed", "failed"]);
 async function runWait(opts) {
   if (opts.all) return runWaitAll(opts);
@@ -9832,7 +9845,7 @@ async function runWait(opts) {
   const id = opts.id?.trim();
   if (!id) {
     log.error(
-      `Missing generation id. Usage: ${c.cyan("genex wait <id>")} \u2014 the id printed when you enqueued with --no-wait. For one status line per generation this project enqueued: ${c.cyan("genex wait --all")}.`
+      `Missing generation id. Usage: ${c.cyan("genex wait <id>")} \u2014 the id printed when you enqueued with --no-wait. Add ${c.cyan("--status")} for one snapshot instead of a wait, or ${c.cyan("--timeout <seconds>")} to bound the wait. For one status line per generation this project enqueued: ${c.cyan("genex wait --all")}.`
     );
     process.exitCode = 1;
     return;
@@ -9885,6 +9898,29 @@ async function runWait(opts) {
   log.plain(c.bold("genex wait"));
   log.dim(`  ${kind} ${id}`);
   log.plain("");
+  const rowFor = (v) => viewRow(v, {
+    id,
+    kind,
+    // A generation enqueued in some OTHER folder isn't in this ledger, so the
+    // kind stands in for the prompt — the same substitution the local
+    // delivery above makes.
+    prompt: ledgerEntry?.prompt || kind,
+    queuedAt: ledgerEntry?.queuedAt ?? ""
+  });
+  if (opts.status) {
+    const row = rowFor(view);
+    if (opts.json) {
+      writeJson(row);
+    } else {
+      printStatusRow(row, log);
+      log.plain("");
+      log.dim(
+        view.status === "failed" ? `  It failed \u2014 there is nothing to collect. See why with: ${c.cyan(`npx genex wait ${id}`)}` : TERMINAL2.has(view.status) ? `  Pick the asset up (URLs, and the files in a Genex Tools workspace) with: ${c.cyan(`npx genex wait ${id}`)}` : `  Still running server-side. Block until it lands with ${c.cyan(`npx genex wait ${id}`)}, or bound that with ${c.cyan("--timeout <seconds>")}.`
+      );
+    }
+    if (!TERMINAL2.has(view.status)) process.exitCode = STILL_RUNNING_EXIT;
+    return;
+  }
   if (TERMINAL2.has(view.status)) {
     await reportTerminal(kind, view, log, opts.open, opts.json, local);
     return;
@@ -9898,8 +9934,51 @@ async function runWait(opts) {
       `  \u23F3 Motion batches take several minutes server-side (each clip is its own job; a 16-clip walk + run set ten or more) \u2014 you don't have to sit here. Keep building and check back with ${c.cyan("genex wait --all")}.`
     );
   }
+  if (opts.timeoutSec !== void 0) {
+    const seconds = Math.min(opts.timeoutSec, MAX_TIMEOUT_SEC);
+    const startedAt = Date.now();
+    await awaitAndReport(apiUrl, token, id, kind, log, opts.open, opts.json, local, {
+      timeoutMs: seconds * 1e3,
+      onExpiry: () => reportStillRunning(apiUrl, token, id, kind, view, rowFor, log, opts, local, seconds, startedAt)
+    });
+    return;
+  }
   await awaitAndReport(apiUrl, token, id, kind, log, opts.open, opts.json, local);
 }
+async function reportStillRunning(apiUrl, token, id, kind, lastKnown, rowFor, log, opts, local, seconds, startedAt) {
+  const view = await peekGeneration(apiUrl, token, id) ?? lastKnown;
+  if (TERMINAL2.has(view.status)) {
+    await reportTerminal(kind, view, log, opts.open, opts.json, local);
+    return;
+  }
+  const row = rowFor(view);
+  if (opts.json) {
+    writeJson({ ...row, timedOut: true });
+  } else {
+    printStatusRow(row, log);
+    log.plain("");
+    const waited = Math.max(0, Date.now() - startedAt) / 1e3;
+    const shown = waited < 10 ? waited.toFixed(1) : Math.round(waited).toString();
+    log.warn(
+      `Stopped waiting after ${shown}s (ceiling ${seconds}s) \u2014 ${c.bold("the generation is STILL RUNNING")} server-side. Nothing was cancelled, and nothing extra was billed.`
+    );
+    log.dim(`  Resume waiting:           ${c.cyan(`npx genex wait ${id}`)}`);
+    log.dim(`  One snapshot, no waiting: ${c.cyan(`npx genex wait ${id} --status`)}`);
+  }
+  process.exitCode = STILL_RUNNING_EXIT;
+}
+async function peekGeneration(apiUrl, token, id) {
+  try {
+    const res = await apiFetch(`${apiUrl}/api/generations/${id}`, {
+      headers: { Authorization: `Bearer ${token}` }
+    });
+    if (!res.ok) return null;
+    const { generation } = await res.json();
+    return generation;
+  } catch {
+    return null;
+  }
+}
 async function runWaitAll(opts) {
   const log = createLogger({ quiet: opts.quiet || opts.json });
   const cwd = opts.cwd ?? process.cwd();
@@ -9980,20 +10059,7 @@ async function runWaitAll(opts) {
   }
   log.plain(c.bold("genex wait --all"));
   log.plain("");
-  for (const r of rows) {
-    const mark = r.partial ? c.yellow("\u26A0") : r.status === "done" ? c.green("\u2713") : r.status === "failed" ? c.red("\u2717") : c.yellow("\u2026");
-    const label = r.status === "running" && typeof r.progress === "number" ? `running ${r.progress}%` : r.partial ? "partial" : r.status;
-    log.plain(`  ${mark} ${label.padEnd(12)} ${r.kind.padEnd(8)} ${r.id}  ${c.dim(`"${r.prompt.slice(0, 56)}"`)}`);
-    if (r.partial) {
-      log.plain(
-        `      ${c.yellow(`${r.partial.installed} of ${r.partial.requested} clips landed`)} \u2014 missing: ${r.partial.failed.join(", ")}. ${c.dim(`genex wait ${r.id}`)} names the fix.`
-      );
-    }
-    if (r.status === "failed" && r.error) {
-      for (const line of describeGenerationFailure(r.kind, r.error).lines) log.plain(`      ${line}`);
-    }
-    if (r.status === "done" && r.mocked) log.dim(`      ${MOCKED_LINE}`);
-  }
+  for (const r of rows) printStatusRow(r, log);
   const count = (s) => rows.filter((r) => r.status === s).length;
   const partial = rows.filter((r) => r.partial).length;
   const billingFailed = rows.filter(
@@ -10037,6 +10103,39 @@ async function runWaitAll(opts) {
     mode === "tools" || mode === "remix" ? "  \u{1F4DC} Resumed or compacted? Re-read AGENTS.md before building on." : "  \u{1F4DC} Resumed or compacted? Re-read AGENTS.md + DESIGN.md (continue from its Now: line) before building on."
   );
 }
+function printStatusRow(r, log) {
+  const mark = r.partial ? c.yellow("\u26A0") : r.status === "done" ? c.green("\u2713") : r.status === "failed" ? c.red("\u2717") : c.yellow("\u2026");
+  const label = r.status === "running" && typeof r.progress === "number" ? `running ${r.progress}%` : r.partial ? "partial" : r.status;
+  log.plain(`  ${mark} ${label.padEnd(12)} ${r.kind.padEnd(8)} ${r.id}  ${c.dim(`"${r.prompt.slice(0, 56)}"`)}`);
+  if (r.partial) {
+    log.plain(
+      `      ${c.yellow(`${r.partial.installed} of ${r.partial.requested} clips landed`)} \u2014 missing: ${r.partial.failed.join(", ")}. ${c.dim(`genex wait ${r.id}`)} names the fix.`
+    );
+  }
+  if (r.status === "failed" && r.error) {
+    for (const line of describeGenerationFailure(r.kind, r.error).lines) log.plain(`      ${line}`);
+  }
+  if (r.status === "done" && r.mocked) log.dim(`      ${MOCKED_LINE}`);
+}
+function viewRow(v, base) {
+  switch (v.status) {
+    case "completed": {
+      const batch = motionBatchOutcome(v);
+      return {
+        ...base,
+        status: "done",
+        ...v.mocked === true ? { mocked: true } : {},
+        ...batch?.partial ? { partial: { installed: batch.installed, requested: batch.requested, failed: batch.failures.map((f) => f.clip) } } : {}
+      };
+    }
+    case "failed":
+      return { ...base, status: "failed", error: v.error };
+    case "processing":
+      return { ...base, status: "running", progress: v.progress };
+    default:
+      return { ...base, status: "queued" };
+  }
+}
 async function toRow(e, v, cwd) {
   const base = { id: e.id, kind: e.kind, prompt: e.prompt, queuedAt: e.queuedAt };
   if (v) {
@@ -10049,23 +10148,7 @@ async function toRow(e, v, cwd) {
       ).catch(() => {
       });
     }
-    switch (v.status) {
-      case "completed": {
-        const batch = motionBatchOutcome(v);
-        return {
-          ...base,
-          status: "done",
-          ...v.mocked === true ? { mocked: true } : {},
-          ...batch?.partial ? { partial: { installed: batch.installed, requested: batch.requested, failed: batch.failures.map((f) => f.clip) } } : {}
-        };
-      }
-      case "failed":
-        return { ...base, status: "failed", error: v.error };
-      case "processing":
-        return { ...base, status: "running", progress: v.progress };
-      default:
-        return { ...base, status: "queued" };
-    }
+    return viewRow(v, base);
   }
   return { ...base, status: e.status === "completed" ? "done" : e.status === "failed" ? "failed" : "queued" };
 }
@@ -23931,6 +24014,12 @@ ${c.bold("Usage")}
   genex wait <id>                    Attach to a generation enqueued with --no-wait and
                                      print its asset URL(s) when it finishes. Safe to
                                      re-run \u2014 it never creates a new generation.
+                                     --timeout <seconds> stops waiting at that ceiling:
+                                     the generation keeps running, and you get its
+                                     current row, the resume command, and exit 2.
+                                     --status takes ONE snapshot instead of waiting at
+                                     all \u2014 exit 0 if it finished, 2 if it is still going.
+                                     Full page: genex wait --help.
   genex wait --all                   One status line per generation this project has
                                      enqueued (done/running/queued/failed) \u2014 a single
                                      API refresh, never blocks, never bills.
@@ -24298,6 +24387,8 @@ ${c.bold("Workflow")}
                                      --user-approved raises it (player's say-so first).
   genex wait <id>                    Pick up a generation enqueued with --no-wait.
                                      Never bills \u2014 re-running a generate command does.
+                                     --timeout <seconds> bounds the wait (it keeps
+                                     running; exit 2); --status is one snapshot and out.
   genex wait --all                   One status line per generation from this folder.
   genex auth [--force]               Connect this machine (or switch accounts).
   genex tools                        Re-run setup here (refresh skills + rules).
@@ -24486,6 +24577,46 @@ ${c.bold("Content filter")}
   a body) as body horror \u2014 describe the object or machine instead: "a
   statue-like figure threaded into the wall" passes where "cables entering her
   spine" fails. Rejections are never retryable; reword and re-run.
+`,
+  wait: `${c.bold("genex wait")} \u2014 attach to a generation already running, or just ask how it is doing.
+
+${c.bold("Usage")}
+  genex wait <id>                    Block until it finishes, then print its asset URL(s)
+                                     (and save the files, in a Genex Tools workspace).
+                                     Never creates and never bills a generation \u2014 safe
+                                     to re-run.
+  genex wait <id> --timeout <secs>   The same wait, with a ceiling. On expiry it prints
+                                     the generation's current row, says it is STILL
+                                     RUNNING server-side, prints the command that resumes
+                                     the wait, and exits 2. Nothing is cancelled.
+  genex wait <id> --status           ONE snapshot and out \u2014 no polling, no sleeping.
+                                     Prints the same row. Exits 0 if the generation is
+                                     terminal (completed OR failed), 2 if it is still
+                                     running. Reach for this instead of hand-polling.
+  genex wait --all                   One status line per generation this folder enqueued
+                                     \u2014 a single API refresh, never blocks, never bills.
+
+${c.bold("Exit codes")}
+  0   finished \u2014 or, with --status, terminal (completed OR failed)
+  1   something went wrong: unknown id, not authorized, unreachable API, or (without
+      --status) the generation itself failed
+  2   still running \u2014 you stopped waiting, or you only asked
+
+${c.bold("Flags")}
+  --status             Wins over --timeout: it is already a zero-wait mode, so the two
+                       together is not an error, it is --status. With --all it changes
+                       nothing \u2014 that surface never blocks either way.
+  --timeout <seconds>  Bounds a blocking wait only. Ignored by --status and by --all.
+  --json               One machine-readable object: the status row for --status and for a
+                       --timeout expiry (which adds "timedOut": true), the terminal
+                       result otherwise.
+  --open               Open the finished asset in your browser.
+  --out-dir <dir>      (Genex Tools) where the saved files land.  --no-download: URL only.
+
+${c.bold("Why --status exists")}
+  Without a bound this command blocks for the per-kind ceiling \u2014 up to 30 minutes on a
+  character stage. Callers hand-polled around that, and hand-polling loses every line
+  the wait path prints. Ask once, act on the answer, keep building.
 `
 };
 function parseArgs(argv) {
@@ -24740,6 +24871,9 @@ function parseArgs(argv) {
       case "--all":
         parsed.options.all = true;
         break;
+      case "--status":
+        parsed.options.status = true;
+        break;
       default: {
         if (needsValue.has(arg)) {
           const value = argv[i++];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genex-ai/cli-demo",
-  "version": "1.34.6-dev.713",
+  "version": "1.34.6-dev.717",
   "description": "Set up your project's agent workspace (.claude/.codex/.cursor in the game folder), authorize, create a game project, generate AI assets, and publish (genex CLI).",
   "type": "module",
   "bin": {