ima2-gen 1.1.20 → 1.1.21

package/node_modules/progrok/package.json

@@ -1,6 +1,6 @@
 {
   "name": "progrok",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Activate your xAI OAuth session as a local Grok API proxy and CLI tool surface.",
   "type": "module",
   "bin": {

package/node_modules/progrok/skills/progrok/SKILL.md

@@ -95,19 +95,48 @@ curl http://127.0.0.1:18645/v1/images/edits \
 ### Pattern 4: Video generation (async — poll)
 
 ```bash
-# Start: text-to-video, image-to-video (image), or reference-to-video (reference_images)
+# Text-to-video
+progrok video "Ocean waves crashing on rocks" --duration 8 --resolution 720p
+
+# Image-to-video
+progrok video "Animate this scene" --image photo.jpg --duration 10
+
+# Video editing (real V2V — modify existing video, keep motion)
+progrok video edit "Make the water glow neon blue" --video https://vidgen.x.ai/.../clip.mp4
+
+# Video extension (continue from last frame)
+progrok video extend "Camera slowly pulls back" --video https://vidgen.x.ai/.../clip.mp4 --duration 5
+```
+
+**API endpoints** (via proxy at 127.0.0.1:18645):
+```bash
+# Generate: POST /v1/videos/generations
 curl -s http://127.0.0.1:18645/v1/videos/generations \
   -H "Content-Type: application/json" \
   -d '{"model": "grok-imagine-video", "prompt": "Ocean waves", "duration": 8, "resolution": "720p"}'
 # → {"request_id": "abc-123"}
 
-# Poll until done
+# Edit (V2V): POST /v1/videos/edits — grok-imagine-video only
+curl -s http://127.0.0.1:18645/v1/videos/edits \
+  -H "Content-Type: application/json" \
+  -d '{"model": "grok-imagine-video", "prompt": "Add sunset colors", "video": {"url": "https://..."}}'
+
+# Extend: POST /v1/videos/extensions — grok-imagine-video only, 2-10s
+curl -s http://127.0.0.1:18645/v1/videos/extensions \
+  -H "Content-Type: application/json" \
+  -d '{"model": "grok-imagine-video", "prompt": "Continue scene", "duration": 5, "video": {"url": "https://..."}}'
+
+# Poll: GET /v1/videos/{request_id}
 curl http://127.0.0.1:18645/v1/videos/abc-123
-# → {"status": "pending", "progress": 45}
 # → {"status": "done", "video": {"url": "https://...", "duration": 8}}
 ```
 
-Also: `POST /v1/videos/edits` (edit a clip), `POST /v1/videos/extensions` (extend 1-10s).
+**Model constraints:**
+- `grok-imagine-video`: T2V, I2V, Ref2V, Edit, Extend — all modes
+- `grok-imagine-video-1.5-preview`: I2V, Ref2V only (no T2V, no Edit, no Extend)
+- Edit/Extend input: mp4, H.264/H.265/AV1, max 8.7s (edit) / 2-15s (extend)
+- Edit output inherits input duration/aspect/resolution (max 720p)
+- Extend duration: 2-10s added to original
 
 ### Pattern 5: Voice — TTS / STT (HTTP)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ima2-gen",
-  "version": "1.1.20",
+  "version": "1.1.21",
   "description": "Local OAuth image generation studio with classic and node workflows",
   "type": "module",
   "bin": {
@@ -71,7 +71,7 @@
     "express": "^5.1.0",
     "openai": "^5.8.2",
     "openai-oauth": "^1.0.2",
-    "progrok": "file:vendor/progrok-0.1.1.tgz",
+    "progrok": "file:vendor/progrok-0.2.0.tgz",
     "sharp": "^0.34.5",
     "trash": "^10.1.1",
     "ulid": "^3.0.2"

package/routes/index.js

@@ -19,6 +19,8 @@ import { registerPromptBuilderRoutes } from "./promptBuilder.js";
 import { registerAgentRoutes } from "./agent.js";
 import { registerGrokRoutes } from "./grok.js";
 import { registerVideoRoutes } from "./video.js";
+import { registerVideoExtendedRoutes } from "./videoExtended.js";
+import { registerQuotaRoutes } from "./quota.js";
 import { requireRuntimeContext } from "../lib/runtimeContext.js";
 export function configureRoutes(app, ctxRaw) {
     const ctx = requireRuntimeContext(ctxRaw);
@@ -44,4 +46,6 @@ export function configureRoutes(app, ctxRaw) {
     registerPromptImportRoutes(app, ctx);
     registerGrokRoutes(app, ctx);
     registerVideoRoutes(app, ctx);
+    registerVideoExtendedRoutes(app, ctx);
+    registerQuotaRoutes(app, ctx);
 }

package/routes/index.ts

@@ -20,6 +20,8 @@ import { registerPromptBuilderRoutes } from "./promptBuilder.js";
 import { registerAgentRoutes } from "./agent.js";
 import { registerGrokRoutes } from "./grok.js";
 import { registerVideoRoutes } from "./video.js";
+import { registerVideoExtendedRoutes } from "./videoExtended.js";
+import { registerQuotaRoutes } from "./quota.js";
 import { type RouteRuntimeContext, requireRuntimeContext } from "../lib/runtimeContext.js";
 
 export function configureRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
@@ -45,4 +47,6 @@ export function configureRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
   registerPromptImportRoutes(app, ctx);
   registerGrokRoutes(app, ctx);
   registerVideoRoutes(app, ctx);
+  registerVideoExtendedRoutes(app, ctx);
+  registerQuotaRoutes(app, ctx);
 }

package/routes/quota.js

@@ -0,0 +1,66 @@
+import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+function readCodexTokens() {
+    const codexHome = process.env.CODEX_HOME || join(homedir(), ".codex");
+    try {
+        const j = JSON.parse(readFileSync(join(codexHome, "auth.json"), "utf8"));
+        if (j?.tokens?.access_token) {
+            return { access_token: j.tokens.access_token, account_id: j.tokens.account_id ?? "" };
+        }
+    }
+    catch { }
+    return null;
+}
+async function fetchCodexUsage(tokens) {
+    try {
+        const resp = await fetch("https://chatgpt.com/backend-api/wham/usage", {
+            headers: {
+                Authorization: `Bearer ${tokens.access_token}`,
+                "ChatGPT-Account-Id": tokens.account_id,
+            },
+            signal: AbortSignal.timeout(8000),
+        });
+        if (!resp.ok) {
+            if (resp.status === 401 || resp.status === 403)
+                return { provider: "codex", authenticated: false, windows: [] };
+            return { provider: "codex", error: true, windows: [] };
+        }
+        const data = await resp.json();
+        const account = { email: data.email ?? null, plan: data.plan_type ?? null };
+        const windows = [];
+        if (data.rate_limit?.primary_window) {
+            windows.push({
+                label: "5h",
+                percent: Math.round(data.rate_limit.primary_window.used_percent ?? 0),
+                resetsAt: data.rate_limit.primary_window.reset_at
+                    ? new Date(data.rate_limit.primary_window.reset_at * 1000).toISOString()
+                    : null,
+            });
+        }
+        if (data.rate_limit?.secondary_window) {
+            windows.push({
+                label: "7d",
+                percent: Math.round(data.rate_limit.secondary_window.used_percent ?? 0),
+                resetsAt: data.rate_limit.secondary_window.reset_at
+                    ? new Date(data.rate_limit.secondary_window.reset_at * 1000).toISOString()
+                    : null,
+            });
+        }
+        return { provider: "codex", account, windows };
+    }
+    catch {
+        return { provider: "codex", error: true, windows: [] };
+    }
+}
+export function registerQuotaRoutes(app, _ctx) {
+    app.get("/api/quota", async (_req, res) => {
+        const tokens = readCodexTokens();
+        if (!tokens) {
+            res.json({ codex: { provider: "codex", authenticated: false, windows: [] } });
+            return;
+        }
+        const codex = await fetchCodexUsage(tokens);
+        res.json({ codex });
+    });
+}

package/routes/quota.ts

@@ -0,0 +1,89 @@
+import type { Express } from "express";
+import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import type { RouteRuntimeContext } from "../lib/runtimeContext.js";
+
+export interface QuotaWindow {
+  label: string;
+  percent: number;
+  resetsAt: string | null;
+}
+
+export interface QuotaResult {
+  provider: string;
+  account?: { email: string | null; plan: string | null } | null;
+  windows: QuotaWindow[];
+  error?: boolean;
+  authenticated?: boolean;
+}
+
+function readCodexTokens(): { access_token: string; account_id: string } | null {
+  const codexHome = process.env.CODEX_HOME || join(homedir(), ".codex");
+  try {
+    const j = JSON.parse(readFileSync(join(codexHome, "auth.json"), "utf8"));
+    if (j?.tokens?.access_token) {
+      return { access_token: j.tokens.access_token, account_id: j.tokens.account_id ?? "" };
+    }
+  } catch {}
+  return null;
+}
+
+async function fetchCodexUsage(tokens: { access_token: string; account_id: string }): Promise<QuotaResult> {
+  try {
+    const resp = await fetch("https://chatgpt.com/backend-api/wham/usage", {
+      headers: {
+        Authorization: `Bearer ${tokens.access_token}`,
+        "ChatGPT-Account-Id": tokens.account_id,
+      },
+      signal: AbortSignal.timeout(8000),
+    });
+    if (!resp.ok) {
+      if (resp.status === 401 || resp.status === 403) return { provider: "codex", authenticated: false, windows: [] };
+      return { provider: "codex", error: true, windows: [] };
+    }
+    const data = await resp.json() as {
+      email?: string | null;
+      plan_type?: string | null;
+      rate_limit?: {
+        primary_window?: { used_percent?: number; reset_at?: number };
+        secondary_window?: { used_percent?: number; reset_at?: number };
+      };
+    };
+    const account = { email: data.email ?? null, plan: data.plan_type ?? null };
+    const windows: QuotaWindow[] = [];
+    if (data.rate_limit?.primary_window) {
+      windows.push({
+        label: "5h",
+        percent: Math.round(data.rate_limit.primary_window.used_percent ?? 0),
+        resetsAt: data.rate_limit.primary_window.reset_at
+          ? new Date(data.rate_limit.primary_window.reset_at * 1000).toISOString()
+          : null,
+      });
+    }
+    if (data.rate_limit?.secondary_window) {
+      windows.push({
+        label: "7d",
+        percent: Math.round(data.rate_limit.secondary_window.used_percent ?? 0),
+        resetsAt: data.rate_limit.secondary_window.reset_at
+          ? new Date(data.rate_limit.secondary_window.reset_at * 1000).toISOString()
+          : null,
+      });
+    }
+    return { provider: "codex", account, windows };
+  } catch {
+    return { provider: "codex", error: true, windows: [] };
+  }
+}
+
+export function registerQuotaRoutes(app: Express, _ctx: RouteRuntimeContext) {
+  app.get("/api/quota", async (_req, res) => {
+    const tokens = readCodexTokens();
+    if (!tokens) {
+      res.json({ codex: { provider: "codex", authenticated: false, windows: [] } });
+      return;
+    }
+    const codex = await fetchCodexUsage(tokens);
+    res.json({ codex });
+  });
+}

package/routes/video.js

@@ -1,4 +1,4 @@
-import { mkdir, readFile, writeFile } from "fs/promises";
+import { mkdir, readFile, unlink, writeFile } from "fs/promises";
 import { join } from "path";
 import { randomBytes } from "crypto";
 import { startJob, finishJob, registerJobAbortController, isJobCanceled, setJobPhase } from "../lib/inflight.js";
@@ -7,6 +7,8 @@ import { logEvent, logError } from "../lib/logger.js";
 import { invalidateHistoryIndex } from "../lib/historyIndex.js";
 import { generateVideoViaGrok } from "../lib/grokVideoAdapter.js";
 import { getVideoSeriesChain } from "../lib/videoSeriesChain.js";
+import { ACTIVE_VIDEO_PROMPT_GUIDANCE, appendVideoContinuityEntry, lineageFromVideoMetadata, normalizeVideoContinuityLineage, readVideoSidecar, requireActiveVideoPrompt, safeGeneratedVideoFilename, } from "../lib/videoContinuity.js";
+import { extractGeneratedVideoFrameB64 } from "../lib/videoFrameExtract.js";
 import { normalizeGrokVideoModel, normalizeVideoResolution, normalizeVideoAspectRatio, normalizeVideoDuration, deriveVideoMode, clampVideoDuration, MAX_REF2V_REFERENCES, } from "../lib/imageModels.js";
 import { errInfo } from "../lib/errInfo.js";
 import { requireRuntimeContext } from "../lib/runtimeContext.js";
@@ -20,11 +22,24 @@ function toArray(v) {
 function isNormalizeError(x) {
     return typeof x === "object" && x !== null && typeof x.error === "string";
 }
+export async function saveGeneratedVideoArtifact(ctx, filename, buffer, metadata) {
+    const filePath = join(ctx.config.storage.generatedDir, filename);
+    await writeFile(filePath, buffer);
+    try {
+        await writeFile(`${filePath}.json`, JSON.stringify(metadata));
+    }
+    catch (err) {
+        await unlink(filePath).catch(() => { });
+        throw err;
+    }
+}
 async function resolveSourceImage(ctx, sourceImage, sourceFilename) {
     if (typeof sourceFilename === "string" && sourceFilename) {
         const safe = sourceFilename.replace(/^\/+/, "");
         if (safe.includes(".."))
             throw { status: 400, code: "GROK_VIDEO_INVALID_MODE", message: "invalid source filename" };
+        if (/\.mp4$/i.test(safe))
+            throw { status: 400, code: "GROK_VIDEO_INVALID_MODE", message: "use continueFromVideo for generated video continuation" };
         const buf = await readFile(join(ctx.config.storage.generatedDir, safe));
         return { b64: buf.toString("base64"), filename: safe };
     }
@@ -51,12 +66,12 @@ export function registerVideoRoutes(app, ctxRaw) {
         res.setHeader("Cache-Control", "no-cache, no-transform");
         res.setHeader("Connection", "keep-alive");
         res.flushHeaders?.();
-        const fail = (status, code, error) => {
+        const fail = (status, code, error, extra = {}) => {
             const httpStatus = status ?? 500;
             finishStatus = "error";
             finishHttpStatus = httpStatus;
             finishErrorCode = code;
-            sendSse(res, "error", { error, code, status: httpStatus, requestId });
+            sendSse(res, "error", { error, code, status: httpStatus, requestId, ...extra });
         };
         try {
             const { prompt, provider = "grok", model: rawModel } = req.body || {};
@@ -65,8 +80,9 @@ export function registerVideoRoutes(app, ctxRaw) {
             const topic = typeof req.body?.topic === "string" ? req.body.topic.trim() : "";
             if (provider !== "grok")
                 return fail(400, "VIDEO_PROVIDER_UNSUPPORTED", "video generation requires provider 'grok'");
-            if (typeof prompt !== "string" || !prompt.trim())
-                return fail(400, "PROMPT_REQUIRED", "Prompt is required");
+            const activePrompt = requireActiveVideoPrompt(prompt);
+            if (!activePrompt)
+                return fail(400, "PROMPT_REQUIRED", "Prompt is required", { guidance: ACTIVE_VIDEO_PROMPT_GUIDANCE });
             const modelCheck = normalizeGrokVideoModel(rawModel);
             if (isNormalizeError(modelCheck))
                 return fail(modelCheck.status, modelCheck.code, modelCheck.error);
@@ -80,6 +96,21 @@ export function registerVideoRoutes(app, ctxRaw) {
             if (isNormalizeError(aspectCheck))
                 return fail(aspectCheck.status, aspectCheck.code, aspectCheck.error);
             // Resolve reference inputs: base64 list + existing-file list + legacy single source.
+            let parentLineage = null;
+            let continueFromVideoFilename = null;
+            if (typeof req.body?.continueFromVideo === "string" && req.body.continueFromVideo.trim()) {
+                try {
+                    continueFromVideoFilename = safeGeneratedVideoFilename(req.body.continueFromVideo);
+                    const parentMeta = await readVideoSidecar(ctx.config.storage.generatedDir, continueFromVideoFilename);
+                    parentLineage = lineageFromVideoMetadata(continueFromVideoFilename, parentMeta);
+                }
+                catch (e) {
+                    return fail(e?.status || 400, "GROK_VIDEO_INVALID_MODE", e?.message || "invalid continuation video");
+                }
+            }
+            else {
+                parentLineage = normalizeVideoContinuityLineage(req.body?.continuityLineage);
+            }
             const refInputs = [
                 ...toArray(req.body?.referenceImages).map((image) => ({ image })),
                 ...toArray(req.body?.referenceFilenames).map((filename) => ({ filename })),
@@ -87,6 +118,14 @@ export function registerVideoRoutes(app, ctxRaw) {
                     ? [{ image: req.body?.sourceImage, filename: req.body?.sourceFilename }]
                     : []),
             ];
+            if (continueFromVideoFilename && !req.body?.sourceImage && !req.body?.sourceFilename) {
+                try {
+                    refInputs.push({ image: await extractGeneratedVideoFrameB64(ctx.config.storage.generatedDir, continueFromVideoFilename) });
+                }
+                catch (e) {
+                    return fail(e?.status || 500, "GROK_VIDEO_FRAME_FAILED", e?.message || "failed to extract continuation frame");
+                }
+            }
             let resolved;
             try {
                 const all = await Promise.all(refInputs.map((r) => resolveSourceImage(ctx, r.image, r.filename)));
@@ -105,7 +144,7 @@ export function registerVideoRoutes(app, ctxRaw) {
             startJob({
                 requestId,
                 kind: "video",
-                prompt,
+                prompt: activePrompt,
                 meta: { kind: "video", sessionId, clientNodeId, model: modelCheck.model, mode, duration, resolution: resolutionCheck.resolution },
             });
             registerJobAbortController(requestId, cancelController);
@@ -115,7 +154,13 @@ export function registerVideoRoutes(app, ctxRaw) {
             const onEvent = (ev) => {
                 if (ev.phase === "submitted") {
                     setJobPhase(requestId, "streaming");
-                    sendSse(res, "submitted", { requestId, xaiVideoRequestId: ev.xaiVideoRequestId });
+                    sendSse(res, "submitted", {
+                        requestId,
+                        xaiVideoRequestId: ev.xaiVideoRequestId,
+                        requestedModel: ev.requestedModel,
+                        effectiveModel: ev.effectiveModel,
+                        modelFallback: ev.modelFallback ?? null,
+                    });
                 }
                 else if (ev.phase === "progress") {
                     sendSse(res, "progress", { requestId, progress: typeof ev.progress === "number" ? ev.progress / 100 : null, stalled: Boolean(ev.stalled) });
@@ -126,10 +171,10 @@ export function registerVideoRoutes(app, ctxRaw) {
                 }
             };
             // Build prompt with series chain context
-            const chain = topic ? await getVideoSeriesChain(ctx.config.storage.generatedDir, topic) : [];
+            const chain = !parentLineage && topic ? await getVideoSeriesChain(ctx.config.storage.generatedDir, topic) : [];
             const effectivePrompt = chain.length > 0
-                ? `[Series topic: ${topic}]\n[Previous prompts in series:\n${chain.map((p, i) => `${i + 1}. ${p}`).join("\n")}\n]\n\n${prompt}`
-                : prompt;
+                ? `[Series topic: ${topic}]\n[Previous prompts in series:\n${chain.map((p, i) => `${i + 1}. ${p}`).join("\n")}\n]\n\n${activePrompt}`
+                : activePrompt;
             const result = await generateVideoViaGrok(effectivePrompt, ctx, {
                 model: modelCheck.model,
                 mode,
@@ -140,22 +185,32 @@ export function registerVideoRoutes(app, ctxRaw) {
                 referenceImages,
                 signal: cancelController.signal,
                 requestId,
+                continuityLineage: parentLineage,
                 onEvent,
             });
             const rand = randomBytes(ctx.config.ids.generatedHexBytes).toString("hex");
             const filename = `${Date.now()}_${rand}.mp4`;
             const elapsed = +((Date.now() - startTime) / 1000).toFixed(1);
+            const videoContinuity = appendVideoContinuityEntry(parentLineage, {
+                filename,
+                userPrompt: activePrompt,
+                revisedPrompt: result.revisedPrompt,
+                createdAt: Date.now(),
+            });
             const meta = {
                 kind: "video",
                 mediaType: "video",
                 requestId,
                 sessionId,
                 clientNodeId,
-                prompt,
-                userPrompt: prompt,
+                prompt: activePrompt,
+                userPrompt: activePrompt,
                 revisedPrompt: result.revisedPrompt,
                 provider: "grok",
-                model: modelCheck.model,
+                model: result.effectiveModel,
+                requestedModel: result.requestedModel,
+                effectiveModel: result.effectiveModel,
+                modelFallback: result.modelFallback,
                 createdAt: Date.now(),
                 elapsed,
                 usage: result.usage,
@@ -166,11 +221,14 @@ export function registerVideoRoutes(app, ctxRaw) {
                     aspectRatio: result.aspectRatio,
                     sourceImageFilename: sourceFilename,
                     xaiVideoRequestId: result.xaiVideoRequestId,
+                    requestedModel: result.requestedModel,
+                    effectiveModel: result.effectiveModel,
+                    modelFallback: result.modelFallback,
                 },
+                videoContinuity,
                 ...(topic ? { videoSeries: { topic, chainIndex: chain.length } } : {}),
             };
-            await writeFile(join(ctx.config.storage.generatedDir, filename), result.videoBuffer);
-            await writeFile(join(ctx.config.storage.generatedDir, filename + ".json"), JSON.stringify(meta)).catch(() => { });
+            await saveGeneratedVideoArtifact(ctx, filename, result.videoBuffer, meta);
             invalidateHistoryIndex();
             finishMeta = { filename, xaiVideoRequestId: result.xaiVideoRequestId };
             logEvent("video", "saved", { requestId, filename, bytes: result.videoBuffer.length, elapsedMs: Date.now() - startTime });
@@ -182,7 +240,11 @@ export function registerVideoRoutes(app, ctxRaw) {
                 revisedPrompt: result.revisedPrompt,
                 elapsed,
                 usage: result.usage,
+                requestedModel: result.requestedModel,
+                effectiveModel: result.effectiveModel,
+                modelFallback: result.modelFallback,
                 video: meta.video,
+                videoContinuity,
                 ...(meta.videoSeries ? { videoSeries: meta.videoSeries } : {}),
             });
         }