veodl 1.9.0 → 1.10.0

package/src/cli.js

@@ -7,9 +7,10 @@ import { createInterface } from 'node:readline/promises';
 import { createReporter } from './progress.js';
 import { openFile } from './open-file.js';
 import { maybeUpdateNotice, updateMain, UPDATE_HELP, defaultRegistry, packageVersion } from './updater.js';
-import { applyProfile, configMain, loadConfig } from './config.js';
+import { applyProfile, configMain, loadConfig, profileMain, selectedProfileName } from './config.js';
 import { validateItems, describeEstimate } from './playlist.js';
-import { parseSourceTimeout } from './source-discovery.js';
+import { parseSourceTimeout } from './source-discovery.js';
+import { explainUnknownOption, optionSpellings, suggestOption } from './option-suggestions.js';
 import { retryOptions, runJob, jobFilePath } from './jobs.js';
 import { QUALITIES, VIDEO_FORMATS, AUDIO_FORMATS, validateUrl, readableError, cleanText, validateCookieFile, validateBrowserSpec, cookieFileWarning } from './utils.js';
 
@@ -57,7 +58,7 @@ Options:
   --resume                 Keep partial data and continue an interrupted download
   --list-formats           Show the available formats and exit
   --list-sources           Find video sources loaded by a web page and exit
-  --auto-list-sources      Search automatically after no downloadable video is found
+  --auto-list-sources      Search after no video is found (default: on)
   --source <n>             Select source number from that page (also for scripts)
   --deep-scan              Check every media candidate found during source search
   --timeout <duration>     Source search deadline, e.g. 30, 30s or 2m (5s-10m)
@@ -88,7 +89,8 @@ Commands:
   veo alias list|add|remove  Manage extra command names (wrappers calling veo)
   veo uninstall [-p <name>]  Remove one alias, or everything with --yes
   veo version              Show the installed version
-  veo config edit|path|profiles|check|show|reset  Manage defaults and named profiles
+  veo config edit|path|profiles|guide|check|show|reset  Manage defaults and named profiles
+  veo profile [list|reset|name]  Show, list or change the default profile
   veo config edit [--external|--terminal]      Choose the configuration editor
 
 Run veo without arguments in a terminal for interactive setup.
@@ -197,11 +199,11 @@ export function optionDefaults(config = {}) {
     timeout: config.timeout,
     'deep-scan': config.deepScan ?? false,
     'list-sources': config.listSources ?? false,
-    'auto-list-sources': config.autoListSources ?? false,
+    'auto-list-sources': config.autoListSources ?? true,
   };
 }
 
-export function cliOptions(config = {}) {
+export function cliOptions(config = {}) {
   const defaults = optionDefaults(config);
   const options = {};
   for (const [name, extra] of Object.entries(STRING_OPTIONS)) {
@@ -213,7 +215,42 @@ export function cliOptions(config = {}) {
     if (defaults[name] !== undefined) options[name].default = defaults[name];
   }
   return options;
-}
+}
+
+const COMMAND_FLAGS = {
+  stats: ['--json'], history: ['--json', '--limit', '--failed'],
+  runs: ['--json'], stop: [], flush: ['--stats'],
+  inspect: ['--json', '--check-audio', '--search'],
+  doctor: ['--offline', '--output', '-o'],
+  update: ['--check'], up: ['--check'], upgrade: ['--check'], check: ['--check'],
+  backend: ['--check', '--keep-files'],
+  alias: ['--json', '--force', '--bin-dir'],
+  uninstall: ['--prefix', '-p', '--yes', '--keep-cache', '--keep-config', '--keep-aliases', '--json', '--bin-dir'],
+  config: ['--profile', '--external', '--terminal'],
+  profile: [],
+};
+const COMMAND_NAMES = [...Object.keys(COMMAND_FLAGS), 'retry', 'help', 'version'];
+
+function mistypedCommandOption(args) {
+  const command = args[0];
+  if (command && !command.startsWith('-') && !COMMAND_NAMES.includes(command)) {
+    const suggestion = suggestOption(command, COMMAND_NAMES);
+    if (suggestion) return `Unknown command "${command}". Did you mean "${suggestion}"?`;
+  }
+  const options = Object.hasOwn(COMMAND_FLAGS, command)
+    ? [...COMMAND_FLAGS[command], '--help', '-h', '--no-color', '--color', '--profile']
+    : command === 'retry' ? [...optionSpellings(cliOptions()), '--last'] : null;
+  if (!options) return null; // Download flags are checked by parseCli itself.
+  const start = ['config', 'backend', 'alias'].includes(command) && args[1] && !args[1].startsWith('-') ? 2 : 1;
+  for (const arg of args.slice(start)) {
+    if (arg === '--') break;
+    const name = arg.split('=')[0];
+    if (!name.startsWith('-') || options.includes(name)) continue;
+    const suggestion = suggestOption(name, options);
+    if (suggestion) return `Unknown option "${name}". Did you mean "${suggestion}"?`;
+  }
+  return null;
+}
 
 export function parseCli(args, { config = {} } = {}) {
   if (args[0] === 'help') args = ['--help', ...args.slice(1)];
@@ -221,9 +258,15 @@ export function parseCli(args, { config = {} } = {}) {
     if (args.length !== 1) throw new Error('Usage: veo version');
     return { version: true };
   }
-  const preliminary = parseArgs({ args, allowPositionals: true, strict: true, allowNegative: true, options: cliOptions() });
-  config = applyProfile(config, preliminary.values.profile);
-  const { values, positionals, tokens } = parseArgs({ args, tokens: true, allowNegative: true, allowPositionals: true, strict: true, options: cliOptions(config) });
+  let preliminary;
+  try { preliminary = parseArgs({ args, allowPositionals: true, strict: true, allowNegative: true, options: cliOptions() }); }
+  catch (error) { throw explainUnknownOption(error, cliOptions()); }
+  const profileName = selectedProfileName(config, preliminary.values.profile);
+  config = applyProfile(config, preliminary.values.profile);
+  let parsed;
+  try { parsed = parseArgs({ args, tokens: true, allowNegative: true, allowPositionals: true, strict: true, options: cliOptions(config) }); }
+  catch (error) { throw explainUnknownOption(error, cliOptions(config)); }
+  const { values, positionals, tokens } = parsed;
   if (values.help || values.version) return values;
   // A stored default conflicting with a flag typed right now is a user error;
   // a stored default merely ignored by another flag is not.
@@ -300,15 +343,18 @@ export function parseCli(args, { config = {} } = {}) {
   if (options.rename && options.filenameTemplate) throw new Error('--rename and --filename-template cannot be combined.');
   const disableSubs = values.subs === false && tokens.some(token => token.name === 'subs');
   if (options.subLangs && !disableSubs) options.subs = true;
-  if (disableSubs) {
-    options.subLangs = undefined;
-    options.embedSubs = false;
-  }
-  return options;
-}
+  if (disableSubs) {
+    options.subLangs = undefined;
+    options.embedSubs = false;
+  }
+  options.profile = profileName;
+  return options;
+}
 
-export async function main(args = process.argv.slice(2), { config } = {}) {
-  if (args[0] === 'help') args = ['--help', ...args.slice(1)];
+export async function main(args = process.argv.slice(2), { config } = {}) {
+  if (args[0] === 'help') args = ['--help', ...args.slice(1)];
+  const mistyped = mistypedCommandOption(args);
+  if (mistyped) { process.stderr.write(`veo: ${mistyped}\n`); return 1; }
   let color = !args.includes('--no-color') && !args.includes('--json');
   let display;
   try {
@@ -375,7 +421,7 @@ async function runMain(args, { config }) {
     try { return await (await import('./runs.js')).stopMain(args.slice(1)); }
     catch (error) { stderr.write(`veo: ${readableError(error)}\n`); return 1; }
   }
-  if (args[0] === 'retry') {
+  if (args[0] === 'retry') {
     if (args[1] !== '--last') {
       stderr.write('veo: Usage: veo retry --last [download options]\n');
       return 1;
@@ -384,8 +430,12 @@ async function runMain(args, { config }) {
       const { latestFailedJob } = await import('./jobs.js');
       args = ['--retry-failed', await latestFailedJob(), ...args.slice(2)];
     } catch (error) { stderr.write(`veo: ${readableError(error)}\n`); return 1; }
-  }
-  const { cleanupDownloadCache } = await import('./download-cache.js');
+  }
+  if (args[0] === 'profile') {
+    try { return await profileMain(args.slice(1)); }
+    catch (error) { stderr.write(`veo: ${readableError(error)}\n`); return 1; }
+  }
+  const { cleanupDownloadCache } = await import('./download-cache.js');
   await cleanupDownloadCache().catch(error => stderr.write(`veo: Could not clean expired local downloads: ${readableError(error)}\n`));
   // update/upgrade/up/check subcommands are handled before URL validation.
   if (['update', 'up', 'upgrade', 'check'].includes(args[0])) {
@@ -396,10 +446,10 @@ async function runMain(args, { config }) {
     }
     return updateMain(args, { registry: defaultRegistry() });
   }
-  if (args[0] === 'config') {
-    try { return await configMain(args.slice(1)); }
-    catch (error) { stderr.write(`veo: ${readableError(error)}\n`); return 1; }
-  }
+  if (args[0] === 'config') {
+    try { return await configMain(args.slice(1)); }
+    catch (error) { stderr.write(`veo: ${readableError(error)}\n`); return 1; }
+  }
   if (args[0] === 'doctor') {
     try {
       const { doctorMain } = await import('./doctor.js');
@@ -465,7 +515,14 @@ async function runMain(args, { config }) {
       retryItems = await retryOptions(options.retryFailed);
       // Revalidate stored options and apply only flags explicitly supplied now.
       const retryArgs = args.filter((arg, index) => arg !== '--retry-failed' && args[index - 1] !== '--retry-failed' && !arg.startsWith('--retry-failed='));
-      retryItems = retryItems.map(item => parseCli([item.url, ...retryArgs], { config: { ...item, profiles: loaded.config?.profiles } }));
+      const overrideProfile = retryArgs.some(arg => arg === '--profile' || arg.startsWith('--profile='));
+      retryItems = retryItems.map(item => {
+        const resumed = parseCli([item.url, ...retryArgs], { config: overrideProfile
+          ? { ...item, profiles: loaded.config?.profiles }
+          : item });
+        if (!overrideProfile) resumed.profile = item.profile;
+        return resumed;
+      });
       options = { ...retryItems[0], urls: retryItems.map(item => item.url) };
     }
     if (options.batchFile) {
@@ -479,17 +536,22 @@ async function runMain(args, { config }) {
     // The job file is created before the first download, so another terminal can
     // follow this run's per-item progress with `veo runs <id>`.
     const jobFile = options.listFormats || options.listSources || options.dryRun ? null : jobFilePath();
-    await run?.describe({ urls: options.urls, output: options.output ? path.resolve(options.output) : null,
-      audio: options.audio, quality: options.quality, format: options.format, playlist: options.playlist, job: jobFile });
-    reporter.configure?.({ color: options.color && !options.json });
-    reporter.start(options.rename);
-    const cookieWarning = cookieFileWarning(options.cookies);
+    await run?.describe({ urls: options.urls, output: options.output ? path.resolve(options.output) : null,
+      audio: options.audio, quality: options.quality, format: options.format, profile: options.profile || null,
+      playlist: options.playlist, job: jobFile });
+    reporter.configure?.({ color: options.color && !options.json });
+    reporter.start(options.rename);
+    if (!options.dryRun && !options.listFormats && !options.listSources) reporter.profile(options.profile);
+    const preparedBackends = new Map();
+    const reuseBackend = request => preparedBackends.has(request.url) ? async () => preparedBackends.get(request.url) : undefined;
+    const cookieWarning = cookieFileWarning(options.cookies);
     if (cookieWarning) stderr.write(`veo: ${cookieWarning}\n`);
 
     // For a single page, fall back to media requests observed while its player loads.
     // Explicit --source always rediscovers: signed media URLs can expire between runs.
     if (!retryItems && options.urls.length === 1 && (!options.playlist || options.listSources)) {
-      const discovery = await resolvePageSource(options, { signal: controller.signal, stderr });
+      const discovery = await resolvePageSource(options, { signal: controller.signal, stderr, reporter,
+        onBackend: backend => preparedBackends.set(options.url, backend) });
       if (options.listSources) {
         if (options.json) stdout.write(`${JSON.stringify({ url: options.url, status: 'sources', timedOut: Boolean(discovery.sources.timedOut), sources: discovery.sources.map(({ url, pageUrl, ...safe }) => safe) })}\n`);
         else for (const source of discovery.sources) stdout.write(`${discovery.formatSource(source)}\n`);
@@ -512,20 +574,21 @@ async function runMain(args, { config }) {
     }
     if (retryItems) for (const item of retryItems) {
       if (!item.source) continue;
-      const discovery = await resolvePageSource(item, { signal: controller.signal, stderr });
+      const discovery = await resolvePageSource(item, { signal: controller.signal, stderr, reporter,
+        onBackend: backend => preparedBackends.set(item.url, backend) });
       item.mediaUrl = discovery.mediaUrl;
     }
 
     if (options.listFormats) {
       const { listFormats } = await import('./downloader.js');
-      stdout.write(await listFormats(options, { signal: controller.signal, reporter }));
+      stdout.write(await listFormats(options, { signal: controller.signal, reporter, backendResolver: reuseBackend(options) }));
       return 0;
     }
     if (options.dryRun) {
       const { planDownload } = await import('./downloader.js');
       for (const request of retryItems || options.urls.map(url => ({ ...options, url }))) {
         const { url } = request;
-        const plan = await planDownload(request, { signal: controller.signal, reporter });
+        const plan = await planDownload(request, { signal: controller.signal, reporter, backendResolver: reuseBackend(request) });
         if (options.json) stdout.write(`${JSON.stringify({ url, status: 'planned', ...plan })}\n`);
         else {
           stdout.write(`URL: ${url}\n`);
@@ -539,7 +602,8 @@ async function runMain(args, { config }) {
     const { download } = await import('./downloader.js');
     const { createStatsRecorder } = await import('./stats.js');
     const { createHistoryRecorder } = await import('./history.js');
-    const result = await runJob(options, { download, reporter, signal: controller.signal, openFile, items: retryItems, jobFile: jobFile || undefined, runId: run?.id, recordStats: createStatsRecorder(), recordHistory: createHistoryRecorder() });
+    const result = await runJob(options, { download: (request, dependencies) => download(request, { ...dependencies, backendResolver: reuseBackend(request) }),
+      reporter, signal: controller.signal, openFile, items: retryItems, jobFile: jobFile || undefined, runId: run?.id, recordStats: createStatsRecorder(), recordHistory: createHistoryRecorder() });
     return result;
   } catch (error) {
     reporter.fail(controller.signal.aborted);
@@ -558,11 +622,12 @@ async function askSourceQuestion(prompt, signal) {
   finally { rl.close(); }
 }
 
-export async function resolvePageSource(options, { signal, stderr, inspect, discover, ask = askSourceQuestion,
-  backendResolver, interactive = Boolean(process.stdin.isTTY && process.stderr.isTTY && !options.json) }) {
+export async function resolvePageSource(options, { signal, stderr, reporter, onBackend, inspect, discover, ask = askSourceQuestion,
+  backendResolver, interactive = Boolean(process.stdin.isTTY && process.stderr.isTTY && !options.json) }) {
   const { fetchMetadata, prepareBackend, runBackend } = await import('./downloader.js');
   const { discoverSources, formatSource, shouldOfferSourceDiscovery } = await import('./source-discovery.js');
-  const backend = inspect ? null : await (backendResolver || prepareBackend)(options, { signal });
+  const backend = inspect ? null : await (backendResolver || prepareBackend)(options, { signal, reporter });
+  if (backend) onBackend?.(backend);
   const inspectMedia = (request, requestSignal = signal) => inspect ? inspect(request, requestSignal) : fetchMetadata(request, { signal: requestSignal, backend, runner: runBackend });
   let originalError;
   if (!options.source && !options.listSources) {
@@ -573,13 +638,10 @@ export async function resolvePageSource(options, { signal, stderr, inspect, disc
       }
       return {};
     }
-    catch (error) { originalError = error; }
-    if (!shouldOfferSourceDiscovery(originalError)) throw originalError;
-    if (!interactive && !options.autoListSources) throw new Error(`${originalError.message} Use --list-sources to search this page, then --source <number> to select one.`);
-    if (interactive && !options.autoListSources) {
-      const answer = (await ask('No downloadable video found. Search this page for other sources? (y/N): ', signal)).trim().toLowerCase();
-      if (!['y', 'yes'].includes(answer)) throw originalError;
-    }
+    catch (error) { originalError = error; }
+    if (!shouldOfferSourceDiscovery(originalError)) throw originalError;
+    if (options.autoListSources === false) throw new Error(`${originalError.message} Use --list-sources to search this page, then --source <number> to select one.`);
+    stderr.write('veo: No direct video found; searching the page for a playable source…\n');
   }
   let sources;
   try {
@@ -594,16 +656,18 @@ export async function resolvePageSource(options, { signal, stderr, inspect, disc
   }
   if (options.listSources) return { sources, formatSource };
   if (sources.timedOut) stderr.write(`veo: Source search timed out after ${options.timeout || (options.deepScan ? '120s' : '45s')}; showing verified sources found so far.\n`);
-  if (!sources.length) {
-    if (originalError) throw originalError;
-    throw new Error('No downloadable video sources were found on this page.');
-  }
-  let index = Number(options.source);
-  if (!index) {
-    if (!interactive && options.autoListSources) return { sources, formatSource, needsSelection: true };
-    for (const source of sources) stderr.write(`${formatSource(source)}\n`);
-    if (!interactive) throw new Error('Select a source with --source <number>.');
-    const answer = await ask('Source number (Enter to cancel): ', signal);
+  if (!sources.length) {
+    if (originalError) throw originalError;
+    throw new Error('No downloadable video sources were found on this page.');
+  }
+  let index = Number(options.source);
+  if (!index) {
+    if (sources.length === 1) index = 1;
+    else if (!interactive) return { sources, formatSource, needsSelection: true };
+  }
+  if (!index) {
+    for (const source of sources) stderr.write(`${formatSource(source)}\n`);
+    const answer = await ask('Source number (Enter to cancel): ', signal);
     if (!/^[1-9]\d*$/.test(answer.trim())) throw new Error('No source selected.');
     index = Number(answer.trim());
   }

package/src/config-diagnostics.js

@@ -1,4 +1,4 @@
-import { CONFIG_KEYS, parseConfigText, effectiveConfig, applyProfile } from './config.js';
+import { CONFIG_KEYS, RESERVED_PROFILE_NAMES, parseConfigText, effectiveConfig, applyProfile } from './config.js';
 import { stripConfigComments } from './config-template.js';
 import { QUALITIES, AUDIO_FORMATS, VIDEO_FORMATS } from './utils.js';
 
@@ -75,7 +75,7 @@ export async function semanticIssue(text) {
   if (!object(data)) return located(text, node([]), 'The config must contain a JSON object.');
   const check = (settings, path) => {
     for (const [key, value] of Object.entries(settings)) {
-      if (!path.length && ['$schema', 'profiles'].includes(key)) continue;
+      if (!path.length && ['$schema', 'profiles', 'activeProfile'].includes(key)) continue;
       const target = node([...path, key]);
       if (!Object.hasOwn(CONFIG_KEYS, key)) {
         const proposed = suggestion(key, path.length ? keys : [...keys, 'profiles', '$schema']);
@@ -90,13 +90,22 @@ export async function semanticIssue(text) {
   };
   let issue = check(data, []);
   if (issue) return issue;
-  if (Object.hasOwn(data, 'profiles')) {
-    if (!object(data.profiles)) return located(text, node(['profiles']), 'Profiles must be an object.');
-    for (const [name, profile] of Object.entries(data.profiles)) {
-      if (!object(profile)) return located(text, node(['profiles', name]), `Profile "${name}" must be an object.`);
+  if (Object.hasOwn(data, 'profiles')) {
+    if (!object(data.profiles)) return located(text, node(['profiles']), 'Profiles must be an object.');
+    for (const [name, profile] of Object.entries(data.profiles)) {
+      if (RESERVED_PROFILE_NAMES.includes(name)) {
+        return located(text, node(['profiles', name]), `Profile name "${name}" is reserved for veo profile ${name}. Rename this profile.`, true);
+      }
+      if (!object(profile)) return located(text, node(['profiles', name]), `Profile "${name}" must be an object.`);
       issue = check(profile, ['profiles', name]); if (issue) return issue;
     }
-  }
+  }
+  if (Object.hasOwn(data, 'activeProfile')) {
+    if (typeof data.activeProfile !== 'string' || !data.activeProfile) return located(text, node(['activeProfile']), '"activeProfile" must be a non-empty profile name.');
+    if (!object(data.profiles) || !Object.hasOwn(data.profiles, data.activeProfile)) {
+      return located(text, node(['activeProfile']), `Unknown active profile "${data.activeProfile}". Choose: ${Object.keys(data.profiles || {}).join(', ') || 'none'}.`, false, Object.keys(data.profiles || {}));
+    }
+  }
   const { config } = parseConfigText(text);
   for (const profile of [undefined, ...Object.keys(config.profiles || {})]) {
     try { await effectiveConfig(config, profile); }
@@ -105,7 +114,7 @@ export async function semanticIssue(text) {
       let key = /Invalid quality/.test(message) ? 'quality' : /Invalid (?:audio|video) format/.test(message) ? 'format' :
         /output directory/.test(message) ? 'output' : /custom filename/.test(message) ? 'rename' :
           /--([a-z-]+)/.exec(message)?.[1]?.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
-      const name = profile ?? (config.profiles?.default ? 'default' : undefined);
+      const name = profile ?? config.activeProfile ?? (config.profiles?.default ? 'default' : undefined);
       const selected = applyProfile(config, profile);
       // Template errors do not name the CLI option. Locate the failing template.
       if (!key) {
@@ -134,7 +143,8 @@ export function editorCompletions(text, cursor) {
       const key = path.at(-1), property = cursor >= item.keyStart && cursor <= item.keyEnd;
       if (!property && !(cursor >= item.start && cursor <= item.end)) continue;
       const profile = path.length === 3 ? path[1] : undefined;
-      const choices = property ? (path.length === 1 ? [...keys, 'profiles', '$schema'] : keys) : valueChoices(key, applyProfile(data, profile));
+      const choices = property ? (path.length === 1 ? [...keys, 'profiles', 'activeProfile', '$schema'] : keys) :
+        key === 'activeProfile' ? Object.keys(data.profiles || {}) : valueChoices(key, applyProfile(data, profile));
       if (!choices.length) return null;
       const proposed = property ? suggestion(key, choices) : null;
       return { start: property ? item.keyStart : item.start, end: property ? item.keyEnd : item.end,