bazaar.it 0.2.0 → 0.2.2

package/README.md

@@ -66,7 +66,7 @@ $ baz
 ██████╔╝██║  ██║███████╗
 ╚═════╝ ╚═╝  ╚═╝╚══════╝
 
-AI-powered video generation v0.1.0
+AI-powered video generation v0.2.2
 ─────────────────────────────────────
 Type a command or prompt. Use 'help' for commands.
 
@@ -97,11 +97,7 @@ baz auth logout
 ```
 
 **Get an API Key:**
-1. **For humans**: Generate at https://bazaar.it/settings/api-keys
-2. **For service accounts**: Use the admin script:
-   ```bash
-   npx tsx scripts/create-service-account.ts maya@bazaar.it "Maya Bot" "Maya CLI"
-   ```
+Sign in at [bazaar.it](https://bazaar.it), click your balance in the top bar, then select **API Keys** to generate one.
 
 ### Projects
 
@@ -161,14 +157,11 @@ baz prompt "Create something cool" --verbose
 # List all scenes in active project
 baz scenes list
 
-# Get scene details
-baz scenes list
-
 # Get scene TSX code
 baz scenes code <scene-id>
 
-# Get scene code
-baz scenes code <scene-id>
+# Replace scene TSX code from file
+baz scenes set-code <scene-id> --file ./scene.tsx
 ```
 
 ### Media Upload
@@ -350,6 +343,7 @@ Returns:
 
 ```
 --json              Output as JSON (for scripting)
+--compact           Compact JSON output (token-efficient for agents)
 --verbose           Show detailed output
 --config <path>     Custom config file path
 --api-url <url>     Override API URL
@@ -410,7 +404,7 @@ export BAZ_API_KEY="$BAZAAR_API_KEY"
 baz prompt "Create demo video: $PR_DESCRIPTION" --project-id "$PROJECT_ID"
 
 # Export when ready
-baz export --json > export-result.json
+baz export start --wait --json > export-result.json
 ```
 
 ### Complex Workflow
@@ -438,7 +432,7 @@ baz project use <project-id>
 
 ### "Insufficient balance"
 
-Check balance at https://bazaar.it/settings/billing
+Check your balance in the app at [bazaar.it](https://bazaar.it) — visible in the top bar after signing in.
 
 ### Connection Issues
 

package/dist/commands/auth.js

@@ -4,6 +4,15 @@ import { loadConfig, saveConfig, hasAuth, getConfigPath } from '../lib/config.js
 import { success, error, info, output } from '../lib/output.js';
 export const authCommand = new Command('auth')
     .description('Manage authentication');
+function getGlobalOptsFromActionArgs(actionArgs) {
+    for (let i = actionArgs.length - 1; i >= 0; i--) {
+        const maybeCmd = actionArgs[i];
+        if (maybeCmd && typeof maybeCmd.optsWithGlobals === 'function') {
+            return maybeCmd.optsWithGlobals();
+        }
+    }
+    return {};
+}
 /**
  * baz auth login
  */
@@ -11,7 +20,13 @@ authCommand
     .command('login')
     .description('Configure API key for authentication')
     .argument('[api-key]', 'API key (or set BAZ_API_KEY env var)')
-    .action(async (apiKey) => {
+    .action(async (...actionArgs) => {
+    const apiKey = actionArgs[0];
+    const globalOpts = getGlobalOptsFromActionArgs(actionArgs);
+    const config = loadConfig({
+        configPath: globalOpts.config,
+        apiUrl: globalOpts.apiUrl,
+    });
     // If no key provided, check environment
     const key = apiKey || process.env.BAZ_API_KEY;
     if (!key) {
@@ -23,7 +38,7 @@ authCommand
         console.log('  1. Pass directly: baz auth login <your-api-key>');
         console.log('  2. Environment:   export BAZ_API_KEY=<your-api-key>');
         console.log();
-        console.log(chalk.gray('Get your API key at https://bazaar.it/api'));
+        console.log(chalk.gray('Get your API key at https://bazaar.it/settings/api-keys'));
         process.exit(1);
     }
     // Validate key format
@@ -32,9 +47,8 @@ authCommand
         process.exit(1);
     }
     // Save to config first (needed for the validation request)
-    saveConfig({ apiKey: key });
+    saveConfig({ apiKey: key, apiUrl: config.apiUrl }, { configPath: globalOpts.config });
     // Validate key against server
-    const config = loadConfig();
     try {
         const url = `${config.apiUrl}/api/trpc/apiKey.list`;
         const res = await fetch(url, {
@@ -43,10 +57,10 @@ authCommand
         });
         if (res.ok) {
             success('Authenticated successfully');
-            console.log(`  Key saved to ${chalk.gray(getConfigPath())}`);
+            console.log(`  Key saved to ${chalk.gray(getConfigPath(globalOpts.config))}`);
         }
         else if (res.status === 401) {
-            saveConfig({ apiKey: undefined });
+            saveConfig({ apiKey: undefined, apiUrl: config.apiUrl }, { configPath: globalOpts.config });
             error('Invalid API key', 'The key was not recognized by the server. Check for typos or generate a new key.');
             process.exit(1);
         }
@@ -66,8 +80,8 @@ authCommand
 authCommand
     .command('status')
     .description('Show current authentication status')
-    .action(async (options, cmd) => {
-    const globalOpts = cmd.optsWithGlobals();
+    .action(async (...actionArgs) => {
+    const globalOpts = getGlobalOptsFromActionArgs(actionArgs);
     const config = loadConfig({
         configPath: globalOpts.config,
         apiUrl: globalOpts.apiUrl,
@@ -76,10 +90,10 @@ authCommand
         authenticated: hasAuth(config),
         apiUrl: config.apiUrl,
         activeProjectId: config.activeProjectId || null,
-        configFile: getConfigPath(),
+        configFile: getConfigPath(globalOpts.config),
     };
     if (globalOpts.json) {
-        output(data, { json: true });
+        output(data, { json: true, compact: globalOpts.compact });
         return;
     }
     console.log(chalk.cyan('Bazaar CLI Status'));
@@ -95,7 +109,7 @@ authCommand
     console.log();
     console.log(`API URL: ${config.apiUrl}`);
     console.log(`Active Project: ${config.activeProjectId || chalk.gray('none')}`);
-    console.log(`Config: ${getConfigPath()}`);
+    console.log(`Config: ${getConfigPath(globalOpts.config)}`);
 });
 /**
  * baz auth logout
@@ -103,7 +117,12 @@ authCommand
 authCommand
     .command('logout')
     .description('Clear stored credentials')
-    .action(async () => {
-    saveConfig({ apiKey: undefined });
+    .action(async (...actionArgs) => {
+    const globalOpts = getGlobalOptsFromActionArgs(actionArgs);
+    const config = loadConfig({
+        configPath: globalOpts.config,
+        apiUrl: globalOpts.apiUrl,
+    });
+    saveConfig({ apiKey: undefined, apiUrl: config.apiUrl }, { configPath: globalOpts.config });
     success('Logged out. API key removed from config.');
 });

package/dist/commands/export.js

@@ -68,7 +68,7 @@ exportCommand
         }
         process.exit(64); // Input error exit code
     }
-    const spinner = ora('Starting export...').start();
+    const spinner = globalOpts.json ? null : ora('Starting export...').start();
     const startTime = Date.now();
     const timeoutMs = parseInt(options.timeout, 10) * 1000;
     try {
@@ -80,7 +80,8 @@ exportCommand
         const renderId = result.renderId || result.id;
         // If --wait flag, block until complete
         if (options.wait) {
-            spinner.text = 'Rendering...';
+            if (spinner)
+                spinner.text = 'Rendering...';
             const checkStatus = async () => {
                 return await apiRequest(config, 'render.getRenderStatus', { renderId });
             };
@@ -90,7 +91,7 @@ exportCommand
                 // Check timeout
                 const elapsed = Date.now() - startTime;
                 if (elapsed > timeoutMs) {
-                    spinner.fail();
+                    spinner?.fail();
                     if (globalOpts.json) {
                         console.log(JSON.stringify({
                             type: 'error',
@@ -122,11 +123,12 @@ exportCommand
                         }));
                     }
                 }
-                spinner.text = `Rendering... ${progress}%`;
+                if (spinner)
+                    spinner.text = `Rendering... ${progress}%`;
                 await new Promise(r => setTimeout(r, 3000));
                 status = await checkStatus();
             }
-            spinner.stop();
+            spinner?.stop();
             if (status.status === 'completed' || status.status === 'done') {
                 const finalResult = {
                     type: 'export_completed',
@@ -137,7 +139,7 @@ exportCommand
                     continue: false,
                 };
                 if (globalOpts.json) {
-                    output(finalResult, { json: true });
+                    output(finalResult, { json: true, compact: globalOpts.compact });
                 }
                 else {
                     success('Export complete!');
@@ -168,14 +170,14 @@ exportCommand
         }
         else {
             // Non-blocking mode (original behavior)
-            spinner.stop();
+            spinner?.stop();
             if (globalOpts.json) {
                 output({
                     type: 'export_started',
                     exportId: renderId,
                     status: 'pending',
                     continue: true, // Agent should poll for completion
-                }, { json: true });
+                }, { json: true, compact: globalOpts.compact });
                 return;
             }
             success(`Export started!`);
@@ -186,7 +188,7 @@ exportCommand
         }
     }
     catch (err) {
-        spinner.stop();
+        spinner?.stop();
         if (err instanceof ApiError) {
             if (globalOpts.json) {
                 output({ ...err.toJSON(), continue: false }, { json: true, compact: globalOpts.compact });
@@ -237,18 +239,19 @@ exportCommand
         return result;
     };
     if (options.wait) {
-        const spinner = ora('Waiting for export to complete...').start();
+        const spinner = globalOpts.json ? null : ora('Waiting for export to complete...').start();
         try {
             let status = await checkStatus();
             while (status.status === 'pending' || status.status === 'rendering' || status.status === 'in_progress') {
                 const progress = status.progress || 0;
-                spinner.text = `Rendering... ${progress}%`;
+                if (spinner)
+                    spinner.text = `Rendering... ${progress}%`;
                 await new Promise(r => setTimeout(r, 3000));
                 status = await checkStatus();
             }
-            spinner.stop();
+            spinner?.stop();
             if (globalOpts.json) {
-                output(status, { json: true });
+                output(status, { json: true, compact: globalOpts.compact });
                 return;
             }
             if (status.status === 'completed' || status.status === 'done') {
@@ -263,18 +266,40 @@ exportCommand
             }
         }
         catch (err) {
-            spinner.stop();
-            error(err.message);
+            spinner?.stop();
+            if (err instanceof ApiError) {
+                if (globalOpts.json) {
+                    output(err.toJSON(), { json: true, compact: globalOpts.compact });
+                }
+                else {
+                    error(err.message, err.suggestion);
+                }
+                process.exit(err.exitCode);
+            }
+            if (globalOpts.json) {
+                output({
+                    type: 'error',
+                    code: 'UNKNOWN',
+                    message: err.message,
+                    category: 'fatal',
+                    retryable: false,
+                    transient: false,
+                    exitCode: 1,
+                }, { json: true, compact: globalOpts.compact });
+            }
+            else {
+                error(err.message);
+            }
             process.exit(1);
         }
     }
     else {
-        const spinner = ora('Checking status...').start();
+        const spinner = globalOpts.json ? null : ora('Checking status...').start();
         try {
             const status = await checkStatus();
-            spinner.stop();
+            spinner?.stop();
             if (globalOpts.json) {
-                output(status, { json: true });
+                output(status, { json: true, compact: globalOpts.compact });
                 return;
             }
             const statusColor = status.status === 'completed' || status.status === 'done' ? chalk.green :
@@ -292,8 +317,30 @@ exportCommand
             }
         }
         catch (err) {
-            spinner.stop();
-            error(err.message);
+            spinner?.stop();
+            if (err instanceof ApiError) {
+                if (globalOpts.json) {
+                    output(err.toJSON(), { json: true, compact: globalOpts.compact });
+                }
+                else {
+                    error(err.message, err.suggestion);
+                }
+                process.exit(err.exitCode);
+            }
+            if (globalOpts.json) {
+                output({
+                    type: 'error',
+                    code: 'UNKNOWN',
+                    message: err.message,
+                    category: 'fatal',
+                    retryable: false,
+                    transient: false,
+                    exitCode: 1,
+                }, { json: true, compact: globalOpts.compact });
+            }
+            else {
+                error(err.message);
+            }
             process.exit(1);
         }
     }
@@ -320,18 +367,31 @@ exportCommand
         projectId = getProjectId(config, globalOpts.projectId);
     }
     catch (err) {
-        error(err.message);
-        process.exit(1);
+        if (globalOpts.json) {
+            output({
+                type: 'error',
+                code: 'VALIDATION',
+                message: err.message,
+                category: 'validation',
+                retryable: false,
+                transient: false,
+                exitCode: 64,
+            }, { json: true, compact: globalOpts.compact });
+        }
+        else {
+            error(err.message);
+        }
+        process.exit(64);
     }
-    const spinner = ora('Fetching exports...').start();
+    const spinner = globalOpts.json ? null : ora('Fetching exports...').start();
     try {
         const result = await apiRequest(config, 'render.listRenders', {
             projectId,
             limit: parseInt(options.limit, 10),
         });
-        spinner.stop();
+        spinner?.stop();
         if (globalOpts.json) {
-            output(result, { json: true });
+            output(result, { json: true, compact: globalOpts.compact });
             return;
         }
         const renders = Array.isArray(result) ? result : result.renders || [];
@@ -353,8 +413,30 @@ exportCommand
         }
     }
     catch (err) {
-        spinner.stop();
-        error(err.message);
+        spinner?.stop();
+        if (err instanceof ApiError) {
+            if (globalOpts.json) {
+                output(err.toJSON(), { json: true, compact: globalOpts.compact });
+            }
+            else {
+                error(err.message, err.suggestion);
+            }
+            process.exit(err.exitCode);
+        }
+        if (globalOpts.json) {
+            output({
+                type: 'error',
+                code: 'UNKNOWN',
+                message: err.message,
+                category: 'fatal',
+                retryable: false,
+                transient: false,
+                exitCode: 1,
+            }, { json: true, compact: globalOpts.compact });
+        }
+        else {
+            error(err.message);
+        }
         process.exit(1);
     }
 });

package/dist/commands/loop.js

@@ -75,7 +75,7 @@ function parseBudgetMs(input) {
 }
 export const loopCommand = new Command('loop')
     .description('Iterate prompt → review in a basic OODA loop')
-    .argument('<text>', 'The prompt text (or use --file)')
+    .argument('[text]', 'The prompt text (or use --file)')
     .option('--mode <mode>', 'Generation mode: agent (default), agent-max, multi-scene', 'agent')
     .option('--max', 'Shorthand for --mode agent-max')
     .option('--max-iterations <n>', 'Maximum iterations (default: 3)', '3')
@@ -93,6 +93,15 @@ export const loopCommand = new Command('loop')
     const agentModeEnv = process.env.BAZ_AGENT === '1';
     const jsonOutput = globalOpts.json || agentModeEnv;
     const streamJson = options.streamJson === true || agentModeEnv;
+    const emitCliError = (payload, fallbackMessage, fallbackSuggestion) => {
+        if (streamJson || jsonOutput) {
+            console.log(JSON.stringify(payload));
+        }
+        else {
+            error(fallbackMessage, fallbackSuggestion);
+        }
+        process.exit(typeof payload.exitCode === 'number' ? payload.exitCode : 1);
+    };
     const config = loadConfig({
         configPath: globalOpts.config,
         apiUrl: globalOpts.apiUrl,
@@ -141,13 +150,27 @@ export const loopCommand = new Command('loop')
             promptText = readFileSync(options.file, 'utf-8').trim();
         }
         catch {
-            error(`Failed to read file: ${options.file}`);
-            process.exit(1);
+            emitCliError({
+                type: 'error',
+                code: 'VALIDATION',
+                message: `Failed to read file: ${options.file}`,
+                category: 'validation',
+                retryable: false,
+                continue: false,
+                exitCode: 64,
+            }, `Failed to read file: ${options.file}`);
         }
     }
     if (!promptText) {
-        error('No prompt provided');
-        process.exit(1);
+        emitCliError({
+            type: 'error',
+            code: 'VALIDATION',
+            message: 'No prompt provided',
+            category: 'validation',
+            retryable: false,
+            continue: false,
+            exitCode: 64,
+        }, 'No prompt provided');
     }
     const mode = options.max ? 'agent-max' : options.mode;
     const requirements = normalizeRequirements(options.requirements);
@@ -159,39 +182,60 @@ export const loopCommand = new Command('loop')
     if (options.plan)
         maxIterations = 1;
     if (budgetMs !== undefined && budgetMs <= 0) {
-        error('Budget must be a positive duration (e.g., 30s, 2m)');
-        process.exit(64);
+        emitCliError({
+            type: 'error',
+            code: 'VALIDATION',
+            message: 'Budget must be a positive duration (e.g., 30s, 2m)',
+            category: 'validation',
+            retryable: false,
+            continue: false,
+            exitCode: 64,
+        }, 'Budget must be a positive duration (e.g., 30s, 2m)');
     }
     // Handle image uploads
     const imageUrls = [];
     if (options.image && options.image.length > 0) {
-        const uploadSpinner = ora('Uploading images...').start();
+        const uploadSpinner = (streamJson || jsonOutput) ? null : ora('Uploading images...').start();
         try {
             for (const imagePath of options.image) {
                 if (!existsSync(imagePath)) {
-                    uploadSpinner.fail();
-                    error(`Image file not found: ${imagePath}`);
-                    process.exit(1);
+                    uploadSpinner?.fail();
+                    emitCliError({
+                        type: 'error',
+                        code: 'NOT_FOUND',
+                        message: `Image file not found: ${imagePath}`,
+                        category: 'validation',
+                        retryable: false,
+                        continue: false,
+                        exitCode: 64,
+                    }, `Image file not found: ${imagePath}`);
                 }
                 const imageBuffer = readFileSync(imagePath);
                 const url = await uploadImage(config, { projectId, buffer: imageBuffer, filename: imagePath });
                 imageUrls.push(url);
             }
-            uploadSpinner.succeed(`Uploaded ${imageUrls.length} image${imageUrls.length > 1 ? 's' : ''}`);
+            uploadSpinner?.succeed(`Uploaded ${imageUrls.length} image${imageUrls.length > 1 ? 's' : ''}`);
         }
         catch (err) {
-            uploadSpinner.fail();
+            uploadSpinner?.fail();
             const errMsg = err instanceof ApiError
                 ? `${err.message}${err.suggestion ? ` — ${err.suggestion}` : ''}`
                 : err.message;
-            error(`Failed to upload images: ${errMsg}`);
-            process.exit(1);
+            emitCliError({
+                type: 'error',
+                code: err instanceof ApiError ? err.code : 'UNKNOWN',
+                message: `Failed to upload images: ${errMsg}`,
+                category: err instanceof ApiError ? err.category : 'fatal',
+                retryable: err instanceof ApiError ? err.retryable : false,
+                continue: false,
+                exitCode: err instanceof ApiError ? err.exitCode : 1,
+            }, `Failed to upload images: ${errMsg}`);
         }
     }
     // Handle URL attachments
     const urlContents = [];
     if (options.url && options.url.length > 0) {
-        const urlSpinner = ora('Fetching URLs...').start();
+        const urlSpinner = (streamJson || jsonOutput) ? null : ora('Fetching URLs...').start();
         try {
             for (const url of options.url) {
                 const result = await fetchUrlContent(url);
@@ -201,15 +245,22 @@ export const loopCommand = new Command('loop')
                     content: result.content.slice(0, 10000),
                 });
             }
-            urlSpinner.succeed(`Fetched ${urlContents.length} URL${urlContents.length > 1 ? 's' : ''}`);
+            urlSpinner?.succeed(`Fetched ${urlContents.length} URL${urlContents.length > 1 ? 's' : ''}`);
         }
         catch (err) {
-            urlSpinner.fail();
+            urlSpinner?.fail();
             const errMsg = err instanceof ApiError
                 ? `${err.message}${err.details ? ` — ${err.details}` : ''}`
                 : err.message;
-            error(`Failed to fetch URL: ${errMsg}`);
-            process.exit(1);
+            emitCliError({
+                type: 'error',
+                code: err instanceof ApiError ? err.code : 'UNKNOWN',
+                message: `Failed to fetch URL: ${errMsg}`,
+                category: err instanceof ApiError ? err.category : 'fatal',
+                retryable: err instanceof ApiError ? err.retryable : false,
+                continue: false,
+                exitCode: err instanceof ApiError ? err.exitCode : 1,
+            }, `Failed to fetch URL: ${errMsg}`);
         }
         if (urlContents.length > 0) {
             const urlContext = urlContents.map(u => `--- Content from ${u.url}${u.title ? ` (${u.title})` : ''} ---\n${u.content}`).join('\n\n');
@@ -249,6 +300,7 @@ export const loopCommand = new Command('loop')
     let currentPrompt = basePrompt;
     const results = [];
     const loopStart = Date.now();
+    let fatalErrorMessage = null;
     const emit = (payload) => {
         if (streamJson) {
             console.log(JSON.stringify(payload));
@@ -376,6 +428,7 @@ export const loopCommand = new Command('loop')
             if (spinner)
                 spinner.stop();
             const message = err instanceof Error ? err.message : String(err);
+            fatalErrorMessage = message;
             if (streamJson || jsonOutput) {
                 console.log(JSON.stringify({
                     type: 'error',
@@ -535,4 +588,17 @@ export const loopCommand = new Command('loop')
         projectId,
         mode,
     });
+    if (fatalErrorMessage) {
+        process.exit(1);
+    }
+    const lastResult = results.length > 0 ? results[results.length - 1] : null;
+    if (lastResult) {
+        if (lastResult.success === false) {
+            process.exit(1);
+        }
+        if (Array.isArray(lastResult.requirements?.missing) &&
+            lastResult.requirements.missing.length > 0) {
+            process.exit(65);
+        }
+    }
 });

package/dist/commands/media.js

@@ -4,7 +4,7 @@ import ora from 'ora';
 import { readFileSync, existsSync, statSync } from 'fs';
 import { basename, extname } from 'path';
 import { loadConfig, hasAuth, getProjectId } from '../lib/config.js';
-import { apiRequest, uploadMedia } from '../lib/api.js';
+import { apiRequest, uploadMedia, ApiError } from '../lib/api.js';
 import { error, output, table } from '../lib/output.js';
 /**
  * Format file size in human-readable format
@@ -204,7 +204,7 @@ mediaCommand
         console.log(chalk.gray(`  Project: ${projectId}`));
         console.log();
     }
-    const spinner = ora('Uploading...').start();
+    const spinner = globalOpts.json ? null : ora('Uploading...').start();
     try {
         const buffer = readFileSync(filePath);
         const result = await uploadMedia(config, {
@@ -213,9 +213,9 @@ mediaCommand
             filename,
             mimeType,
         });
-        spinner.succeed('Upload complete');
+        spinner?.succeed('Upload complete');
         if (globalOpts.json) {
-            output(result, { json: true });
+            output(result, { json: true, compact: globalOpts.compact });
         }
         else {
             console.log();
@@ -230,7 +230,16 @@ mediaCommand
         }
     }
     catch (err) {
-        spinner.fail('Upload failed');
+        spinner?.fail('Upload failed');
+        if (err instanceof ApiError) {
+            if (globalOpts.json) {
+                output(err.toJSON(), { json: true, compact: globalOpts.compact });
+            }
+            else {
+                error(err.message, err.suggestion);
+            }
+            process.exit(err.exitCode);
+        }
         if (globalOpts.json) {
             output({
                 type: 'error',
@@ -343,6 +352,15 @@ mediaCommand
     }
     catch (err) {
         spinner?.stop();
+        if (err instanceof ApiError) {
+            if (globalOpts.json) {
+                output(err.toJSON(), { json: true, compact: globalOpts.compact });
+            }
+            else {
+                error(err.message, err.suggestion);
+            }
+            process.exit(err.exitCode);
+        }
         if (globalOpts.json) {
             output({
                 type: 'error',

package/dist/commands/project.js

@@ -115,7 +115,7 @@ projectCommand
         spinner?.stop();
         // Set as active project unless --no-activate
         if (options.activate !== false) {
-            saveConfig({ activeProjectId: projectId });
+            saveConfig({ activeProjectId: projectId }, { configPath: globalOpts.config });
         }
         if (globalOpts.json) {
             output({
@@ -178,7 +178,7 @@ projectCommand
                 updatedAt: p.updatedAt,
                 createdAt: p.createdAt,
             }));
-            output(lean, { json: true });
+            output(lean, { json: true, compact: globalOpts.compact });
             return;
         }
         if (projects.length === 0) {
@@ -229,9 +229,9 @@ projectCommand
     try {
         const result = await apiRequest(config, 'project.getById', { id });
         spinner?.stop();
-        saveConfig({ activeProjectId: id });
+        saveConfig({ activeProjectId: id }, { configPath: globalOpts.config });
         if (globalOpts.json) {
-            output({ activeProjectId: id, project: result }, { json: true });
+            output({ activeProjectId: id, project: result }, { json: true, compact: globalOpts.compact });
             return;
         }
         success(`Active project: ${chalk.bold(result.title || result.name || 'Untitled')} (${id})`);
@@ -256,7 +256,7 @@ projectCommand
     });
     if (!config.activeProjectId) {
         if (globalOpts.json) {
-            output({ activeProjectId: null }, { json: true });
+            output({ activeProjectId: null }, { json: true, compact: globalOpts.compact });
             return;
         }
         console.log(chalk.gray('No active project set.'));
@@ -273,7 +273,7 @@ projectCommand
         });
         spinner?.stop();
         if (globalOpts.json) {
-            output(result, { json: true });
+            output(result, { json: true, compact: globalOpts.compact });
             return;
         }
         console.log(chalk.cyan('Active Project'));
@@ -361,7 +361,7 @@ projectCommand
         const duplicatedProject = await apiRequest(config, 'project.getById', { id: newProjectId }).catch(() => null);
         const activated = options.activate !== false;
         if (activated) {
-            saveConfig({ activeProjectId: newProjectId });
+            saveConfig({ activeProjectId: newProjectId }, { configPath: globalOpts.config });
         }
         spinner?.stop();
         const payload = {
@@ -477,7 +477,7 @@ projectCommand
         const project = await apiRequest(config, 'project.getById', { id: newProjectId }).catch(() => null);
         const activated = options.activate !== false;
         if (activated) {
-            saveConfig({ activeProjectId: newProjectId });
+            saveConfig({ activeProjectId: newProjectId }, { configPath: globalOpts.config });
         }
         spinner?.stop();
         const payload = {
@@ -758,7 +758,7 @@ projectCommand
         const confirmed = await confirmAction(`Delete project ${id}? This cannot be undone.`);
         if (!confirmed) {
             if (globalOpts.json) {
-                output({ deleted: false, id, reason: 'cancelled' }, { json: true });
+                output({ deleted: false, id, reason: 'cancelled' }, { json: true, compact: globalOpts.compact });
                 return;
             }
             console.log(chalk.gray('Cancelled. Use --force to skip confirmation.'));
@@ -771,10 +771,10 @@ projectCommand
         spinner?.stop();
         // Clear active project if it was deleted
         if (config.activeProjectId === id) {
-            saveConfig({ activeProjectId: undefined });
+            saveConfig({ activeProjectId: undefined }, { configPath: globalOpts.config });
         }
         if (globalOpts.json) {
-            output({ deleted: true, id }, { json: true });
+            output({ deleted: true, id }, { json: true, compact: globalOpts.compact });
             return;
         }
         success(`Deleted project: ${id}`);

package/dist/commands/prompt.js

@@ -39,57 +39,58 @@ export const promptCommand = new Command('prompt')
     .option('--plan', 'Create a recipe/plan without executing (handshake protocol)')
     .option('--requirements <list>', 'Requirements to verify against (comma-separated)')
     .option('--budget <dollars>', 'Max budget per run in USD (default: 5)', parseFloat)
+    .option('--model <model>', 'Agent model: fast, default, max')
     .action(async (text, options, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     const agentModeEnv = process.env.BAZ_AGENT === '1';
     const jsonOutput = globalOpts.json || agentModeEnv;
+    const streamJson = options.streamJson === true || agentModeEnv;
+    const emitCliError = (payload, fallbackMessage, fallbackSuggestion) => {
+        if (streamJson || jsonOutput) {
+            console.log(JSON.stringify(payload));
+        }
+        else {
+            error(fallbackMessage, fallbackSuggestion);
+        }
+        process.exit(typeof payload.exitCode === 'number' ? payload.exitCode : 1);
+    };
     const config = loadConfig({
         configPath: globalOpts.config,
         apiUrl: globalOpts.apiUrl,
         projectId: globalOpts.projectId,
     });
     if (!hasAuth(config)) {
-        if (options.streamJson || jsonOutput) {
-            console.log(JSON.stringify({
-                type: 'error',
-                code: 'AUTH_MISSING',
-                errorType: 'AUTH_MISSING',
-                message: 'Not authenticated',
-                category: 'auth',
-                retryable: false,
-                transient: false,
-                suggestion: 'Run: baz auth login <api-key>',
-                continue: false,
-            }));
-        }
-        else {
-            error('Not authenticated', 'Run: baz auth login <api-key>');
-        }
-        process.exit(13); // Auth error exit code
+        emitCliError({
+            type: 'error',
+            code: 'AUTH_MISSING',
+            errorType: 'AUTH_MISSING',
+            message: 'Not authenticated',
+            category: 'auth',
+            retryable: false,
+            transient: false,
+            suggestion: 'Run: baz auth login <api-key>',
+            continue: false,
+            exitCode: 13,
+        }, 'Not authenticated', 'Run: baz auth login <api-key>');
     }
     // Get project ID
-    let projectId;
+    let projectId = '';
     try {
         projectId = getProjectId(config, globalOpts.projectId);
     }
     catch (err) {
-        if (options.streamJson || jsonOutput) {
-            console.log(JSON.stringify({
-                type: 'error',
-                code: 'VALIDATION',
-                errorType: 'VALIDATION',
-                message: err.message,
-                category: 'validation',
-                retryable: false,
-                transient: false,
-                suggestion: 'Set active project with: baz project use <id>',
-                continue: false,
-            }));
-        }
-        else {
-            error(err.message);
-        }
-        process.exit(64); // Input error exit code
+        emitCliError({
+            type: 'error',
+            code: 'VALIDATION',
+            errorType: 'VALIDATION',
+            message: err.message,
+            category: 'validation',
+            retryable: false,
+            transient: false,
+            suggestion: 'Set active project with: baz project use <id>',
+            continue: false,
+            exitCode: 64,
+        }, err.message);
     }
     // Get prompt text: --file takes precedence, then positional arg
     let promptText = text || '';
@@ -98,46 +99,83 @@ export const promptCommand = new Command('prompt')
             promptText = readFileSync(options.file, 'utf-8').trim();
         }
         catch (err) {
-            error(`Failed to read file: ${options.file}`);
-            process.exit(1);
+            emitCliError({
+                type: 'error',
+                code: 'VALIDATION',
+                errorType: 'VALIDATION',
+                message: `Failed to read file: ${options.file}`,
+                category: 'validation',
+                retryable: false,
+                transient: false,
+                continue: false,
+                exitCode: 64,
+            }, `Failed to read file: ${options.file}`);
         }
     }
     if (!promptText) {
-        error('No prompt provided. Pass text as argument or use --file <path>');
-        process.exit(1);
+        emitCliError({
+            type: 'error',
+            code: 'VALIDATION',
+            errorType: 'VALIDATION',
+            message: 'No prompt provided. Pass text as argument or use --file <path>',
+            category: 'validation',
+            retryable: false,
+            transient: false,
+            continue: false,
+            exitCode: 64,
+        }, 'No prompt provided. Pass text as argument or use --file <path>');
     }
     // Determine mode
     const mode = options.max ? 'agent-max' : options.mode;
     // Handle image uploads
     const imageUrls = [];
     if (options.image && options.image.length > 0) {
-        const uploadSpinner = ora('Uploading images...').start();
+        const uploadSpinner = (streamJson || jsonOutput) ? null : ora('Uploading images...').start();
         try {
             for (const imagePath of options.image) {
                 if (!existsSync(imagePath)) {
-                    uploadSpinner.fail();
-                    error(`Image file not found: ${imagePath}`);
-                    process.exit(1);
+                    uploadSpinner?.fail();
+                    emitCliError({
+                        type: 'error',
+                        code: 'NOT_FOUND',
+                        errorType: 'NOT_FOUND',
+                        message: `Image file not found: ${imagePath}`,
+                        category: 'validation',
+                        retryable: false,
+                        transient: false,
+                        continue: false,
+                        exitCode: 64,
+                    }, `Image file not found: ${imagePath}`);
                 }
                 const imageBuffer = readFileSync(imagePath);
                 const url = await uploadImage(config, { projectId, buffer: imageBuffer, filename: imagePath });
                 imageUrls.push(url);
             }
-            uploadSpinner.succeed(`Uploaded ${imageUrls.length} image${imageUrls.length > 1 ? 's' : ''}`);
+            uploadSpinner?.succeed(`Uploaded ${imageUrls.length} image${imageUrls.length > 1 ? 's' : ''}`);
         }
         catch (err) {
-            uploadSpinner.fail();
+            uploadSpinner?.fail();
             const errMsg = err instanceof ApiError
                 ? `${err.message}${err.suggestion ? ` — ${err.suggestion}` : ''}`
                 : err.message;
-            error(`Failed to upload images: ${errMsg}`);
-            process.exit(1);
+            emitCliError({
+                type: 'error',
+                code: err instanceof ApiError ? err.code : 'UNKNOWN',
+                errorType: err instanceof ApiError ? err.code : 'UNKNOWN',
+                message: `Failed to upload images: ${errMsg}`,
+                category: err instanceof ApiError ? err.category : 'fatal',
+                retryable: err instanceof ApiError ? err.retryable : false,
+                transient: err instanceof ApiError ? err.transient : false,
+                suggestion: err instanceof ApiError ? err.suggestion : undefined,
+                continue: false,
+                exitCode: err instanceof ApiError ? err.exitCode : 1,
+            }, `Failed to upload images: ${errMsg}`);
         }
     }
     // Handle URL attachments
     const urlContents = [];
     if (options.url && options.url.length > 0) {
-        const urlSpinner = ora('Fetching URLs...').start();
+        const urlSpinner = (streamJson || jsonOutput) ? null : ora('Fetching URLs...').start();
         try {
             for (const url of options.url) {
                 const result = await fetchUrlContent(url);
@@ -147,15 +185,25 @@ export const promptCommand = new Command('prompt')
                     content: result.content.slice(0, 10000), // Limit content length
                 });
             }
-            urlSpinner.succeed(`Fetched ${urlContents.length} URL${urlContents.length > 1 ? 's' : ''}`);
+            urlSpinner?.succeed(`Fetched ${urlContents.length} URL${urlContents.length > 1 ? 's' : ''}`);
         }
         catch (err) {
-            urlSpinner.fail();
+            urlSpinner?.fail();
             const errMsg = err instanceof ApiError
                 ? `${err.message}${err.details ? ` — ${err.details}` : ''}`
                 : err.message;
-            error(`Failed to fetch URL: ${errMsg}`);
-            process.exit(1);
+            emitCliError({
+                type: 'error',
+                code: err instanceof ApiError ? err.code : 'UNKNOWN',
+                errorType: err instanceof ApiError ? err.code : 'UNKNOWN',
+                message: `Failed to fetch URL: ${errMsg}`,
+                category: err instanceof ApiError ? err.category : 'fatal',
+                retryable: err instanceof ApiError ? err.retryable : false,
+                transient: err instanceof ApiError ? err.transient : false,
+                suggestion: err instanceof ApiError ? err.suggestion : undefined,
+                continue: false,
+                exitCode: err instanceof ApiError ? err.exitCode : 1,
+            }, `Failed to fetch URL: ${errMsg}`);
         }
         // Prepend URL content to the prompt
         if (urlContents.length > 0) {
@@ -163,8 +211,6 @@ export const promptCommand = new Command('prompt')
             promptText = `${urlContext}\n\n---\n\nUser request: ${promptText}`;
         }
     }
-    // For bots: --stream-json outputs NDJSON (newline-delimited JSON) with timestamps
-    const streamJson = options.streamJson === true || agentModeEnv;
     // Show mode info (skip for JSON modes)
     if (!jsonOutput && !streamJson && options.stream !== false) {
         console.log(chalk.cyan(`Mode: ${mode}`));
@@ -231,6 +277,15 @@ export const promptCommand = new Command('prompt')
     // Track budget from complete event for summary
     let budgetData;
     try {
+        // Resolve model alias to full model ID
+        const MODEL_ALIASES = {
+            fast: 'claude-haiku-4-5',
+            max: 'claude-opus-4-6',
+            default: 'claude-sonnet-4-5',
+        };
+        const resolvedModel = options.model
+            ? MODEL_ALIASES[options.model] || options.model
+            : undefined; // Let api.ts default (Sonnet) handle it
         const result = await streamGeneration(config, {
             projectId,
             prompt: promptText,
@@ -240,6 +295,7 @@ export const promptCommand = new Command('prompt')
             planOnly: options.plan, // Handshake: create plan without executing
             requirements: options.requirements, // Requirements for verification
             budgetUsd: options.budget, // Per-run budget in USD
+            modelOverride: resolvedModel,
             onEvent: options.stream !== false ? (event) => {
                 // Handle streaming output
                 // Stream JSON / JSON mode: output raw event lines, but still track plan/workflow for summaries.

package/dist/commands/scenes.js

@@ -110,7 +110,7 @@ scenesCommand
                 hasCode: Boolean(s.tsxCode),
                 hasCompilationError: Boolean(s.compilationError),
             }));
-            output(lean, { json: true });
+            output(lean, { json: true, compact: globalOpts.compact });
             return;
         }
         if (!scenes || scenes.length === 0) {
@@ -246,7 +246,7 @@ scenesCommand
             const code = scene.tsxCode || '// No code available';
             const name = scene.name || 'Untitled';
             if (globalOpts.json) {
-                output({ sceneId, name, code }, { json: true });
+                output({ sceneId, name, code }, { json: true, compact: globalOpts.compact });
                 return;
             }
             if (options.output) {
@@ -310,7 +310,7 @@ scenesCommand
         const confirmed = await confirmAction(`Delete scene ${sceneId}? This cannot be undone.`);
         if (!confirmed) {
             if (globalOpts.json) {
-                output({ deleted: false, sceneId, reason: 'cancelled' }, { json: true });
+                output({ deleted: false, sceneId, reason: 'cancelled' }, { json: true, compact: globalOpts.compact });
                 return;
             }
             console.log(chalk.gray('Cancelled. Use --force to skip confirmation.'));
@@ -325,7 +325,7 @@ scenesCommand
         });
         spinner?.stop();
         if (globalOpts.json) {
-            output({ deleted: true, sceneId, projectId }, { json: true });
+            output({ deleted: true, sceneId, projectId }, { json: true, compact: globalOpts.compact });
             return;
         }
         success(`Deleted scene: ${sceneId}`);

package/dist/commands/status.js

@@ -2,8 +2,8 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import ora from 'ora';
 import { loadConfig, hasAuth, getProjectId } from '../lib/config.js';
-import { apiRequest } from '../lib/api.js';
-import { error, formatDuration } from '../lib/output.js';
+import { apiRequest, ApiError } from '../lib/api.js';
+import { error, formatDuration, output } from '../lib/output.js';
 /**
  * Render an ASCII timeline of scenes
  */
@@ -79,7 +79,7 @@ export const statusCommand = new Command('status')
     });
     if (!hasAuth(config)) {
         if (globalOpts.json) {
-            console.log(JSON.stringify({
+            output({
                 type: 'error',
                 code: 'AUTH_MISSING',
                 message: 'Not authenticated',
@@ -88,7 +88,7 @@ export const statusCommand = new Command('status')
                 transient: false,
                 exitCode: 13,
                 suggestion: 'Run: baz auth login <api-key>',
-            }));
+            }, { json: true, compact: globalOpts.compact });
         }
         else {
             error('Not authenticated', 'Run: baz auth login <api-key>');
@@ -101,7 +101,7 @@ export const statusCommand = new Command('status')
     }
     catch (err) {
         if (globalOpts.json) {
-            console.log(JSON.stringify({
+            output({
                 type: 'error',
                 code: 'VALIDATION',
                 message: err.message,
@@ -109,14 +109,14 @@ export const statusCommand = new Command('status')
                 retryable: false,
                 transient: false,
                 exitCode: 64,
-            }));
+            }, { json: true, compact: globalOpts.compact });
         }
         else {
             error(err.message);
         }
         process.exit(64);
     }
-    const spinner = ora('Fetching project status...').start();
+    const spinner = globalOpts.json ? null : ora('Fetching project status...').start();
     try {
         // Use full project query as canonical source of scene state.
         const projectResult = await apiRequest(config, 'project.getFullProject', {
@@ -124,7 +124,7 @@ export const statusCommand = new Command('status')
             include: ['scenes'],
             includeSceneCode: false,
         });
-        spinner.stop();
+        spinner?.stop();
         const project = projectResult.project || projectResult;
         const scenes = projectResult.scenes || [];
         const fps = 30;
@@ -149,7 +149,7 @@ export const statusCommand = new Command('status')
         const trackCount = trackSet.size || 1;
         // JSON output
         if (globalOpts.json) {
-            console.log(JSON.stringify({
+            output({
                 projectId,
                 title: project.title || 'Untitled',
                 scenes: scenes.length,
@@ -164,7 +164,7 @@ export const statusCommand = new Command('status')
                     durationInFrames: getDurationFrames(s),
                     hasError: hasError(s),
                 })),
-            }, null, 2));
+            }, { json: true, compact: globalOpts.compact });
             return;
         }
         // Pretty output
@@ -212,8 +212,30 @@ export const statusCommand = new Command('status')
         console.log();
     }
     catch (err) {
-        spinner.stop();
-        error(err.message);
+        spinner?.stop();
+        if (err instanceof ApiError) {
+            if (globalOpts.json) {
+                output(err.toJSON(), { json: true, compact: globalOpts.compact });
+            }
+            else {
+                error(err.message, err.suggestion);
+            }
+            process.exit(err.exitCode);
+        }
+        if (globalOpts.json) {
+            output({
+                type: 'error',
+                code: 'UNKNOWN',
+                message: err.message,
+                category: 'fatal',
+                retryable: false,
+                transient: false,
+                exitCode: 1,
+            }, { json: true, compact: globalOpts.compact });
+        }
+        else {
+            error(err.message);
+        }
         process.exit(1);
     }
 });

package/dist/lib/api.d.ts

@@ -138,6 +138,8 @@ export declare function streamGeneration(config: Config, options: {
     requirements?: string;
     /** Per-run budget in USD (default: server decides, typically $5) */
     budgetUsd?: number;
+    /** Model override (default: claude-sonnet-4-5 for CLI) */
+    modelOverride?: string;
 }): Promise<StreamResult>;
 export interface StreamEvent {
     type: 'thinking' | 'tool_use' | 'code_gen' | 'compile' | 'scene_created' | 'scene_updated' | 'error' | 'complete' | 'text' | 'recipe_created' | 'workflow_created' | 'video_plan_created' | 'awaiting_approval' | 'ready' | 'asset_generated' | 'raw';

package/dist/lib/api.js

@@ -522,6 +522,8 @@ export async function streamGeneration(config, options) {
             requirements: options.requirements,
             // Budget control
             ...(options.budgetUsd != null && options.budgetUsd > 0 ? { budgetUsd: options.budgetUsd } : {}),
+            // Model — CLI defaults to Sonnet to keep costs reasonable
+            modelOverride: options.modelOverride || 'claude-sonnet-4-5',
         }),
     });
     if (!response.ok) {

package/dist/lib/config.d.ts

@@ -7,6 +7,7 @@ export interface Config {
         outputFormat?: 'pretty' | 'json';
     };
 }
+export declare const PRODUCTION_API_URL = "https://bazaar.it";
 /**
  * Load config from file, environment, and CLI options
  */
@@ -18,7 +19,9 @@ export declare function loadConfig(options?: {
 /**
  * Save config to file
  */
-export declare function saveConfig(updates: Partial<Config>): void;
+export declare function saveConfig(updates: Partial<Config>, options?: {
+    configPath?: string;
+}): void;
 /**
  * Get active project ID or throw if not set
  */
@@ -30,4 +33,4 @@ export declare function hasAuth(config: Config): boolean;
 /**
  * Get config file path for display
  */
-export declare function getConfigPath(): string;
+export declare function getConfigPath(configPath?: string): string;

package/dist/lib/config.js

@@ -1,8 +1,12 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { homedir } from 'os';
-import { join } from 'path';
+import { dirname, join } from 'path';
+export const PRODUCTION_API_URL = 'https://bazaar.it';
+const KNOWN_STAGING_API_URLS = new Set([
+    'https://coco.bazaar.it',
+]);
 const DEFAULT_CONFIG = {
-    apiUrl: 'https://bazaar.it',
+    apiUrl: PRODUCTION_API_URL,
     defaults: {
         mode: 'agent',
         outputFormat: 'pretty',
@@ -10,6 +14,15 @@ const DEFAULT_CONFIG = {
 };
 const CONFIG_DIR = join(homedir(), '.bazaar');
 const CONFIG_FILE = join(CONFIG_DIR, 'config.json');
+function normalizeApiUrl(apiUrl, options) {
+    const normalized = (apiUrl || PRODUCTION_API_URL).trim().replace(/\/+$/, '');
+    // Guard against accidentally shipping/sticking users on staging.
+    // Staging is still allowed via explicit override: --api-url, BAZ_API_URL, or BAZ_ALLOW_STAGING=1.
+    if (!options?.allowKnownStaging && KNOWN_STAGING_API_URLS.has(normalized)) {
+        return PRODUCTION_API_URL;
+    }
+    return normalized;
+}
 /**
  * Load config from file, environment, and CLI options
  */
@@ -48,21 +61,27 @@ export function loadConfig(options) {
     if (options?.projectId) {
         config.activeProjectId = options.projectId;
     }
+    const allowKnownStaging = process.env.BAZ_ALLOW_STAGING === '1' ||
+        Boolean(process.env.BAZ_API_URL) ||
+        Boolean(options?.apiUrl);
+    config.apiUrl = normalizeApiUrl(config.apiUrl, { allowKnownStaging });
     return config;
 }
 /**
  * Save config to file
  */
-export function saveConfig(updates) {
+export function saveConfig(updates, options) {
+    const configPath = options?.configPath || CONFIG_FILE;
+    const configDir = dirname(configPath);
     // Ensure directory exists
-    if (!existsSync(CONFIG_DIR)) {
-        mkdirSync(CONFIG_DIR, { recursive: true });
+    if (!existsSync(configDir)) {
+        mkdirSync(configDir, { recursive: true });
     }
     // Load existing config
     let config = { ...DEFAULT_CONFIG };
-    if (existsSync(CONFIG_FILE)) {
+    if (existsSync(configPath)) {
         try {
-            const fileContent = readFileSync(CONFIG_FILE, 'utf-8');
+            const fileContent = readFileSync(configPath, 'utf-8');
             config = { ...config, ...JSON.parse(fileContent) };
         }
         catch {
@@ -71,8 +90,11 @@ export function saveConfig(updates) {
     }
     // Apply updates
     config = { ...config, ...updates };
+    const allowKnownStaging = process.env.BAZ_ALLOW_STAGING === '1' ||
+        Object.prototype.hasOwnProperty.call(updates, 'apiUrl');
+    config.apiUrl = normalizeApiUrl(config.apiUrl, { allowKnownStaging });
     // Write back
-    writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+    writeFileSync(configPath, JSON.stringify(config, null, 2));
 }
 /**
  * Get active project ID or throw if not set
@@ -94,6 +116,6 @@ export function hasAuth(config) {
 /**
  * Get config file path for display
  */
-export function getConfigPath() {
-    return CONFIG_FILE;
+export function getConfigPath(configPath) {
+    return configPath || CONFIG_FILE;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bazaar.it",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "AI-powered motion graphics from the command line — bazaar.it",
   "type": "module",
   "main": "dist/index.js",