@lumenkey/cli 0.2.3 → 0.3.1

package/dist/cli/copied.js

@@ -1,27 +1,23 @@
-import crypto from 'node:crypto';
 import os from 'node:os';
+import pc from 'picocolors';
 import { describeKey, loadConfig } from '../core/config.js';
 import { assertIdempotencyKey, LumenKeyClient, LumenKeyError, validateModelType } from '../core/client.js';
-import { blankPromptSentence, errorSentence, isBlankPrompt, jobStatusText, missingModelSentence, quoteCapSentence, spendingCapSentence, ui } from '../core/locale.js';
+import { errorSentence, jobStatusText, missingModelSentence, ui } from '../core/locale.js';
 import { formatJobDetail } from '../core/job-display.js';
 import { normalizeGatewayOrigin } from '../core/origin.js';
 import { explainModel, findModels } from '../core/explain.js';
-import { applyKeyValues, asPairs, modelParameterError, validateKnownEnums } from '../core/set-values.js';
 import { createProfile, currentProfile, deleteProfile, listProfiles, ProfileMissingError, publicProfile, setNamedProfileFields, setProfile, setProfileFields, unsetProfile } from '../core/profiles.js';
-import { waitForJob } from '../core/wait.js';
-import { assertJobResult, pollJob } from '../core/poller.js';
-import { generationResult } from '../core/generation-result.js';
 import { packageVersion } from '../core/version.js';
-import { errorResult } from '../core/error-result.js';
+import { argsFromCac, cacKey, cacOptions, cliSpellings, forSurface, generationArgs, imageParams, resumeArgs, resumeParams, waitArgs } from '../core/params.js';
+import { readJob, resumeSubmission, runGeneration, waitJob } from '../core/generation.js';
+import { renderOutcome, wantsJson } from './render.js';
+export { wantsJson } from './render.js';
 const COMPLETIONS = {
     bash: `_lumenkey() {\n  local cur prev\n  cur="\${COMP_WORDS[COMP_CWORD]}"\n  prev="\${COMP_WORDS[COMP_CWORD-1]}"\n  case "$prev" in\n    model) COMPREPLY=( $(compgen -W "search get explain" -- "$cur") ) ;;\n    image) COMPREPLY=( $(compgen -W "generate" -- "$cur") ) ;;\n    tasks) COMPREPLY=( $(compgen -W "progress wait cancel" -- "$cur") ) ;;\n    profile) COMPREPLY=( $(compgen -W "list create set unset key host delete" -- "$cur") ) ;;\n    auth) COMPREPLY=( $(compgen -W "profile" -- "$cur") ) ;;\n    *) COMPREPLY=( $(compgen -W "login models video status balance chat mcp model image tasks profile auth doctor completion" -- "$cur") ) ;;\n  esac\n}\ncomplete -F _lumenkey lumenkey\n`,
     zsh: `#compdef lumenkey\n_lumenkey() {\n  if (( CURRENT == 2 )); then\n    compadd login models video status balance chat mcp model image tasks profile auth doctor completion\n  elif [[ \${words[2]} == model ]]; then\n    compadd search get explain\n  elif [[ \${words[2]} == image ]]; then\n    compadd generate\n  elif [[ \${words[2]} == tasks ]]; then\n    compadd progress wait cancel\n  fi\n}\ncompdef _lumenkey lumenkey\n`,
     tcsh: `complete lumenkey 'p/1/(login models video status balance chat mcp model image tasks profile auth doctor completion)/' 'n/model/(search get explain)/' 'n/image/(generate)/' 'n/tasks/(progress wait cancel)/'\n`,
     fish: `complete -c lumenkey -n "__fish_use_subcommand" -a "login models video status balance chat mcp model image tasks profile auth doctor completion"\ncomplete -c lumenkey -n "__fish_seen_subcommand_from model" -a "search get explain"\ncomplete -c lumenkey -n "__fish_seen_subcommand_from image" -a "generate"\ncomplete -c lumenkey -n "__fish_seen_subcommand_from tasks" -a "progress wait cancel"\n`,
 };
-export function wantsJson(argv = process.argv) {
-    return argv.includes('--json');
-}
 function spellings(name) {
     const camel = name.replace(/([a-z])-([a-z])/g, (_, a, b) => a + b.toUpperCase());
     return camel === name ? [name] : [name, camel];
@@ -50,6 +46,7 @@ export function applyRaw(options, key, names) {
         throw new Error(ui(`${names[0]} could not be read as text. Use ${names[0]} <value>.`, `${names[0]} 无法按文本读取。请使用 ${names[0]} <值>。`));
     }
 }
+/** Plain data commands (catalog, balance, profiles) print their payload; outcomes go through renderOutcome. */
 export function emit(data, human, argv = process.argv) {
     if (wantsJson(argv)) {
         console.log(JSON.stringify(data));
@@ -60,124 +57,111 @@ export function emit(data, human, argv = process.argv) {
 function client() {
     return new LumenKeyClient(loadConfig());
 }
-function propertiesOf(model) {
-    const properties = model.inputSchema?.properties;
-    if (!properties || typeof properties !== 'object' || Array.isArray(properties))
-        throw new LumenKeyError('MODEL_INPUT_SCHEMA_INVALID');
-    return properties;
-}
 export function rejectEmptyIdempotencyKey() {
     const rawKey = rawOption(['--idempotency-key']);
     if (rawKey !== undefined)
         assertIdempotencyKey(rawKey);
 }
-export function parseMaxCredits(value, label = '--max-credits', code = 'CREDIT_LIMIT_INVALID') {
-    if (value === undefined)
-        return undefined;
-    if ((typeof value !== 'string' && typeof value !== 'number') || !/^\d+$/.test(String(value)) || !Number.isSafeInteger(Number(value))) {
-        throw new LumenKeyError(code, undefined, undefined, spendingCapSentence(label));
+/** Install SIGINT/SIGTERM handling around a wait: abort the core operation and keep the conventional exit code. */
+export async function withCliSignals(run) {
+    const controller = new AbortController();
+    const interrupt = (exitCode) => { if (!controller.signal.aborted) {
+        process.exitCode = exitCode;
+        controller.abort();
+    } };
+    const sigint = () => interrupt(130);
+    const sigterm = () => interrupt(143);
+    process.on('SIGINT', sigint);
+    process.on('SIGTERM', sigterm);
+    try {
+        return await run(controller.signal);
+    }
+    finally {
+        process.off('SIGINT', sigint);
+        process.off('SIGTERM', sigterm);
     }
-    return Number(value);
 }
-export function quoteCreditLimitError(label = '--max-credits') {
-    return new LumenKeyError('QUOTE_CREDIT_LIMIT', undefined, undefined, quoteCapSentence(label));
+function progressLine(status) {
+    process.stderr.write(ui(`  Status: ${jobStatusText(status)}\n`, `  状态：${jobStatusText(status)}\n`));
 }
-export function dryRunPreview(modelId, input, model, confirm) {
-    const properties = propertiesOf(model);
-    const defaults = Object.fromEntries(Object.entries(properties).flatMap(([name, raw]) => {
-        if (!raw || typeof raw !== 'object' || Array.isArray(raw))
-            return [];
-        const spec = raw;
-        return Object.prototype.hasOwnProperty.call(spec, 'default') ? [[name, spec.default]] : [];
-    }));
-    return { dryRun: true, modelId, input, schemaDefaults: defaults, required: model.inputSchema?.required ?? [],
-        ...(confirm ? { confirmIgnored: true, notice: ui('--confirm has no effect with --dry-run. No job submitted.', '--confirm 在 --dry-run 下不会生效。没有提交任务。') } : {}) };
+/** CLI view of generation progress. In --json mode the job identity goes to stderr the moment it exists. */
+export function cliGenerationEvents() {
+    const json = wantsJson();
+    return event => {
+        switch (event.type) {
+            case 'quoting':
+                if (!json && event.kind === 'video')
+                    console.log(pc.cyan(ui(`\n🎬 Requesting quote for model: ${pc.bold(event.modelId)}...`, `\n🎬 正在为模型 ${pc.bold(event.modelId)} 获取报价...`)));
+                return;
+            case 'submitting':
+                console.error(event.resubmit
+                    ? ui(`Re-sending an earlier unconfirmed submission (idempotency key ${event.idempotencyKey}, quote ${event.quoteId}) instead of creating a new job...`, `正在重发一次之前结果未确认的提交（幂等键 ${event.idempotencyKey}，报价 ${event.quoteId}），不会新建任务...`)
+                    : ui('Submitting generation job...', '正在提交生成任务...'));
+                return;
+            case 'job_created':
+                if (json)
+                    console.error(JSON.stringify({ event: 'job_created', jobId: event.jobId, idempotencyKey: event.idempotencyKey, quoteId: event.quoteId }));
+                else
+                    console.log(ui(`Job created: ${event.jobId} (idempotency key: ${event.idempotencyKey})`, `任务已创建：${event.jobId}（幂等键：${event.idempotencyKey}）`));
+                return;
+            case 'progress':
+                progressLine(event.detail.status);
+                return;
+            case 'notice':
+                console.error(ui(`Note: ${event.text}`, `注意：${event.text}`));
+                return;
+            default:
+                return;
+        }
+    };
 }
-export async function submitQuote(modelId, input, options) {
-    const api = client();
-    api.requireKey();
-    const maxCredits = parseMaxCredits(options.maxCredits);
-    rejectEmptyIdempotencyKey();
-    const rawKey = rawOption(['--idempotency-key']);
-    if (rawKey !== undefined)
-        options.idempotencyKey = rawKey;
-    const schemaProperties = options.schemaProperties;
-    if (schemaProperties && typeof schemaProperties === 'object' && !Array.isArray(schemaProperties))
-        validateKnownEnums(schemaProperties, input);
-    const quote = await api.getQuote({ modelId, input });
-    if (maxCredits !== undefined && quote.credits > maxCredits)
-        throw quoteCreditLimitError();
-    if (!options.confirm) {
-        emit({ ...quote, submitted: false }, () => {
-            console.log(ui(`Quote ID: ${quote.quoteId} (${quote.credits} credits)`, `报价编号：${quote.quoteId}（${quote.credits} 算力点）`));
-            console.log(ui('Quote only. No job submitted.', '只完成报价，没有提交任务。'));
-        });
+export function printGeneration(result) {
+    if ('dryRun' in result) {
+        console.log(JSON.stringify(result));
         return;
     }
-    if (options.idempotencyKey !== undefined) {
-        if (typeof options.idempotencyKey !== 'string')
-            throw new LumenKeyError('IDEMPOTENCY_INPUT_INVALID');
-        assertIdempotencyKey(options.idempotencyKey);
-    }
-    const key = options.idempotencyKey === undefined ? crypto.randomUUID() : String(options.idempotencyKey);
-    console.error(ui('Submitting generation job...', '正在提交生成任务...'));
-    const projectId = options.projectId == null || options.projectId === '' ? undefined : String(options.projectId);
-    const job = await api.createJob({ quoteId: quote.quoteId, projectId, input }, key);
-    if (!options.suppressEmit)
-        emit({ ...job, idempotencyKey: key, submitted: true }, () => console.log(ui(`Job created: ${job.jobId}`, `任务已创建：${job.jobId}`)));
-    return { jobId: job.jobId, idempotencyKey: key };
-}
-function hasDeclared(properties, key) {
-    return Object.prototype.hasOwnProperty.call(properties, key);
-}
-function assignAspect(properties, input, fields) {
-    const aspect = fields.aspect_ratio;
-    const ratio = fields.ratio;
-    if (aspect === undefined && ratio === undefined)
+    if ('requiresConfirmation' in result) {
+        console.log(ui(`Quote ID: ${result.quoteId} (${result.credits} credits)`, `报价编号：${result.quoteId}（${result.credits} 算力点）`));
+        console.log(ui('Quote only. No job submitted.', '只完成报价，没有提交任务。'));
         return;
-    const hasAspect = hasDeclared(properties, 'aspect_ratio');
-    const hasRatio = hasDeclared(properties, 'ratio');
-    if (!hasAspect && !hasRatio)
-        throw modelParameterError('MODEL_PARAM_UNKNOWN', 'aspect_ratio');
-    if (hasAspect && aspect !== undefined)
-        input.aspect_ratio = coerceDeclared(properties.aspect_ratio, aspect, 'aspect_ratio');
-    if (hasRatio && ratio !== undefined)
-        input.ratio = coerceDeclared(properties.ratio, ratio, 'ratio');
-    if (input.aspect_ratio === undefined && input.ratio === undefined) {
-        const name = hasAspect ? 'aspect_ratio' : 'ratio';
-        const value = aspect !== undefined ? aspect : ratio;
-        input[name] = coerceDeclared(properties[name], value, name);
     }
+    const done = result;
+    console.log(ui('Generation succeeded!', '生成成功！'));
+    console.log(ui(`Task: ${done.jobId}`, `任务：${done.jobId}`));
+    for (const url of done.urls)
+        console.log(url);
+    if (done.localFile)
+        console.log(ui(`Saved to ${done.localFile}`, `已保存到 ${done.localFile}`));
+    if (done.download?.ok === false)
+        console.error(ui(`Local save failed: ${done.download.error} (${done.download.code}). The generation result remains available above.`, `本机保存失败：${done.download.error}（${done.download.code}）。生成结果仍可通过以上地址获取。`));
 }
-function assignDeclared(properties, input, key, value) {
-    if (!hasDeclared(properties, key))
-        throw modelParameterError('MODEL_PARAM_UNKNOWN', key);
-    const spec = properties[key];
-    const type = spec && typeof spec === 'object' && !Array.isArray(spec) ? spec.type : undefined;
-    const scalar = value === null || value === undefined || typeof value !== 'object';
-    input[key] = scalar && (type === 'integer' || type === 'number' || type === 'string') ? coerceDeclared(spec, value, key) : value;
-}
-export async function buildGenerationInput(modelId, fields, pairs, known) {
-    client().requireKey();
-    if (typeof fields.prompt === 'string' && isBlankPrompt(fields.prompt))
-        throw new Error(blankPromptSentence('flag'));
-    const model = known?.id === modelId ? known : (await client().listModels()).find((item) => item.id === modelId);
-    if (!model)
-        throw new LumenKeyError('MODEL_NOT_IN_CATALOG');
-    const properties = propertiesOf(model);
-    const defined = Object.fromEntries(Object.entries(fields).filter(([, value]) => value !== undefined));
-    const input = {};
-    assignAspect(properties, input, defined);
-    for (const [key, value] of Object.entries(defined)) {
-        if (key === 'aspect_ratio' || key === 'ratio')
-            continue;
-        assignDeclared(properties, input, key, value);
+/** Shared by `video` and `image generate`: options come from the core spec, values go through the core normalizer, one use case, one renderer. */
+export async function runCliGeneration(kind, spec, options) {
+    // Re-read string options from raw argv so CAC's numeric coercion never changes a value such as a prompt of "007".
+    for (const param of forSurface(spec, 'cli'))
+        if (param.flag && param.kind === 'string')
+            applyRaw(options, cacKey(param.flag), cliSpellings(param));
+    rejectEmptyIdempotencyKey();
+    const request = generationArgs(kind, argsFromCac(spec, options), 'cli');
+    // CAC folds --aspect-ratio and --ratio together. Retain the supplied field spelling so the
+    // shared core can reject two different aliases (including an alias supplied through --set).
+    const aspect = rawOption(['--aspect-ratio']);
+    if (aspect !== undefined) {
+        request.fields.aspect_ratio = aspect;
+        if (rawOption(['--ratio']) === undefined)
+            delete request.fields.ratio;
     }
-    const extra = applyKeyValues({}, pairs);
-    for (const [key, value] of Object.entries(extra))
-        assignDeclared(properties, input, key, value);
-    validateKnownEnums(properties, input);
-    return { input, properties, model };
+    const api = client();
+    const outcome = await withCliSignals(signal => runGeneration(api, { ...request, signal, onEvent: cliGenerationEvents() }));
+    renderOutcome(outcome, printGeneration);
+    if (outcome.ok && 'download' in outcome && outcome.download?.ok === false && process.exitCode !== 130 && process.exitCode !== 143)
+        process.exitCode = 1;
+}
+/** Register every CLI option of a spec on a command. */
+export function registerOptions(command, spec) {
+    for (const [flags, description, config] of cacOptions(spec))
+        command = command.option(flags, description, config);
+    return command;
 }
 function printProfiles(listed) {
     if (!listed.profiles.length) {
@@ -241,84 +225,55 @@ export function registerCopied(cli) {
         }
         throw new Error(ui(`Unknown model command: ${action}`, `未知的 model 子命令：${action}`));
     });
-    cli.command('image <action>', ui('image generate', '生成图片'))
+    registerOptions(cli.command('image <action>', ui('image generate', '生成图片'))
         .example('lumenkey image generate -m wan2.7-image -p "red circle"')
-        .example('lumenkey image generate -m wan2.7-image -p "red circle" --set seed=2 --dry-run')
-        .option('-m, --model <modelId>', ui('Model id', '模型 ID'))
-        .option('-p, --prompt <prompt>', ui('Prompt', '提示词'))
-        .option('--resolution <res>', ui('Resolution, only if the catalog declares it', '分辨率，仅当目录声明了该字段'))
-        .option('--aspect-ratio <ratio>', ui('Aspect ratio, only if the catalog declares it', '宽高比，仅当目录声明了该字段'))
-        .option('--count <count>', ui('Count, only if the catalog declares it', '数量，仅当目录声明了该字段'))
-        .option('--image <image>', ui('Reference image, only if the catalog declares it', '参考图，仅当目录声明了该字段'))
-        .option('-s, --set <pair>', ui('Extra key=value. Repeatable', '额外的键=值，可重复'))
-        .option('--dry-run', ui('Print the projected input and do not quote', '只打印将提交的输入，不报价'))
-        .option('--confirm', ui('Submit this quote', '提交这次报价'))
-        .option('--idempotency-key <key>', ui('Stable operation key', '稳定的幂等键'))
-        .option('--max-credits <credits>', ui('Reject quotes above this limit', '报价超过该上限时拒绝'))
-        .option('-o, --output <outputPath>', ui('Save the first result to this path. Omit it to print the URLs only', '把第一个结果保存到该路径；省略则只打印地址'))
-        .option('--interval <seconds>', ui('Poll interval seconds after confirm', '确认后的轮询间隔（秒）'), { default: 5 })
-        .option('--timeout <seconds>', ui('Poll timeout seconds after confirm', '确认后的轮询超时（秒）'), { default: 1800 })
+        .example('lumenkey image generate -m wan2.7-image -p "red circle" --set seed=2 --dry-run'), imageParams)
         .action(async (action, options) => {
         if (action !== 'generate')
             throw new Error(ui(`Unknown image command: ${action}`, `未知的 image 子命令：${action}`));
-        applyRaw(options, 'model', ['--model', '-m']);
-        applyRaw(options, 'prompt', ['--prompt', '-p']);
-        applyRaw(options, 'resolution', ['--resolution']);
-        applyRaw(options, 'aspectRatio', ['--aspect-ratio']);
-        applyRaw(options, 'count', ['--count']);
-        applyRaw(options, 'image', ['--image']);
-        applyRaw(options, 'idempotencyKey', ['--idempotency-key']);
-        applyRaw(options, 'output', ['--output', '-o']);
-        if (!options.model)
-            throw new LumenKeyError('MODEL_REQUIRED');
-        if (isBlankPrompt(options.prompt))
-            throw new Error(blankPromptSentence('flag'));
-        parsePollOptions(options, true);
-        client().requireKey();
-        parseMaxCredits(options.maxCredits);
-        rejectEmptyIdempotencyKey();
-        const model = (await client().listModels()).find((item) => item.id === options.model);
-        if (!model)
-            throw new LumenKeyError('MODEL_NOT_IN_CATALOG');
-        const built = await buildGenerationInput(String(options.model), {
-            prompt: String(options.prompt),
-            resolution: options.resolution,
-            aspect_ratio: options.aspectRatio,
-            ratio: options.aspectRatio,
-            count: options.count,
-            image: options.image,
-        }, asPairs(options.set), model);
-        if (options.dryRun) {
-            const preview = dryRunPreview(String(options.model), built.input, model, options.confirm);
-            emit(preview, () => console.log(JSON.stringify(preview)));
-            return;
-        }
-        const created = await submitQuote(String(options.model), built.input, { ...options, schemaProperties: built.properties, suppressEmit: wantsJson() && Boolean(options.confirm) });
-        if (!created)
-            return;
-        await finishGeneration(client(), created, options);
+        await runCliGeneration('image', imageParams, options);
     });
-    cli.command('tasks <action> <jobId>', ui('tasks progress | wait | cancel', '查看进度、等待或取消任务'))
+    registerOptions(cli.command('tasks <action> [jobId]', ui('tasks progress | wait | cancel | resume', '查看进度、等待、取消任务，或重发一次记录的提交'))
         .example('lumenkey tasks progress <jobId>')
         .example('lumenkey tasks wait <jobId> --interval 5 --timeout 1800')
         .example('lumenkey tasks cancel <jobId> --yes')
-        .option('--interval <seconds>', ui('Poll interval seconds', '轮询间隔（秒）'), { default: 5 })
-        .option('--timeout <seconds>', ui('Timeout seconds', '超时（秒）'), { default: 1800 })
+        .example('lumenkey tasks resume <idempotencyKey>')
+        .example('lumenkey tasks resume --key=<idempotencyKey>   (for a key that begins with -)'), resumeParams)
         .option('--yes', ui('Confirm cancellation', '确认取消'))
-        .action(async (action, jobId, options) => {
+        .option('--key <idempotencyKey>', ui('The idempotency key for tasks resume; use --key=<key> or -- <key> when the key begins with -', 'tasks resume 的幂等键；键以 - 开头时用 --key=<键> 或 -- <键>'))
+        .action(async (action, positional, options) => {
+        // Each subcommand owns its options; any other option is as unknown here as on the MCP surface.
+        rejectForeignTaskOptions(action);
+        applyRaw(options, 'key', ['--key']);
+        const jobId = positional ?? firstDoubleDashArgument(options) ?? (typeof options.key === 'string' ? options.key : undefined);
+        if (jobId === undefined)
+            throw new UsageArgumentError(ui(`missing required args for command \`tasks ${action}\``, `命令 \`tasks ${action}\` 缺少必填参数。`));
         if (action === 'progress') {
-            const detail = await client().getJob(jobId);
-            emitJobDetail(detail);
+            renderOutcome(await readJob(client(), jobId), ok => console.log(formatJobDetail(ok.job)));
             return;
         }
         if (action === 'wait') {
-            const timing = parsePollOptions(options, true);
-            const detail = await withCliWait(jobId, signal => waitForJob(client(), jobId, { intervalMs: timing.initialIntervalMs, timeoutMs: timing.timeoutMs, signal }));
-            emit({ ...detail, jobStatus: detail.status, ok: true, timedOut: false }, () => console.log(formatJobDetail(detail)));
+            const timing = waitArgs({ intervalMs: options.interval, timeoutMs: options.timeout }, 'cli');
+            const api = client();
+            const outcome = await withCliSignals(signal => waitJob(api, jobId, { ...timing, signal }));
+            renderOutcome(outcome, ok => console.log(formatJobDetail(ok.job)));
+            return;
+        }
+        if (action === 'resume') {
+            // Re-send a recorded submission verbatim: no model, prompt or catalog involved; the positional is the idempotency key.
+            for (const param of forSurface(resumeParams, 'cli'))
+                if (param.flag && param.kind === 'string')
+                    applyRaw(options, cacKey(param.flag), cliSpellings(param));
+            const request = resumeArgs({ ...argsFromCac(resumeParams, options), idempotencyKey: jobId }, 'cli');
+            const api = client();
+            const outcome = await withCliSignals(signal => resumeSubmission(api, { ...request, signal, onEvent: cliGenerationEvents() }));
+            renderOutcome(outcome, printGeneration);
+            if (outcome.ok && outcome.download?.ok === false && process.exitCode !== 130 && process.exitCode !== 143)
+                process.exitCode = 1;
             return;
         }
         if (action === 'cancel') {
-            if (!options.yes)
+            if (options.yes !== true)
                 throw new LumenKeyError('CANCEL_CONFIRMATION_REQUIRED');
             const result = await client().cancelJob(jobId);
             emit(result, () => console.log(ui(`Cancellation requested for ${jobId}. Settlement is determined by the gateway.`, `已请求取消任务 ${jobId}，最终结算由网关确认。`)));
@@ -512,6 +467,35 @@ export function registerCopied(cli) {
         console.log(script);
     });
 }
+/** The options each tasks subcommand owns, by CLI spelling; everything else present on the command line is an unknown option for it. */
+const TASK_OPTIONS = {
+    progress: [],
+    wait: ['--interval', '--timeout'],
+    cancel: ['--yes'],
+    resume: ['--output', '-o', '--interval', '--timeout', '--key'],
+};
+function rejectForeignTaskOptions(action) {
+    const owned = new Set(TASK_OPTIONS[action] ?? []);
+    const all = ['--interval', '--timeout', '--output', '-o', '--yes', '--key'];
+    for (let i = 2; i < process.argv.length; i += 1) {
+        const arg = process.argv[i];
+        if (arg === '--')
+            break;
+        const name = arg.split('=')[0];
+        if (all.includes(name) && !owned.has(name)) {
+            throw new LumenKeyError('INPUT_INVALID', undefined, undefined, ui(`Unknown option ${JSON.stringify(name)} for tasks ${action}.`, `tasks ${action} 没有选项 ${JSON.stringify(name)}。`));
+        }
+    }
+}
+/** CAC collects everything after `--` here; a key that begins with `-` can be passed that way. */
+function firstDoubleDashArgument(options) {
+    const rest = options['--'];
+    return Array.isArray(rest) && typeof rest[0] === 'string' ? rest[0] : undefined;
+}
+/** A missing positional, phrased like CAC's own message so existing readers of it keep working. */
+class UsageArgumentError extends LumenKeyError {
+    constructor(line) { super('CLI_ARGUMENTS_INVALID', undefined, undefined, line); this.name = 'UsageError'; this.message = line; }
+}
 function hostStatus(config) {
     try {
         new LumenKeyClient({ baseUrl: config.baseUrl, timeoutMs: config.timeoutMs, apiKey: config.apiKey });
@@ -521,114 +505,6 @@ function hostStatus(config) {
         return 'fail';
     }
 }
-function coerceDeclared(spec, value, key) {
-    const type = spec && typeof spec === 'object' && !Array.isArray(spec) ? spec.type : undefined;
-    if (type === 'integer' || type === 'number') {
-        const parsed = Number(value);
-        if (!Number.isFinite(parsed))
-            throw modelParameterError('MODEL_PARAM_INVALID', key);
-        return type === 'integer' ? Math.trunc(parsed) : parsed;
-    }
-    if (type === 'string')
-        return String(value);
-    return value;
-}
-export function outputUrls(detail) {
-    return (detail.outputs ?? []).map((item) => item.url).filter((url) => typeof url === 'string' && url.length > 0);
-}
-export function parsePollOptions(options, warnShort = false) {
-    const interval = Number(options.interval ?? 5);
-    const timeout = Number(options.timeout ?? 1800);
-    if (!Number.isFinite(interval) || interval <= 0 || interval * 1000 > 2_147_483_647 || !Number.isFinite(timeout) || timeout < 0 || timeout * 1000 > Number.MAX_SAFE_INTEGER - Date.now()) {
-        throw new LumenKeyError('WAIT_OPTIONS_INVALID');
-    }
-    if (warnShort && interval < 1)
-        process.stderr.write(ui('Warning [POLL_INTERVAL_SHORT]: --interval uses seconds. Values below 1 second may cause excessive polling; consider --interval 5.\n', '警告 [POLL_INTERVAL_SHORT]：--interval 单位为秒。小于 1 秒可能导致过于频繁的查询；建议使用 --interval 5。\n'));
-    return { initialIntervalMs: interval * 1000, timeoutMs: timeout * 1000 };
-}
-export async function pollConfirmed(api, jobId, options) {
-    const timing = parsePollOptions(options);
-    return withCliWait(jobId, signal => pollJob(api, jobId, {
-        ...timing, signal,
-        onProgress: row => process.stderr.write(ui(`  Status: ${jobStatusText(row.status)}\n`, `  状态：${jobStatusText(row.status)}\n`)),
-    }));
-}
-async function withCliWait(jobId, wait) {
-    const controller = new AbortController();
-    const interrupt = (exitCode) => { if (!controller.signal.aborted) {
-        process.exitCode = exitCode;
-        controller.abort();
-    } };
-    const sigint = () => interrupt(130);
-    const sigterm = () => interrupt(143);
-    process.on('SIGINT', sigint);
-    process.on('SIGTERM', sigterm);
-    try {
-        return await wait(controller.signal);
-    }
-    catch (error) {
-        const failure = error instanceof Error ? error : new LumenKeyError('CLI_COMMAND_FAILED');
-        Object.assign(failure, { jobId });
-        if (failure instanceof LumenKeyError && failure.code === 'WAIT_TIMEOUT')
-            Object.assign(failure, { timedOut: true });
-        if (controller.signal.aborted)
-            failure.message += ui(` Resume with: lumenkey status ${jobId}`, ` 可继续查询：lumenkey status ${jobId}`);
-        throw failure;
-    }
-    finally {
-        process.off('SIGINT', sigint);
-        process.off('SIGTERM', sigterm);
-    }
-}
-export async function finishGeneration(api, created, options) {
-    try {
-        const timing = parsePollOptions(options);
-        const result = await withCliWait(created.jobId, async (signal) => {
-            const detail = await pollJob(api, created.jobId, { ...timing, signal,
-                onProgress: row => process.stderr.write(ui(`  Status: ${jobStatusText(row.status)}\n`, `  状态：${jobStatusText(row.status)}\n`)),
-            });
-            return generationResult(detail, created.idempotencyKey, typeof options.output === 'string' ? options.output : undefined, signal);
-        });
-        emit(result, () => {
-            console.log(ui('Generation succeeded!', '生成成功！'));
-            console.log(ui(`Task: ${result.jobId}`, `任务：${result.jobId}`));
-            for (const url of result.urls)
-                console.log(url);
-            if (result.localFile)
-                console.log(ui(`Saved to ${result.localFile}`, `已保存到 ${result.localFile}`));
-            if (result.download?.ok === false)
-                console.error(ui(`Local save failed: ${result.download.error} (${result.download.code}). The generation result remains available above.`, `本机保存失败：${result.download.error}（${result.download.code}）。生成结果仍可通过以上地址获取。`));
-        });
-        if (result.download?.ok === false && process.exitCode !== 130 && process.exitCode !== 143)
-            process.exitCode = 1;
-    }
-    catch (error) {
-        const failure = error instanceof Error ? error : new LumenKeyError('CLI_COMMAND_FAILED');
-        Object.assign(failure, created);
-        throw failure;
-    }
-}
-export function emitJobDetail(detail) {
-    let failure;
-    try {
-        assertJobResult(detail, detail.status === 'succeeded');
-    }
-    catch (error) {
-        failure = error instanceof Error ? error : new LumenKeyError('JOB_TERMINAL_FAILURE');
-    }
-    const failureResult = failure ? errorResult(failure) : undefined;
-    const result = { ...detail, jobStatus: detail.status, ...(failureResult ? {
-            ok: false, code: failureResult.code, message: failureResult.message,
-            failureCode: failureResult.code, failureMessage: failureResult.message,
-        } : {}) };
-    emit(result, () => {
-        console.log(formatJobDetail(detail));
-        if (failure)
-            console.error(failure.message);
-    });
-    if (failure)
-        process.exitCode = 1;
-}
 export async function promptForKey() {
     if (process.stdin.readableEnded || process.stdin.destroyed)
         return undefined;