@optima-chat/gen-cli 1.2.1 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.claude/skills/digital-human/SKILL.md +195 -0
- package/.claude/skills/digital-human/references/avatar-catalog.md +47 -0
- package/.claude/skills/digital-human/references/edit.md +198 -0
- package/.claude/skills/digital-human/references/generate.md +246 -0
- package/.claude/skills/digital-human/references/manage.md +126 -0
- package/.claude/skills/digital-human/references/train.md +291 -0
- package/.claude/skills/gen/SKILL.md +33 -26
- package/.claude/skills/video-edit/SKILL.md +99 -17
- package/.claude/skills/video-gen/SKILL.md +34 -108
- package/.claude/skills/video-translate/SKILL.md +254 -11
- package/dist/commands/asr.d.ts.map +1 -1
- package/dist/commands/asr.js +6 -3
- package/dist/commands/asr.js.map +1 -1
- package/dist/commands/avatar.d.ts +12 -2
- package/dist/commands/avatar.d.ts.map +1 -1
- package/dist/commands/avatar.js +27 -9
- package/dist/commands/avatar.js.map +1 -1
- package/dist/commands/doctor.d.ts +14 -4
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +59 -38
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/image.d.ts.map +1 -1
- package/dist/commands/image.js +13 -6
- package/dist/commands/image.js.map +1 -1
- package/dist/commands/tryon.d.ts.map +1 -1
- package/dist/commands/tryon.js +6 -3
- package/dist/commands/tryon.js.map +1 -1
- package/dist/commands/tts.d.ts.map +1 -1
- package/dist/commands/tts.js +6 -3
- package/dist/commands/tts.js.map +1 -1
- package/dist/commands/video-translate.d.ts.map +1 -1
- package/dist/commands/video-translate.js +10 -6
- package/dist/commands/video-translate.js.map +1 -1
- package/dist/commands/video.d.ts +19 -0
- package/dist/commands/video.d.ts.map +1 -1
- package/dist/commands/video.js +292 -12
- package/dist/commands/video.js.map +1 -1
- package/dist/utils/output.d.ts +9 -2
- package/dist/utils/output.d.ts.map +1 -1
- package/dist/utils/output.js +9 -2
- package/dist/utils/output.js.map +1 -1
- package/package.json +1 -1
package/dist/commands/video.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Option } from 'commander';
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import * as fs from 'fs';
|
|
4
|
+
import { execFileSync, spawnSync } from 'child_process';
|
|
4
5
|
import ora from 'ora';
|
|
5
6
|
import { success, info } from '../utils/logger.js';
|
|
6
7
|
import { outputSuccess, outputError, isPrettyMode } from '../utils/output.js';
|
|
@@ -112,21 +113,23 @@ export function registerVideoCommand(program) {
|
|
|
112
113
|
}
|
|
113
114
|
}
|
|
114
115
|
else {
|
|
116
|
+
// task status != completed → 失败。让顶层 success:false 并 exit 1,否则
|
|
117
|
+
// Agent 会把 failure 当 success(参见 image.ts 同样修复)。
|
|
118
|
+
const errCode = result.error_code ?? 'GENERATION_FAILED';
|
|
119
|
+
const errMsg = result.error_message ?? `任务状态: ${result.status}`;
|
|
115
120
|
if (pretty) {
|
|
116
|
-
spinner.
|
|
121
|
+
spinner.fail(errMsg);
|
|
117
122
|
if (result.error_code)
|
|
118
123
|
info(`错误码: ${result.error_code}${result.retryable ? '(可重试)' : ''}`);
|
|
119
|
-
if (result.error_message)
|
|
120
|
-
info(`错误: ${result.error_message}`);
|
|
121
124
|
info(`使用 'gen task get ${result.task_id}' 查看最新状态`);
|
|
125
|
+
process.exit(1);
|
|
122
126
|
}
|
|
123
127
|
else {
|
|
124
|
-
|
|
128
|
+
outputError(errCode, errMsg, options, {
|
|
125
129
|
task_id: result.task_id,
|
|
126
130
|
status: result.status,
|
|
127
|
-
error_code: result.error_code ?? null,
|
|
128
131
|
retryable: result.retryable ?? false,
|
|
129
|
-
|
|
132
|
+
error_class: result.error_class ?? null,
|
|
130
133
|
});
|
|
131
134
|
}
|
|
132
135
|
}
|
|
@@ -197,19 +200,23 @@ export function registerVideoCommand(program) {
|
|
|
197
200
|
}
|
|
198
201
|
}
|
|
199
202
|
else {
|
|
203
|
+
// task status != completed → 失败。让顶层 success:false 并 exit 1,否则
|
|
204
|
+
// Agent 会把 failure 当 success(参见 image.ts 同样修复)。
|
|
205
|
+
const errCode = result.error_code ?? 'GENERATION_FAILED';
|
|
206
|
+
const errMsg = result.error_message ?? `任务状态: ${result.status}`;
|
|
200
207
|
if (pretty) {
|
|
201
|
-
spinner.
|
|
202
|
-
if (result.
|
|
203
|
-
info(
|
|
208
|
+
spinner.fail(errMsg);
|
|
209
|
+
if (result.error_code)
|
|
210
|
+
info(`错误码: ${result.error_code}${result.retryable ? '(可重试)' : ''}`);
|
|
204
211
|
info(`使用 'gen task get ${result.task_id}' 查看最新状态`);
|
|
212
|
+
process.exit(1);
|
|
205
213
|
}
|
|
206
214
|
else {
|
|
207
|
-
|
|
215
|
+
outputError(errCode, errMsg, options, {
|
|
208
216
|
task_id: result.task_id,
|
|
209
217
|
status: result.status,
|
|
210
|
-
error_code: result.error_code ?? null,
|
|
211
218
|
retryable: result.retryable ?? false,
|
|
212
|
-
|
|
219
|
+
error_class: result.error_class ?? null,
|
|
213
220
|
});
|
|
214
221
|
}
|
|
215
222
|
}
|
|
@@ -251,6 +258,7 @@ export function registerVideoCommand(program) {
|
|
|
251
258
|
relatedCommands: [
|
|
252
259
|
{ command: 'task get <id>', description: '查看任务状态' },
|
|
253
260
|
{ command: 'image <prompt>', description: '生成图像' },
|
|
261
|
+
{ command: 'video stitch', description: '拼接多段 mp4(ffmpeg concat)' },
|
|
254
262
|
],
|
|
255
263
|
notes: [
|
|
256
264
|
'默认 dashscope(仅图生视频,需要输入图像;自动配音默认开启)',
|
|
@@ -260,5 +268,277 @@ export function registerVideoCommand(program) {
|
|
|
260
268
|
'视频生成需要 1-5 分钟',
|
|
261
269
|
],
|
|
262
270
|
});
|
|
271
|
+
registerVideoStitch(cmd);
|
|
272
|
+
}
|
|
273
|
+
/**
|
|
274
|
+
* `gen video stitch` —— 多段 mp4 拼接 (ffmpeg concat) primitive.
|
|
275
|
+
*
|
|
276
|
+
* 实施 SPEC: docs/superpowers/specs/2026-05-16-gen-video-stitch-primitive.md (optima-agent)
|
|
277
|
+
*
|
|
278
|
+
* 关键设计:
|
|
279
|
+
* - Mode A (--workspace-dir): glob <dir>/segments/seg-*.mp4 按文件名 lexical sort
|
|
280
|
+
* - Mode B (--inputs): 显式 mp4 列表,用户给的顺序
|
|
281
|
+
* - --codec auto (默认): 试 -c copy → fail 回退 libx264+aac
|
|
282
|
+
* - 失败 failed_input 探测 3 层: stderr parse → ffprobe scan → null + codec mismatch
|
|
283
|
+
* - concat list 用固定路径 <workspace>/.stitch-concat.txt,不用 mktemp
|
|
284
|
+
*
|
|
285
|
+
* 返回 JSON (成功): { output_path, duration_sec, concat_mode, input_count }
|
|
286
|
+
* 返回 JSON (失败): { error: { code, message, failed_input } }
|
|
287
|
+
*/
|
|
288
|
+
function registerVideoStitch(parent) {
|
|
289
|
+
const cmd = parent
|
|
290
|
+
.command('stitch')
|
|
291
|
+
.description('拼接多段 mp4 为单个视频(ffmpeg concat)')
|
|
292
|
+
.option('--workspace-dir <dir>', 'Mode A: 扫描 <dir>/segments/seg-*.mp4 按文件名排序')
|
|
293
|
+
.option('--inputs <inputs...>', 'Mode B: 显式 mp4 列表 (顺序 = concat 顺序)')
|
|
294
|
+
// -o 短 flag 跟父命令 gen video -o <dir> 冲突 (commander 限制),subcommand 用长 flag --out
|
|
295
|
+
// SPEC §4.1 用 -o 是设计期写法,实施时改 --out 不影响契约 (wrapper 调时跟 SPEC 实施版本一致即可)
|
|
296
|
+
.requiredOption('--out <path>', '输出 mp4 路径')
|
|
297
|
+
.addOption(new Option('--codec <mode>', 'codec 模式: auto 试 copy 失败回退 reencode')
|
|
298
|
+
.choices(['auto', 'copy', 'reencode'])
|
|
299
|
+
.default('auto'))
|
|
300
|
+
.action(async (options) => {
|
|
301
|
+
const pretty = isPrettyMode(options);
|
|
302
|
+
try {
|
|
303
|
+
// P2-3: ffmpeg / ffprobe PATH 预检
|
|
304
|
+
if (!hasFfmpegBinary('ffmpeg')) {
|
|
305
|
+
outputError('STITCH_FFMPEG_NOT_FOUND', '未找到 ffmpeg 命令。请先安装 ffmpeg (https://ffmpeg.org/) 并加入 PATH', options);
|
|
306
|
+
return;
|
|
307
|
+
}
|
|
308
|
+
if (!hasFfmpegBinary('ffprobe')) {
|
|
309
|
+
outputError('STITCH_FFPROBE_NOT_FOUND', '未找到 ffprobe 命令 (ffmpeg 套件)。请确认 ffmpeg 完整安装并加入 PATH', options);
|
|
310
|
+
return;
|
|
311
|
+
}
|
|
312
|
+
// Mode A vs Mode B 互斥校验
|
|
313
|
+
const hasWorkspace = !!options.workspaceDir;
|
|
314
|
+
const hasInputs = Array.isArray(options.inputs) && options.inputs.length > 0;
|
|
315
|
+
if (hasWorkspace && hasInputs) {
|
|
316
|
+
outputError('STITCH_USAGE_ERROR', '--workspace-dir 和 --inputs 二选一,不能同时传', options);
|
|
317
|
+
return;
|
|
318
|
+
}
|
|
319
|
+
if (!hasWorkspace && !hasInputs) {
|
|
320
|
+
outputError('STITCH_USAGE_ERROR', '必须传 --workspace-dir <dir> 或 --inputs <p1> <p2> ...', options);
|
|
321
|
+
return;
|
|
322
|
+
}
|
|
323
|
+
// --codec 校验由 commander .choices() 处理,这里直接读 (无效值 commander 已 reject)
|
|
324
|
+
const codec = options.codec;
|
|
325
|
+
// 解析 inputs (Mode A glob 或 Mode B 直接用)
|
|
326
|
+
let inputs;
|
|
327
|
+
if (hasWorkspace) {
|
|
328
|
+
const segmentsDir = path.join(path.resolve(options.workspaceDir), 'segments');
|
|
329
|
+
if (!fs.existsSync(segmentsDir)) {
|
|
330
|
+
outputError('STITCH_FAILED', `segments 目录不存在: ${segmentsDir}`, options);
|
|
331
|
+
return;
|
|
332
|
+
}
|
|
333
|
+
inputs = fs
|
|
334
|
+
.readdirSync(segmentsDir)
|
|
335
|
+
.filter((f) => /^seg-\d+\.mp4$/.test(f))
|
|
336
|
+
// natural sort: 不依赖填充宽度,seg-2 < seg-10 < seg-100 都对
|
|
337
|
+
// (lexical sort 在混 1/2/3 位时会错乱:seg-1 < seg-10 < seg-100 < seg-2)
|
|
338
|
+
.sort((a, b) => a.localeCompare(b, undefined, { numeric: true }))
|
|
339
|
+
.map((f) => path.join(segmentsDir, f));
|
|
340
|
+
}
|
|
341
|
+
else {
|
|
342
|
+
inputs = options.inputs.map((p) => path.resolve(p));
|
|
343
|
+
}
|
|
344
|
+
if (inputs.length === 0) {
|
|
345
|
+
outputError('STITCH_FAILED', 'inputs 为空,没有 mp4 可拼接', options);
|
|
346
|
+
return;
|
|
347
|
+
}
|
|
348
|
+
// 验证 inputs 存在
|
|
349
|
+
for (const input of inputs) {
|
|
350
|
+
if (!fs.existsSync(input)) {
|
|
351
|
+
outputError('STITCH_FAILED', `input 文件不存在: ${input}`, options, { failed_input: input });
|
|
352
|
+
return;
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
const outputPath = path.resolve(options.out);
|
|
356
|
+
// concat list 临时文件位置 (SPEC 决策 #11):
|
|
357
|
+
// - Mode A: <workspace>/.stitch-concat.txt
|
|
358
|
+
// - Mode B 无 workspace 概念,落 output dir 同卷,避免跨 fs 问题
|
|
359
|
+
// - 假设单作业,并发场景需各自 workspace 或换 mktemp (本 v1 不做)
|
|
360
|
+
const concatListPath = path.join(hasWorkspace ? path.resolve(options.workspaceDir) : path.dirname(outputPath), '.stitch-concat.txt');
|
|
361
|
+
const spinner = pretty ? ora(`拼接 ${inputs.length} 段 mp4...`).start() : null;
|
|
362
|
+
// 生成 concat list (ffmpeg concat demuxer 格式)
|
|
363
|
+
const concatContent = inputs.map((p) => `file '${p.replace(/'/g, "'\\''")}'`).join('\n') + '\n';
|
|
364
|
+
fs.writeFileSync(concatListPath, concatContent);
|
|
365
|
+
try {
|
|
366
|
+
// 执行 ffmpeg,根据 --codec 决定路径
|
|
367
|
+
let concatMode;
|
|
368
|
+
let ffmpegError = null;
|
|
369
|
+
if (codec === 'copy') {
|
|
370
|
+
// 只试 copy,失败直接报错
|
|
371
|
+
const r = runFfmpegCopy(concatListPath, outputPath);
|
|
372
|
+
if (r.ok) {
|
|
373
|
+
concatMode = 'copy';
|
|
374
|
+
}
|
|
375
|
+
else {
|
|
376
|
+
ffmpegError = r.stderr;
|
|
377
|
+
concatMode = 'copy'; // 标记,但下面会进 error path
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
else if (codec === 'reencode') {
|
|
381
|
+
// 直接 reencode,跳过 copy 试探
|
|
382
|
+
const r = runFfmpegReencode(concatListPath, outputPath);
|
|
383
|
+
if (r.ok) {
|
|
384
|
+
concatMode = 'reencode';
|
|
385
|
+
}
|
|
386
|
+
else {
|
|
387
|
+
ffmpegError = r.stderr;
|
|
388
|
+
concatMode = 'reencode';
|
|
389
|
+
}
|
|
390
|
+
}
|
|
391
|
+
else {
|
|
392
|
+
// auto: 试 copy → fail 回退 reencode
|
|
393
|
+
const r1 = runFfmpegCopy(concatListPath, outputPath);
|
|
394
|
+
if (r1.ok) {
|
|
395
|
+
concatMode = 'copy';
|
|
396
|
+
}
|
|
397
|
+
else {
|
|
398
|
+
const r2 = runFfmpegReencode(concatListPath, outputPath);
|
|
399
|
+
if (r2.ok) {
|
|
400
|
+
concatMode = 'reencode';
|
|
401
|
+
}
|
|
402
|
+
else {
|
|
403
|
+
ffmpegError = r2.stderr;
|
|
404
|
+
concatMode = 'reencode';
|
|
405
|
+
}
|
|
406
|
+
}
|
|
407
|
+
}
|
|
408
|
+
if (ffmpegError) {
|
|
409
|
+
// 3 层 failed_input 探测
|
|
410
|
+
const failedInput = detectFailedInput(ffmpegError, inputs);
|
|
411
|
+
if (pretty)
|
|
412
|
+
spinner.fail('ffmpeg concat 失败');
|
|
413
|
+
outputError('STITCH_FAILED', failedInput
|
|
414
|
+
? `ffmpeg concat 失败 (failing input: ${failedInput})`
|
|
415
|
+
: 'ffmpeg concat 失败:所有 input 单独 ffprobe OK,但 concat 失败 (likely codec mismatch)', options, { failed_input: failedInput });
|
|
416
|
+
return;
|
|
417
|
+
}
|
|
418
|
+
// 成功:ffprobe 取 duration
|
|
419
|
+
const duration = ffprobeDuration(outputPath);
|
|
420
|
+
if (pretty) {
|
|
421
|
+
spinner.succeed(`拼接完成 (${concatMode}): ${outputPath} [${duration.toFixed(2)}s, ${inputs.length} 段]`);
|
|
422
|
+
}
|
|
423
|
+
else {
|
|
424
|
+
outputSuccess({
|
|
425
|
+
output_path: outputPath,
|
|
426
|
+
duration_sec: duration,
|
|
427
|
+
concat_mode: concatMode,
|
|
428
|
+
input_count: inputs.length,
|
|
429
|
+
});
|
|
430
|
+
}
|
|
431
|
+
}
|
|
432
|
+
finally {
|
|
433
|
+
// 清理临时 concat list
|
|
434
|
+
if (fs.existsSync(concatListPath)) {
|
|
435
|
+
try {
|
|
436
|
+
fs.unlinkSync(concatListPath);
|
|
437
|
+
}
|
|
438
|
+
catch {
|
|
439
|
+
/* ignore */
|
|
440
|
+
}
|
|
441
|
+
}
|
|
442
|
+
}
|
|
443
|
+
}
|
|
444
|
+
catch (err) {
|
|
445
|
+
outputError('STITCH_FAILED', `拼接过程异常: ${err}`, options);
|
|
446
|
+
}
|
|
447
|
+
});
|
|
448
|
+
addEnhancedHelp(cmd, {
|
|
449
|
+
examples: [
|
|
450
|
+
'# Mode A: 自动扫描 workspace segments/',
|
|
451
|
+
'$ gen video stitch --workspace-dir ~/digital-human/videos/20260516-1430 --out final.mp4',
|
|
452
|
+
'# Mode B: 显式列 mp4 (任意顺序)',
|
|
453
|
+
'$ gen video stitch --inputs intro.mp4 seg-1.mp4 seg-2.mp4 outro.mp4 --out final.mp4',
|
|
454
|
+
'# 强制重编码 (保证 codec 兼容)',
|
|
455
|
+
'$ gen video stitch --workspace-dir . --out final.mp4 --codec reencode',
|
|
456
|
+
],
|
|
457
|
+
outputJson: `{
|
|
458
|
+
"success": true,
|
|
459
|
+
"data": {
|
|
460
|
+
"output_path": "/abs/path/final.mp4",
|
|
461
|
+
"duration_sec": 87.3,
|
|
462
|
+
"concat_mode": "copy",
|
|
463
|
+
"input_count": 4
|
|
464
|
+
}
|
|
465
|
+
}`,
|
|
466
|
+
relatedCommands: [
|
|
467
|
+
{ command: 'video', description: '生成单段视频' },
|
|
468
|
+
],
|
|
469
|
+
notes: [
|
|
470
|
+
'Mode A / Mode B 二选一,不能同时传',
|
|
471
|
+
'--codec auto (默认): 试 -c copy → fail 回退 libx264+aac,JSON 返回实际 concat_mode',
|
|
472
|
+
'失败时 failed_input 字段指出 broken mp4 (若可定位)',
|
|
473
|
+
'concat list 临时文件用完即删,无残留',
|
|
474
|
+
],
|
|
475
|
+
});
|
|
476
|
+
}
|
|
477
|
+
// ===== Helpers (exported for unit tests) =====
|
|
478
|
+
export function hasFfmpegBinary(name) {
|
|
479
|
+
const r = spawnSync(name, ['-version'], { encoding: 'utf-8' });
|
|
480
|
+
return r.status === 0;
|
|
481
|
+
}
|
|
482
|
+
export function runFfmpegCopy(concatListPath, outputPath) {
|
|
483
|
+
const r = spawnSync('ffmpeg', ['-y', '-f', 'concat', '-safe', '0', '-i', concatListPath, '-c', 'copy', outputPath], { encoding: 'utf-8' });
|
|
484
|
+
return { ok: r.status === 0, stderr: r.stderr || '' };
|
|
485
|
+
}
|
|
486
|
+
export function runFfmpegReencode(concatListPath, outputPath) {
|
|
487
|
+
const r = spawnSync('ffmpeg', [
|
|
488
|
+
'-y',
|
|
489
|
+
'-f',
|
|
490
|
+
'concat',
|
|
491
|
+
'-safe',
|
|
492
|
+
'0',
|
|
493
|
+
'-i',
|
|
494
|
+
concatListPath,
|
|
495
|
+
'-c:v',
|
|
496
|
+
'libx264',
|
|
497
|
+
'-preset',
|
|
498
|
+
'fast',
|
|
499
|
+
'-c:a',
|
|
500
|
+
'aac',
|
|
501
|
+
outputPath,
|
|
502
|
+
], { encoding: 'utf-8' });
|
|
503
|
+
return { ok: r.status === 0, stderr: r.stderr || '' };
|
|
504
|
+
}
|
|
505
|
+
export function ffprobeDuration(filePath) {
|
|
506
|
+
try {
|
|
507
|
+
const out = execFileSync('ffprobe', ['-v', 'error', '-show_entries', 'format=duration', '-of', 'csv=p=0', filePath], { encoding: 'utf-8' });
|
|
508
|
+
const d = parseFloat(out.trim());
|
|
509
|
+
return Number.isFinite(d) ? d : 0;
|
|
510
|
+
}
|
|
511
|
+
catch {
|
|
512
|
+
return 0;
|
|
513
|
+
}
|
|
514
|
+
}
|
|
515
|
+
/**
|
|
516
|
+
* 3 层 failed_input 探测(SPEC 决策 #9):
|
|
517
|
+
* 1) ffmpeg stderr 含 input 路径字面 → 再 ffprobe verify 一次,验证 fail 才返回
|
|
518
|
+
* (P2-2 修正:ffmpeg `Input #N` 默认会把所有 input 名字打 stderr,
|
|
519
|
+
* Layer 1 命中不等于该 input 真坏;必须 ffprobe verify 避免 false positive)
|
|
520
|
+
* 2) 否则 ffprobe scan 全部 input,首个 exit≠0 = failed_input
|
|
521
|
+
* 3) 都 ffprobe OK 但 concat 仍失败 → null (codec mismatch,非单个 input 问题)
|
|
522
|
+
*/
|
|
523
|
+
export function detectFailedInput(stderr, inputs) {
|
|
524
|
+
// Layer 1: stderr 含具体 input 路径 + ffprobe 验证
|
|
525
|
+
for (const input of inputs) {
|
|
526
|
+
if (stderr.includes(input) || stderr.includes(path.basename(input))) {
|
|
527
|
+
const r = spawnSync('ffprobe', ['-v', 'error', input], { encoding: 'utf-8' });
|
|
528
|
+
if (r.status !== 0 || (r.stderr && r.stderr.trim() !== '')) {
|
|
529
|
+
return input; // 验证确认坏
|
|
530
|
+
}
|
|
531
|
+
// stderr 提了 input 但 ffprobe OK → 可能只是 Input #N 标识,降级 Layer 2
|
|
532
|
+
}
|
|
533
|
+
}
|
|
534
|
+
// Layer 2: ffprobe scan 每个 input
|
|
535
|
+
for (const input of inputs) {
|
|
536
|
+
const r = spawnSync('ffprobe', ['-v', 'error', input], { encoding: 'utf-8' });
|
|
537
|
+
if (r.status !== 0 || (r.stderr && r.stderr.trim() !== '')) {
|
|
538
|
+
return input;
|
|
539
|
+
}
|
|
540
|
+
}
|
|
541
|
+
// Layer 3: 都 OK 但 concat fail → 不是单个 input 问题
|
|
542
|
+
return null;
|
|
263
543
|
}
|
|
264
544
|
//# sourceMappingURL=video.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"video.js","sourceRoot":"","sources":["../../src/commands/video.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAElB,mBAAmB,EACnB,YAAY,EACZ,cAAc,EACd,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,UAAU,oBAAoB,CAAC,OAAgB;IACnD,MAAM,GAAG,GAAG,OAAO;SAChB,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,mBAAmB,CAAC;SAChC,QAAQ,CAAC,SAAS,EAAE,uCAAuC,CAAC;SAC5D,MAAM,CAAC,qBAAqB,EAAE,SAAS,EAAE,EAAE,CAAC;SAC5C,MAAM,CAAC,uBAAuB,EAAE,kBAAkB,EAAE,EAAE,CAAC;SACvD,MAAM,CAAC,wBAAwB,EAAE,8BAA8B,EAAE,OAAO,CAAC;SACzE,MAAM,CAAC,0BAA0B,EAAE,sCAAsC,EAAE,GAAG,CAAC;SAC/E,MAAM,CAAC,iBAAiB,EAAE,+BAA+B,CAAC;SAC1D,MAAM,CAAC,oBAAoB,EAAE,eAAe,CAAC;SAC7C,MAAM,CAAC,SAAS,EAAE,wBAAwB,CAAC;SAC3C,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC;SAC9B,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC;SACnD,MAAM,CAAC,oBAAoB,EAAE,iCAAiC,EAAE,QAAQ,CAAC;SACzE,MAAM,CAAC,aAAa,EAAE,uBAAuB,CAAC;SAC9C,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC;QAClC,qEAAqE;QACrE,uEAAuE;SACtE,SAAS,CAAC,IAAI,MAAM,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;SACjH,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC;SAC3C,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC;SACzC,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC;SACzC,MAAM,CAAC,wBAAwB,EAAE,6CAA6C,EAAE,QAAQ,CAAC;SACzF,MAAM,CAAC,mBAAmB,EAAE,qBAAqB,EAAE,KAAK,CAAC;SACzD,MAAM,CAAC,2BAA2B,EAAE,oEAAoE,CAAC;SACzG,MAAM,CAAC,oBAAoB,EAAE,kBAAkB,CAAC;SAChD,MAAM,CAAC,kBAAkB,EAAE,gBAAgB,CAAC;SAC5C,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC;SACnC,MAAM,CAAC,iBAAiB,EAAE,cAAc,CAAC;SACzC,MAAM,CAAC,wBAAwB,EAAE,6CAA6C,CAAC;SAC/E,MAAM,CAAC,oBAAoB,EAAE,MAAM,EAAE,EAAE,CAAC;SACxC,MAAM,CAAC,KAAK,EAAE,KAAyB,EAAE,OAAO,EAAE,EAAE;QACnD,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QAErC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;YACtC,yEAAyE;YACzE,MAAM,QAAQ,GAAuB,OAAO,CAAC,QAAQ,CAAC;YAEtD,sBAAsB;YACtB,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC1B,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;oBACpB,WAAW,CAAC,gBAAgB,EAAE,yBAAyB,EAAE,OAAO,CAAC,CAAC;oBAClE,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;oBACnB,WAAW,CAAC,eAAe,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;oBAChE,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;oBAClB,WAAW,CAAC,cAAc,EAAE,yBAAyB,EAAE,OAAO,CAAC,CAAC;oBAChE,OAAO;gBACT,CAAC;gBACD,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;oBAC/B,WAAW,CAAC,eAAe,EAAE,mBAAmB,EAAE,OAAO,CAAC,CAAC;oBAC3D,OAAO;gBACT,CAAC;gBACD,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC7C,IAAI,KAAK,GAAG,GAAG,IAAI,KAAK,GAAG,GAAG,EAAE,CAAC;oBAC/B,WAAW,CAAC,eAAe,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;oBACtD,OAAO;gBACT,CAAC;gBAED,MAAM,MAAM,GAAmB;oBAC7B,QAAQ,EAAE,QAAQ;oBAClB,SAAS,EAAE,OAAO,CAAC,MAAM;oBACzB,QAAQ,EAAE,OAAO,CAAC,KAAK;oBACvB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,YAAY,EAAE,OAAO,CAAC,WAAW;oBACjC,KAAK;oBACL,OAAO,EAAE,OAAO,CAAC,YAAY;oBAC7B,QAAQ,EAAE,OAAO,CAAC,OAAO;oBACzB,QAAQ,EAAE,OAAO,CAAC,OAAO;oBACzB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,KAAK,EAAE,OAAO,CAAC,KAAK;iBACrB,CAAC;gBAEF,MAAM,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAC;gBACzC,MAAM,UAAU,GAAG,cAAc,CAAC,WAAW,CAAC,IAAI,cAAc,CAAC;gBACjE,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;gBAEhE,IAAI,MAAM;oBAAE,OAAQ,CAAC,IAAI,GAAG,yBAAyB,CAAC;gBAEtD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE;oBACzD,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;wBACrB,IAAI,MAAM;4BAAE,OAAQ,CAAC,IAAI,GAAG,aAAa,MAAM,MAAM,CAAC;oBACxD,CAAC;iBACF,CAAC,CAAC;gBAEH,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;oBACvD,MAAM,eAAe,GAAG,UAAU,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC;oBACnE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;oBACzF,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;oBAE1E,IAAI,MAAM,EAAE,CAAC;wBACX,OAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;wBAC/B,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC;wBAC/B,IAAI,CAAC,UAAU,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;oBACnC,CAAC;yBAAM,CAAC;wBACN,aAAa,CAAC;4BACZ,OAAO,EAAE,MAAM,CAAC,OAAO;4BACvB,MAAM,EAAE,MAAM,CAAC,MAAM;4BACrB,MAAM,EAAE,UAAU;4BAClB,UAAU,EAAE,MAAM,CAAC,UAAU;yBAC9B,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,MAAM,EAAE,CAAC;wBACX,OAAQ,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;wBACxC,IAAI,MAAM,CAAC,UAAU;4BAAE,IAAI,CAAC,QAAQ,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC3F,IAAI,MAAM,CAAC,aAAa;4BAAE,IAAI,CAAC,OAAO,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;wBAC9D,IAAI,CAAC,oBAAoB,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;oBACrD,CAAC;yBAAM,CAAC;wBACN,aAAa,CAAC;4BACZ,OAAO,EAAE,MAAM,CAAC,OAAO;4BACvB,MAAM,EAAE,MAAM,CAAC,MAAM;4BACrB,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,IAAI;4BACrC,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,KAAK;4BACpC,aAAa,EAAE,MAAM,CAAC,aAAa;yBACpC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;gBACD,OAAO;YACT,CAAC;YAED,IAAI,WAA+B,CAAC;YACpC,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACtC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC9B,WAAW,CAAC,iBAAiB,EAAE,YAAY,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;oBACjE,OAAO;gBACT,CAAC;gBACD,WAAW,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC;YAC9C,CAAC;YAED,YAAY;YACZ,IAAI,QAAQ,KAAK,WAAW,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC7C,WAAW,CAAC,eAAe,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;gBACxD,OAAO;YACT,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;gBACpC,WAAW,CAAC,eAAe,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;gBAChE,OAAO;YACT,CAAC;YAED,mBAAmB,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;YAE5E,MAAM,MAAM,GAAmB;gBAC7B,KAAK,EAAE,WAAW;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,SAAS;gBACnC,eAAe,EAAE,OAAO,CAAC,QAAQ,IAAI,SAAS;gBAC9C,UAAU,EAAE,UAA8B;gBAC1C,QAAQ;gBACR,aAAa,EAAE,OAAO,CAAC,YAAY;gBACnC,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,SAAS,EAAE,OAAO,CAAC,QAAQ;gBAC3B,SAAS,EAAE,OAAO,CAAC,QAA8B;gBACjD,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,KAAK;gBACrC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;gBACvD,sEAAsE;gBACtE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC;YAEF,MAAM,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAC;YACzC,MAAM,UAAU,GAAG,cAAc,CAAC,WAAW,CAAC,IAAI,cAAc,CAAC;YACjE,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAE7D,IAAI,MAAM;gBAAE,OAAQ,CAAC,IAAI,GAAG,sBAAsB,CAAC;YAEnD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE;gBACzD,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;oBACrB,IAAI,MAAM;wBAAE,OAAQ,CAAC,IAAI,GAAG,UAAU,MAAM,MAAM,CAAC;gBACrD,CAAC;aACF,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;gBACvD,MAAM,eAAe,GAAG,SAAS,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC;gBAClE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;gBACzF,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;gBAE1E,IAAI,MAAM,EAAE,CAAC;oBACX,OAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBAC5B,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC;oBAC/B,IAAI,CAAC,UAAU,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;gBACnC,CAAC;qBAAM,CAAC;oBACN,aAAa,CAAC;wBACZ,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,MAAM,EAAE,UAAU;wBAClB,UAAU,EAAE,MAAM,CAAC,UAAU;qBAC9B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,MAAM,EAAE,CAAC;oBACX,OAAQ,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;oBACxC,IAAI,MAAM,CAAC,aAAa;wBAAE,IAAI,CAAC,OAAO,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;oBAC9D,IAAI,CAAC,oBAAoB,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;gBACrD,CAAC;qBAAM,CAAC;oBACN,aAAa,CAAC;wBACZ,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,IAAI;wBACrC,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,KAAK;wBACpC,aAAa,EAAE,MAAM,CAAC,aAAa;qBACpC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,kBAAkB,EAAE,CAAC;gBACtC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,cAAc,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,eAAe,CAAC,GAAG,EAAE;QACnB,QAAQ,EAAE;YACR,6BAA6B;YAC7B,4CAA4C;YAC5C,EAAE;YACF,SAAS;YACT,sDAAsD;YACtD,EAAE;YACF,SAAS;YACT,iEAAiE;YACjE,EAAE;YACF,iBAAiB;YACjB,4FAA4F;YAC5F,EAAE;YACF,cAAc;YACd,oHAAoH;SACrH;QACD,UAAU,EAAE;;;;;;;EAOd;QACE,eAAe,EAAE;YACf,EAAE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,QAAQ,EAAE;YACnD,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,EAAE;SACnD;QACD,KAAK,EAAE;YACL,qCAAqC;YACrC,qDAAqD;YACrD,+DAA+D;YAC/D,mDAAmD;YACnD,eAAe;SAChB;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"video.js","sourceRoot":"","sources":["../../src/commands/video.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/output.d.ts
CHANGED
|
@@ -28,6 +28,7 @@ export interface ErrorResponse {
|
|
|
28
28
|
error: {
|
|
29
29
|
code: string;
|
|
30
30
|
message: string;
|
|
31
|
+
[key: string]: any;
|
|
31
32
|
};
|
|
32
33
|
}
|
|
33
34
|
/**
|
|
@@ -37,11 +38,17 @@ export declare function outputSuccess<T>(data: T, options?: {
|
|
|
37
38
|
pretty?: boolean;
|
|
38
39
|
}): void;
|
|
39
40
|
/**
|
|
40
|
-
*
|
|
41
|
+
* 输出错误响应并退出。
|
|
42
|
+
*
|
|
43
|
+
* `extra` 字段会浅合并进 `error` 对象——给业务侧失败(如 generation task status=failed)
|
|
44
|
+
* 透传 task_id / retryable / status 等元数据用,让 Agent 既能从顶层 success:false 立即识别
|
|
45
|
+
* 失败、又能拿到结构化字段执行 SKILL.md 里基于 error_code 的分支处理。
|
|
46
|
+
*
|
|
47
|
+
* `code` / `message` 始终覆盖 extra 里的同名字段,防止调用方误传冲突值。
|
|
41
48
|
*/
|
|
42
49
|
export declare function outputError(code: string, message: string, options?: {
|
|
43
50
|
pretty?: boolean;
|
|
44
|
-
}): never;
|
|
51
|
+
}, extra?: Record<string, any>): never;
|
|
45
52
|
/**
|
|
46
53
|
* Pretty 模式下的日志函数
|
|
47
54
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAEzD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAKpE;AAED;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,GAAG;IACtC,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,EAAE,CAAC,CAAC;CACT;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAEzD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAKpE;AAED;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,GAAG;IACtC,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,EAAE,CAAC,CAAC;CACT;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAW9E;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,EAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,KAAK,CAiBP;AAED;;GAEG;AACH,eAAO,MAAM,SAAS;qBACH,MAAM,GAAG,IAAI;mBAGf,MAAM,GAAG,IAAI;kBAGd,MAAM,GAAG,IAAI;qBAGV,MAAM,GAAG,IAAI;CAG/B,CAAC"}
|
package/dist/utils/output.js
CHANGED
|
@@ -38,9 +38,15 @@ export function outputSuccess(data, options) {
|
|
|
38
38
|
console.log(JSON.stringify(response));
|
|
39
39
|
}
|
|
40
40
|
/**
|
|
41
|
-
*
|
|
41
|
+
* 输出错误响应并退出。
|
|
42
|
+
*
|
|
43
|
+
* `extra` 字段会浅合并进 `error` 对象——给业务侧失败(如 generation task status=failed)
|
|
44
|
+
* 透传 task_id / retryable / status 等元数据用,让 Agent 既能从顶层 success:false 立即识别
|
|
45
|
+
* 失败、又能拿到结构化字段执行 SKILL.md 里基于 error_code 的分支处理。
|
|
46
|
+
*
|
|
47
|
+
* `code` / `message` 始终覆盖 extra 里的同名字段,防止调用方误传冲突值。
|
|
42
48
|
*/
|
|
43
|
-
export function outputError(code, message, options) {
|
|
49
|
+
export function outputError(code, message, options, extra) {
|
|
44
50
|
if (isPrettyMode(options)) {
|
|
45
51
|
// Pretty 模式:使用带颜色的输出
|
|
46
52
|
console.error(chalk.red('✗'), message);
|
|
@@ -49,6 +55,7 @@ export function outputError(code, message, options) {
|
|
|
49
55
|
const response = {
|
|
50
56
|
success: false,
|
|
51
57
|
error: {
|
|
58
|
+
...(extra ?? {}),
|
|
52
59
|
code,
|
|
53
60
|
message,
|
|
54
61
|
},
|
package/dist/utils/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,cAAc;AACd,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAE7B;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAe;IACjD,gBAAgB,GAAG,MAAM,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,OAA8B;IACzD,IAAI,OAAO,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC,MAAM,CAAC;IACxB,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,cAAc;AACd,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAE7B;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAe;IACjD,gBAAgB,GAAG,MAAM,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,OAA8B;IACzD,IAAI,OAAO,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC,MAAM,CAAC;IACxB,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAsBD;;GAEG;AACH,MAAM,UAAU,aAAa,CAAI,IAAO,EAAE,OAA8B;IACtE,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,gCAAgC;QAChC,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAuB;QACnC,OAAO,EAAE,IAAI;QACb,IAAI;KACL,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;AACxC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,WAAW,CACzB,IAAY,EACZ,OAAe,EACf,OAA8B,EAC9B,KAA2B;IAE3B,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,qBAAqB;QACrB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,QAAQ,GAAkB;QAC9B,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YAChB,IAAI;YACJ,OAAO;SACR;KACF,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,OAAO,CAAC,OAAe;QACrB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IACD,KAAK,CAAC,OAAe;QACnB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,CAAC,OAAe;QAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,CAAC,OAAe;QACrB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;CACF,CAAC"}
|