veogent 1.0.18 → 1.0.20

package/api.js

@@ -20,18 +20,24 @@ api.interceptors.request.use((config) => {
     return Promise.reject(error);
 });
 
-// Interceptor to handle specific errors generically
+// Interceptor to normalize successful payloads and throw structured errors
 api.interceptors.response.use(
-    (response) => {
-        // Return only the response data payload
-        return response.data;
-    },
+    (response) => response.data,
     (error) => {
-        if (error.response && error.response.status === 401) {
-            console.error('\n❌ Unauthorized! Your token might be expired. Please run `veogent login` again.');
-        } else {
-            console.error(`\n❌ Error: ${error.response?.data?.message || error.message}`);
-        }
-        process.exit(1);
+        const status = error.response?.status || null;
+        const payload = error.response?.data || null;
+        const message = payload?.error?.message?.en
+            || payload?.error?.message
+            || payload?.message
+            || error.message
+            || 'Unknown API error';
+
+        const wrapped = new Error(message);
+        wrapped.name = 'VeogentApiError';
+        wrapped.status = status;
+        wrapped.payload = payload;
+        wrapped.code = payload?.errorCode || payload?.error?.code || null;
+        wrapped.retryable = status >= 500;
+        throw wrapped;
     }
 );

package/device-auth.js

@@ -3,7 +3,8 @@ import axios from 'axios';
 const API_URL = process.env.VGEN_API_URL || 'https://api.veogent.com';
 
 export class DeviceAuthFlow {
-  constructor() {
+  constructor(options = {}) {
+    this.options = options;
     this.http = axios.create({
       baseURL: API_URL,
       timeout: 15000,
@@ -28,10 +29,22 @@ export class DeviceAuthFlow {
       interval,
     } = payload;
 
-    console.log('\n--- 🔐 VEOGENT CLI Device Login ---');
-    console.log(`1) Open this URL on any device/browser:\n   ${verificationUriComplete || verificationUri}`);
-    console.log(`2) Confirm the code: ${userCode}`);
-    console.log('3) Approve access, then return to this terminal.\n');
+    const deviceInfo = {
+      userCode,
+      verificationUri,
+      verificationUriComplete: verificationUriComplete || verificationUri,
+      expiresIn: Number(expiresIn) || 600,
+      interval: Number(interval) || 5,
+    };
+
+    if (typeof this.options.onDeviceCode === 'function') {
+      this.options.onDeviceCode(deviceInfo);
+    } else {
+      console.log('\n--- 🔐 VEOGENT CLI Device Login ---');
+      console.log(`1) Open this URL on any device/browser:\n   ${verificationUriComplete || verificationUri}`);
+      console.log(`2) Confirm the code: ${userCode}`);
+      console.log('3) Approve access, then return to this terminal.\n');
+    }
 
     return await this.pollForToken({
       deviceCode,

package/index.js

@@ -1,14 +1,53 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
+import pkg from './package.json' with { type: 'json' };
 import { api } from './api.js';
 import { setConfig, clearConfig, getToken } from './config.js';
 
 const program = new Command();
 
+const IMAGE_MODELS = ['imagen3.5', 'imagen4'];
+const VIDEO_MODELS = ['veo_3_1_fast', 'veo_3_1_fast_r2v'];
+
+function globalOpts() {
+    return program.opts();
+}
+
+function emitJson(payload) {
+    console.log(JSON.stringify(payload, null, 2));
+}
+
+function humanLog(message) {
+    if (!globalOpts().json && !globalOpts().agentSafe) console.log(message);
+}
+
+function humanError(message) {
+    if (!globalOpts().json) console.error(message);
+}
+
+function unwrapData(payload) {
+    if (payload?.data?.data !== undefined) return payload.data.data;
+    if (payload?.data !== undefined) return payload.data;
+    return payload;
+}
+
+function formatCliError(error) {
+    const payload = error?.payload || error?.response?.data || null;
+    return {
+        code: error?.code || payload?.errorCode || payload?.error?.code || 'CLI_ERROR',
+        message: error?.message || payload?.message || 'Unknown error',
+        status: error?.status || error?.response?.status || null,
+        retryable: typeof error?.retryable === 'boolean' ? error.retryable : false,
+        details: payload,
+    };
+}
+
 program
     .name('veogent')
     .description('CLI to interact with the VEOGENT API')
-    .version('1.0.0');
+    .option('--json', 'Output machine-readable JSON only')
+    .option('--agent-safe', 'Agent-safe mode (no emoji/browser surprises, stable output)')
+    .version(pkg.version);
 
 import { WebAuthFlow } from './auth.js';
 import { DeviceAuthFlow } from './device-auth.js';
@@ -23,32 +62,44 @@ program
         try {
             let response;
 
-            if (options.device) {
-                const deviceAuthFlow = new DeviceAuthFlow();
+            const shouldUseDevice = options.device || globalOpts().agentSafe;
+
+            if (shouldUseDevice) {
+                const deviceAuthFlow = new DeviceAuthFlow(globalOpts().json ? {
+                    onDeviceCode: (info) => emitJson({ status: 'pending_authorization', data: info }),
+                } : undefined);
                 const tokenPayload = await deviceAuthFlow.start();
                 response = { data: { access_token: tokenPayload.access_token, email: 'Device Auth User', name: 'CLI User' } };
             } else {
-                console.log('\n--- 🌐 VEOGENT CLI Web Authentication ---');
-                console.log('We will now open your default web browser to authorize VEOGENT CLI.\n');
+                humanLog('\n--- 🌐 VEOGENT CLI Web Authentication ---');
+                humanLog('We will now open your default web browser to authorize VEOGENT CLI.\n');
 
                 // Start local web server to catch the callback from the Next.js app
                 const authFlow = new WebAuthFlow(7890); // default port
                 const authResult = await authFlow.start();
 
                 // Perform backend sign-in using the payload received from the browser
-                console.log('\n🔄 Credentials received! Saving API Access Token...');
+                humanLog('\n🔄 Credentials received! Saving API Access Token...');
                 response = { data: { access_token: authResult.accessToken, email: authResult.uid, name: 'CLI User' } }; // JWT mapped
             }
 
             if (response?.data?.access_token) {
                 setConfig({ token: response.data.access_token, user: response.data });
-                console.log(`✅ Successfully logged in as: ${response.data.email || response.data.name}`);
-                console.log(`You can now use all VEOGENT CLI commands!`);
+                if (globalOpts().json) {
+                    emitJson({ status: 'success', user: response.data.email || response.data.name });
+                } else {
+                    humanLog(`✅ Successfully logged in as: ${response.data.email || response.data.name}`);
+                    humanLog('You can now use all VEOGENT CLI commands!');
+                }
             } else {
-                console.error('❌ Failed to retrieve access token from VEOGENT Backend.');
+                humanError('❌ Failed to retrieve access token from VEOGENT Backend.');
             }
         } catch (error) {
-            console.error('\n❌ Login process failed or was canceled.', error.message);
+            if (globalOpts().json) {
+                emitJson({ status: 'error', ...formatCliError(error) });
+            } else {
+                humanError(`\n❌ Login process failed or was canceled. ${error.message}`);
+            }
         }
     });
 
@@ -68,15 +119,16 @@ program
     .action(async () => {
         const token = getToken();
         if (!token) {
-            console.log(JSON.stringify({ error: 'Not logged in' }));
+            emitJson({ status: 'error', code: 'NOT_LOGGED_IN', message: 'Not logged in' });
             return;
         }
 
         try {
             const response = await api.get('/app/flow-key');
-            console.log(JSON.stringify({ authenticated: true, flowKey: response.data?.flowKey || null, paymentTier: response.data?.userPaymentTier || null }, null, 2));
+            const data = unwrapData(response);
+            console.log(JSON.stringify({ authenticated: true, flowKey: data?.flowKey || null, paymentTier: data?.userPaymentTier || null }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ error: 'Error verifying token' }));
+            console.log(JSON.stringify({ status: 'error', ...formatCliError(error) }));
         }
     });
 
@@ -92,22 +144,36 @@ program
                 userPaymentTier: options.tier
             };
             const data = await api.patch('/app/flow-key', payload);
-            console.log(JSON.stringify({ status: "success", info: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", info: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.response?.data?.message || error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
 // --- Prompts & Materials ---
+program
+    .command('image-models')
+    .description('List supported image models')
+    .action(() => {
+        console.log(JSON.stringify({ data: IMAGE_MODELS }, null, 2));
+    });
+
+program
+    .command('video-models')
+    .description('List supported video models')
+    .action(() => {
+        console.log(JSON.stringify({ data: VIDEO_MODELS }, null, 2));
+    });
+
 program
     .command('image-materials')
     .description('Get all available Image Material styles')
     .action(async () => {
         try {
             const data = await api.get('/app/project/image-materials');
-            console.log(JSON.stringify(data.data || data, null, 2));
+            console.log(JSON.stringify(unwrapData(data), null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -117,9 +183,9 @@ program
     .action(async () => {
         try {
             const data = await api.get('/app/custom-prompts');
-            console.log(JSON.stringify(data.data || data, null, 2));
+            console.log(JSON.stringify(unwrapData(data), null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 program
@@ -128,8 +194,10 @@ program
     .action(async () => {
         try {
             const data = await api.get('/app/projects');
-            console.log(JSON.stringify(data, null, 2));
-        } catch (error) {}
+            console.log(JSON.stringify(unwrapData(data), null, 2));
+        } catch (error) {
+            console.log(JSON.stringify({ status: 'error', ...formatCliError(error) }));
+        }
     });
 
 program
@@ -138,8 +206,10 @@ program
     .action(async (id) => {
         try {
             const data = await api.get(`/app/project/${id}`);
-            console.log(JSON.stringify(data.data, null, 2));
-        } catch (error) {}
+            console.log(JSON.stringify(unwrapData(data), null, 2));
+        } catch (error) {
+            console.log(JSON.stringify({ status: 'error', ...formatCliError(error) }));
+        }
     });
 
 program
@@ -147,19 +217,19 @@ program
     .description('Generate AI description for a new project based on keywords')
     .requiredOption('-k, --keyword <keyword>', 'Keywords for the project')
     .requiredOption('-l, --lang <lang>', 'Story language')
-    .requiredOption('-p, --promptId <promptId>', 'Custom Prompt ID from custom-prompts')
+    .option('-p, --promptId <promptId>', 'Custom Prompt ID from custom-prompts (optional)')
     .action(async (options) => {
         try {
             const payload = {
                 keywords: options.keyword,
                 language: options.lang,
-                customPromptId: options.promptId,
                 objects: []
             };
+            if (options.promptId) payload.customPromptId = options.promptId;
             const data = await api.post('/app/description', payload);
-            console.log(JSON.stringify({ status: "success", descriptionData: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", descriptionData: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.response?.data?.message || error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -170,9 +240,9 @@ program
     .requiredOption('-k, --keyword <keyword>', 'Keyword')
     .requiredOption('-d, --desc <desc>', 'Description')
     .requiredOption('-l, --lang <lang>', 'Story language')
-    .requiredOption('-s, --sound', 'Sound effects (true/false)', true)
+    .option('-s, --sound <sound>', 'Sound effects (true/false)', 'true')
     .requiredOption('-m, --material <material>', 'Image material')
-    .requiredOption('-c, --chapters <count>', 'Number of chapters', 1)
+    .option('-c, --chapters <count>', 'Number of chapters', '1')
     .option('-C, --customPromptId <customPromptId>', 'Custom Prompt ID')
     .action(async (options) => {
         try {
@@ -188,9 +258,9 @@ program
             if (options.customPromptId) payload.customPromptId = options.customPromptId;
 
             const data = await api.post('/app/project', payload);
-            console.log(JSON.stringify({ status: "success", project: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", project: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -201,8 +271,10 @@ program
     .action(async (projectId) => {
         try {
             const data = await api.get(`/app/chapters/${projectId}`);
-            console.log(JSON.stringify(data, null, 2));
-        } catch (error) {}
+            console.log(JSON.stringify(unwrapData(data), null, 2));
+        } catch (error) {
+            console.log(JSON.stringify({ status: 'error', ...formatCliError(error) }));
+        }
     });
 
 program
@@ -212,9 +284,9 @@ program
     .action(async (options) => {
         try {
             const data = await api.get(`/app/chapter/recent-chapters?limit=${options.limit}`);
-            console.log(JSON.stringify(data.data || data, null, 2));
+            console.log(JSON.stringify(unwrapData(data), null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -223,7 +295,7 @@ program
     .description('Generate content for a specific chapter')
     .requiredOption('-p, --project <project>', 'Project ID')
     .requiredOption('-c, --chapter <chapter>', 'Chapter ID')
-    .requiredOption('-s, --scenes <count>', 'Number of scenes', 1)
+    .option('-s, --scenes <count>', 'Number of scenes', '1')
     .action(async (options) => {
         try {
             const payload = {
@@ -232,9 +304,9 @@ program
                 numberScene: parseInt(options.scenes),
             };
             const data = await api.post('/app/chapter/content', payload);
-            console.log(JSON.stringify({ status: "success", chapterContent: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", chapterContent: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -246,9 +318,9 @@ program
     .action(async (projectId) => {
         try {
             const data = await api.get(`/app/characters/${projectId}`);
-            console.log(JSON.stringify(data.data || data, null, 2));
+            console.log(JSON.stringify(unwrapData(data), null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -268,20 +340,97 @@ program
                 editImageMode: options.editimage === true,
             };
             const data = await api.post(`/app/character/${options.project}/${options.character}/update-by-prompt`, payload);
-            console.log(JSON.stringify({ status: "success", character: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", character: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.response?.data?.message || error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 program
     .command('scenes <projectId> <chapterId>')
-    .description('Get all scenes for a specific chapter')
+    .description('Get all scenes for a specific chapter (stable/agent-friendly shape)')
     .action(async (projectId, chapterId) => {
         try {
-            const data = await api.get(`/app/scenes/${projectId}/${chapterId}`);
-            console.log(JSON.stringify(data.data || data, null, 2));
+            const raw = await api.get(`/app/scenes/${projectId}/${chapterId}`);
+            const unwrapped = unwrapData(raw);
+            const scenes = Array.isArray(unwrapped)
+                ? unwrapped
+                : Array.isArray(unwrapped?.scenes)
+                    ? unwrapped.scenes
+                    : Array.isArray(unwrapped?.items)
+                        ? unwrapped.items
+                        : [];
+
+            const normalizedScenes = scenes.map((scene, idx) => ({
+                id: scene?.id || scene?.sceneId || null,
+                displayOrder: scene?.displayOrder ?? idx,
+                scriptSegment: scene?.scriptSegment || scene?.content || null,
+                image: {
+                    status: scene?.imageStatus || scene?.image?.status || null,
+                    url: scene?.imageUrl || scene?.image?.url || null,
+                },
+                video: {
+                    status: scene?.videoStatus || scene?.video?.status || null,
+                    url: scene?.videoUrl || scene?.video?.url || null,
+                },
+                raw: scene,
+            }));
+
+            console.log(JSON.stringify({
+                data: normalizedScenes,
+                meta: {
+                    total: normalizedScenes.length,
+                    projectId,
+                    chapterId,
+                },
+            }, null, 2));
+        } catch (error) {
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
+        }
+    });
+
+program
+    .command('scene-status')
+    .description('Get scene status snapshot by chapter')
+    .requiredOption('-p, --project <project>', 'Project ID')
+    .requiredOption('-c, --chapter <chapter>', 'Chapter ID')
+    .action(async (options) => {
+        try {
+            const data = await api.get(`/app/scene-status/${options.project}/${options.chapter}`);
+            emitJson({ status: 'success', data: unwrapData(data) });
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            emitJson({ status: 'error', ...formatCliError(error) });
+        }
+    });
+
+program
+    .command('workflow-status')
+    .description('Export workflow snapshot for a project/chapter (agent helper)')
+    .requiredOption('-p, --project <project>', 'Project ID')
+    .requiredOption('-c, --chapter <chapter>', 'Chapter ID')
+    .action(async (options) => {
+        try {
+            const data = await api.get(`/app/workflow-status/${options.project}/${options.chapter}`);
+            emitJson({ status: 'success', data: unwrapData(data) });
+        } catch (error) {
+            // Backward-compatible fallback for old backend
+            try {
+                const [scenesRaw, requestsRaw] = await Promise.all([
+                    api.get(`/app/scenes/${options.project}/${options.chapter}`),
+                    api.get('/app/requests'),
+                ]);
+
+                const scenes = Array.isArray(unwrapData(scenesRaw)) ? unwrapData(scenesRaw) : [];
+                const requestsData = unwrapData(requestsRaw);
+                const requests = Array.isArray(requestsData) ? requestsData : (requestsData?.items || []);
+                const chapterRequests = requests.filter((r) =>
+                    (r?.project_id === options.project || r?.projectId === options.project) &&
+                    (r?.chapter_id === options.chapter || r?.chapterId === options.chapter)
+                );
+
+                emitJson({ status: 'success', data: { projectId: options.project, chapterId: options.chapter, scenes, requests: chapterRequests } });
+            } catch (fallbackError) {
+                emitJson({ status: 'error', ...formatCliError(fallbackError) });
+            }
         }
     });
 
@@ -301,9 +450,9 @@ program
                 useFlowKey: options.flowkey === true,
             };
             const data = await api.post('/app/scene', payload);
-            console.log(JSON.stringify({ status: "success", scene: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", scene: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -328,9 +477,9 @@ program
             }
 
             const data = await api.patch(`/app/scene/script-segment/${options.project}/${options.chapter}/${options.scene}`, payload);
-            console.log(JSON.stringify({ status: "success", scene: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", scene: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.response?.data?.message || error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -358,10 +507,24 @@ program
 
             // Conditionally add fields based on strict DTO validators
             if (options.type === 'GENERATE_IMAGES') {
+                if (!IMAGE_MODELS.includes(options.imagemodel)) {
+                    throw Object.assign(new Error('Model is not supported'), {
+                        code: 'E_IMAGE_MODEL_UNSUPPORTED',
+                        retryable: false,
+                        payload: { allowed: IMAGE_MODELS, field: 'imageModel' },
+                    });
+                }
                 payload.imageModel = options.imagemodel;
-                payload.orientation = options.orientation || 'HORIZONTAL'; 
+                payload.orientation = options.orientation || 'HORIZONTAL';
             }
             if (options.type === 'GENERATE_VIDEO') {
+                if (!VIDEO_MODELS.includes(options.videomodel)) {
+                    throw Object.assign(new Error('Model is not supported'), {
+                        code: 'E_VIDEO_MODEL_UNSUPPORTED',
+                        retryable: false,
+                        payload: { allowed: VIDEO_MODELS, field: 'model' },
+                    });
+                }
                 payload.model = options.videomodel;
                 payload.videoSpeedMode = options.speed;
                 if (options.endscene) {
@@ -377,9 +540,9 @@ program
             }
 
             const data = await api.post('/app/request', payload);
-            console.log(JSON.stringify({ status: "success", request: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", request: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.response?.data?.message || error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -389,9 +552,118 @@ program
     .action(async () => {
         try {
             const data = await api.get('/app/requests');
-            console.log(JSON.stringify(data.data || data, null, 2));
+            console.log(JSON.stringify(unwrapData(data), null, 2));
+        } catch (error) {
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
+        }
+    });
+
+program
+    .command('queue-status')
+    .description('Get current queue/concurrency status for authenticated user')
+    .action(async () => {
+        try {
+            const data = await api.get('/app/queue-status');
+            emitJson({ status: 'success', data: unwrapData(data) });
+        } catch (error) {
+            emitJson({ status: 'error', ...formatCliError(error) });
+        }
+    });
+
+program
+    .command('failed-requests')
+    .description('List failed requests for a project/chapter (agent helper)')
+    .requiredOption('-p, --project <project>', 'Project ID')
+    .option('-c, --chapter <chapter>', 'Chapter ID')
+    .action(async (options) => {
+        try {
+            const all = unwrapData(await api.get('/app/requests'));
+            const items = Array.isArray(all) ? all : (all?.items || []);
+            const failed = items.filter((r) => {
+                const status = String(r?.status || '').toUpperCase();
+                const projectOk = (r?.project === options.project) || (r?.projectId === options.project);
+                const chapterOk = !options.chapter || (r?.chapter === options.chapter) || (r?.chapterId === options.chapter);
+                return projectOk && chapterOk && ['FAILED', 'ERROR', 'REJECTED'].includes(status);
+            });
+            console.log(JSON.stringify({ data: failed, total: failed.length }, null, 2));
+        } catch (error) {
+            console.log(JSON.stringify({ status: 'error', ...formatCliError(error) }));
+        }
+    });
+
+program
+    .command('wait-images')
+    .description('Wait until all image requests in a chapter finish')
+    .requiredOption('-p, --project <project>', 'Project ID')
+    .requiredOption('-c, --chapter <chapter>', 'Chapter ID')
+    .option('-i, --interval <sec>', 'Polling interval in seconds', '10')
+    .option('-t, --timeout <sec>', 'Timeout in seconds', '1800')
+    .action(async (options) => {
+        const intervalMs = Math.max(1, Number(options.interval || 10)) * 1000;
+        const timeoutMs = Math.max(30, Number(options.timeout || 1800)) * 1000;
+        const startedAt = Date.now();
+
+        try {
+            while (Date.now() - startedAt < timeoutMs) {
+                const all = unwrapData(await api.get('/app/requests'));
+                const items = Array.isArray(all) ? all : (all?.items || []);
+                const filtered = items.filter((r) => {
+                    const type = String(r?.type || '').toUpperCase();
+                    const projectOk = (r?.project === options.project) || (r?.projectId === options.project);
+                    const chapterOk = (r?.chapter === options.chapter) || (r?.chapterId === options.chapter);
+                    return projectOk && chapterOk && type.includes('IMAGE');
+                });
+
+                const pending = filtered.filter((r) => ['PENDING', 'PROCESSING', 'RUNNING'].includes(String(r?.status || '').toUpperCase()));
+                if (pending.length === 0) {
+                    console.log(JSON.stringify({ status: 'success', data: filtered, message: 'All image requests finished' }, null, 2));
+                    return;
+                }
+
+                await new Promise((resolve) => setTimeout(resolve, intervalMs));
+            }
+
+            console.log(JSON.stringify({ status: 'error', code: 'WAIT_TIMEOUT', message: 'Timeout waiting image requests' }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            console.log(JSON.stringify({ status: 'error', ...formatCliError(error) }));
+        }
+    });
+
+program
+    .command('wait-videos')
+    .description('Wait until all video requests in a chapter finish')
+    .requiredOption('-p, --project <project>', 'Project ID')
+    .requiredOption('-c, --chapter <chapter>', 'Chapter ID')
+    .option('-i, --interval <sec>', 'Polling interval in seconds', '10')
+    .option('-t, --timeout <sec>', 'Timeout in seconds', '3600')
+    .action(async (options) => {
+        const intervalMs = Math.max(1, Number(options.interval || 10)) * 1000;
+        const timeoutMs = Math.max(30, Number(options.timeout || 3600)) * 1000;
+        const startedAt = Date.now();
+
+        try {
+            while (Date.now() - startedAt < timeoutMs) {
+                const all = unwrapData(await api.get('/app/requests'));
+                const items = Array.isArray(all) ? all : (all?.items || []);
+                const filtered = items.filter((r) => {
+                    const type = String(r?.type || '').toUpperCase();
+                    const projectOk = (r?.project === options.project) || (r?.projectId === options.project);
+                    const chapterOk = (r?.chapter === options.chapter) || (r?.chapterId === options.chapter);
+                    return projectOk && chapterOk && type.includes('VIDEO');
+                });
+
+                const pending = filtered.filter((r) => ['PENDING', 'PROCESSING', 'RUNNING'].includes(String(r?.status || '').toUpperCase()));
+                if (pending.length === 0) {
+                    console.log(JSON.stringify({ status: 'success', data: filtered, message: 'All video requests finished' }, null, 2));
+                    return;
+                }
+
+                await new Promise((resolve) => setTimeout(resolve, intervalMs));
+            }
+
+            console.log(JSON.stringify({ status: 'error', code: 'WAIT_TIMEOUT', message: 'Timeout waiting video requests' }, null, 2));
+        } catch (error) {
+            console.log(JSON.stringify({ status: 'error', ...formatCliError(error) }));
         }
     });
 
@@ -401,9 +673,9 @@ program
     .action(async (projectId, chapterId, sceneId, type) => {
         try {
             const data = await api.get(`/app/request/assets/${projectId}/${chapterId}/${sceneId}?type=${type}`);
-            console.log(JSON.stringify(data.data || data, null, 2));
+            console.log(JSON.stringify(unwrapData(data), null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -423,9 +695,9 @@ program
             };
 
             const data = await api.post(`/app/scene/upscale/${options.project}/${options.chapter}/${options.scene}`, payload);
-            console.log(JSON.stringify({ status: "success", request: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", request: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.response?.data?.message || error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -444,9 +716,9 @@ program
                 storyLanguage: options.lang
             };
             const data = await api.post('/app/youtube/metadata/generate', payload);
-            console.log(JSON.stringify({ status: "success", metadata: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", metadata: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.response?.data?.message || error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -464,9 +736,9 @@ program
                 storyLanguage: options.lang
             };
             const data = await api.post('/app/youtube/thumbnails/generate', payload);
-            console.log(JSON.stringify({ status: "success", request: data.data || data }, null, 2));
+            console.log(JSON.stringify({ status: "success", request: unwrapData(data) }, null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.response?.data?.message || error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -476,9 +748,9 @@ program
     .action(async (projectId, chapterId) => {
         try {
             const data = await api.get(`/app/youtube/projects/${projectId}/chapters/${chapterId}/thumbnails`);
-            console.log(JSON.stringify(data.data || data, null, 2));
+            console.log(JSON.stringify(unwrapData(data), null, 2));
         } catch (error) {
-            console.log(JSON.stringify({ status: "error", message: error.message }));
+            console.log(JSON.stringify({ status: "error", ...formatCliError(error) }));
         }
     });
 
@@ -495,9 +767,17 @@ program
         const skillPath = path.join(__dirname, 'skills', 'SKILL.md');
         try {
             const content = fs.readFileSync(skillPath, 'utf-8');
-            console.log(content);
+            if (globalOpts().json) {
+                emitJson({ status: 'success', data: content });
+            } else {
+                console.log(content);
+            }
         } catch (err) {
-            console.error('❌ Could not read SKILL.md:', err.message);
+            if (globalOpts().json) {
+                emitJson({ status: 'error', code: 'SKILL_READ_FAILED', message: err.message });
+            } else {
+                humanError(`❌ Could not read SKILL.md: ${err.message}`);
+            }
         }
     });
 
@@ -506,19 +786,27 @@ program
     .description('Auto-extract your labs.google Flow Token (ya29.) using a secure browser overlay')
     .action(async () => {
         try {
-            console.log("\n--- 🗝️ VEOGENT Flow Token Extractor ---");
-            console.log("This will open a chromium window to https://labs.google/fx/tools/flow.");
-            console.log("Please click 'Create with Flow' and login if requested.");
-            console.log("We will automatically capture the underlying Bearer Token from Network traffic!\n");
+            humanLog("\n--- 🗝️ VEOGENT Flow Token Extractor ---");
+            humanLog("This will open a chromium window to https://labs.google/fx/tools/flow.");
+            humanLog("Please click 'Create with Flow' and login if requested.");
+            humanLog("We will automatically capture the underlying Bearer Token from Network traffic!\n");
 
             const token = await obtainFlowToken();
-            
+
             if (token) {
-                console.log(`\n🎉 Extracted Flow Token:\n\n${token}\n`);
-                console.log(`To apply this automatically to your account, run:\nveogent setup-flow -f "${token}"`);
+                if (globalOpts().json) {
+                    emitJson({ status: 'success', flowToken: token });
+                } else {
+                    humanLog(`\n🎉 Extracted Flow Token:\n\n${token}\n`);
+                    humanLog(`To apply this automatically to your account, run:\nveogent setup-flow -f "${token}"`);
+                }
             }
         } catch (error) {
-            console.error("Failed to extract:", error.message);
+            if (globalOpts().json) {
+                emitJson({ status: 'error', ...formatCliError(error) });
+            } else {
+                humanError(`Failed to extract: ${error.message}`);
+            }
         }
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veogent",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "The official CLI to interact with the VEOGENT API - AI Video and Image generation platform",
   "main": "index.js",
   "bin": {