feat: 新增小云雀营销成片 Skill 并修复交互中断状态处理

.agents/skills/xyq-marketing-skill

@@ -0,0 +1 @@
+../../skills/xyq-marketing-skill

.github/workflows/ci.yml

@@ -53,6 +53,9 @@ jobs:
       - name: Test CLI-only installation and Skill bootstrap
         run: node scripts/install-cli.test.js
 
+      - name: Test bundled Skills and marketing API workflow
+        run: node scripts/skills.test.js && npm run test:marketing-skill
+
   go:
     name: Go tests
     runs-on: ubuntu-22.04

README.md

@@ -4,20 +4,44 @@
 
 ## 技能列表
 
-本仓库在 `skills/` 目录下包含两个智能体技能：
+本仓库在 `skills/` 目录下包含三个智能体技能：
 
 | 技能 | 说明 | 路径 |
 |-------|-------------|------|
 | `xyq-short-drama-skill` | 短剧工作流技能，支持提交创作任务、上传参考文件、查询进度、列出会话文件和下载产物。 | `skills/short-drama/` |
 | `xyq-skill` | 图片生成与参考图编辑、视频生成、视频超分与擦字幕、异步结果交付、个人 Canvas 编辑、积分查询及登录授权。 | `skills/xyq-nest-skill/` |
+| `xyq-marketing-skill` | 商品图文营销一键成片：剧情广告、品牌大片、达人带货，含素材上传、进度查询与媒体下载。 | `skills/xyq-marketing-skill/` |
 
 ### 技能路由
 
 - 图片生成与参考图编辑、视频生成（含首尾帧和参考素材）、视频超分、擦字幕、结果查询、个人 Canvas 编辑、积分和授权由 `xyq-skill` 处理。
 - 短剧生成、续写、改写、人物设定、分集创作和短剧会话文件处理使用 `xyq-short-drama-skill`。
+- 商品图文营销成片、剧情广告、品牌大片和达人带货视频使用 `xyq-marketing-skill`；由公开营销 API 完成创作编排。
 
 需要补充、选择或确认时，使用宿主实际暴露且当前模式允许的工具：Codex 的 `request_user_input` / `request_user_input_async`、WorkBuddy 的 `ask_user_question`；不可用时用普通聊天。
 
+## 小云雀营销成片技能
+
+入口：[skills/xyq-marketing-skill/SKILL.md](skills/xyq-marketing-skill/SKILL.md)。使用 [官网](https://xyq.jianying.com/cli?tab=api) 已开放的营销 API，支持素材上传、营销视频提交、结果查询与下载、积分查询。安装器会从 `skills/` 自动安装该 Skill，也可以单独安装：
+
+```bash
+npx skills add Pippit-dev/cli --skill xyq-marketing-skill
+```
+
+需要 Node.js 16+，使用 Skill 内自包含脚本，无额外 npm 依赖。脚本从当前进程读取 `XYQ_ACCESS_KEY`；API 与 CLI 可使用同一 Access Key，但 CLI 浏览器登录不会设置此环境变量。密钥在本机安全配置，不写入请求 JSON 或命令参数。
+
+```bash
+# 从仓库根目录执行；营销请求字段见接口契约，默认只预览
+node skills/xyq-marketing-skill/scripts/marketing.js generate --request request.json --dry-run
+# 用户已要求真实生成时提交，然后用返回的真实 ID 取回媒体
+node skills/xyq-marketing-skill/scripts/marketing.js generate --request request.json --execute
+node skills/xyq-marketing-skill/scripts/marketing.js query --thread-id THREAD_ID --run-id RUN_ID --wait --output-dir ./results
+```
+
+参数与错误处理见 [接口契约](skills/xyq-marketing-skill/references/api.md)，完整示例见 [商品图到营销视频](skills/xyq-marketing-skill/examples/product-video.md)。这是 Skill 脚本入口，不是新增的 Go CLI 子命令。营销 API 未公开团队切换字段，不宣称支持团队空间切换。
+
+维护后运行 `node scripts/marketing-skill.test.js` 和 `node scripts/skills.test.js`，验证请求、上传、任务状态、下载与 Skill 引用。测试使用本地模拟服务，不会创建真实付费任务。
+
 ## 小云雀图片、视频与媒体处理技能
 
 入口：[skills/xyq-nest-skill/SKILL.md](skills/xyq-nest-skill/SKILL.md)。普通生成请求也直接使用对应 CLI；素材路径交给命令内部上传，异步查询自动下载，最后通过宿主交付真实媒体附件。

package.json

@@ -1,15 +1,16 @@
 {
   "name": "@pippit-dev/cli",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "Pippit CLI",
   "bin": {
     "pippit-tool-cli": "scripts/run.js"
   },
   "scripts": {
     "postinstall": "node scripts/install.js",
+    "test:marketing-skill": "node scripts/marketing-skill.test.js",
     "prepack": "node scripts/prepare-canvas-runtime.js",
     "prepare:canvas-runtime": "node scripts/prepare-canvas-runtime.js",
-    "test": "node scripts/version-check.test.js && node scripts/skills.test.js && node scripts/install-wizard.test.js && node scripts/install-cli.test.js && node scripts/run-help.test.js && node scripts/canvas-command.test.js && node scripts/canvas-command-schema.test.js && node scripts/canvas-command-guides.test.js && node scripts/prepare-canvas-runtime.test.js && node scripts/canvas-command-runtime.test.js && npm run test:canvas-operations && go test ./... && go vet ./...",
+    "test": "node scripts/version-check.test.js && node scripts/skills.test.js && node scripts/marketing-skill.test.js && node scripts/install-wizard.test.js && node scripts/install-cli.test.js && node scripts/run-help.test.js && node scripts/canvas-command.test.js && node scripts/canvas-command-schema.test.js && node scripts/canvas-command-guides.test.js && node scripts/prepare-canvas-runtime.test.js && node scripts/canvas-command-runtime.test.js && npm run test:canvas-operations && go test ./... && go vet ./...",
     "verify:canvas-runtime": "node scripts/prepare-canvas-runtime.js --check-only",
     "test:canvas-runtime": "node scripts/canvas-command-runtime.test.js",
     "test:canvas-operations": "node scripts/canvas-command-canvas-operations.test.js && node scripts/canvas-command-scene3d-operations.test.js && node scripts/canvas-command-timeline-operations.test.js"

scripts/marketing-skill.test.js

@@ -0,0 +1,203 @@
+const assert = require('assert');
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const http = require('http');
+const { spawnSync } = require('child_process');
+const { BASE, PATHS, validate, createClient, main } = require('../skills/xyq-marketing-skill/scripts/marketing');
+
+async function test() {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'xyq-marketing-'));
+  const received = [];
+  let respond;
+  const server = http.createServer(async (req, res) => {
+    const chunks = [];
+    for await (const chunk of req) chunks.push(chunk);
+    received.push({ url: req.url, method: req.method, headers: req.headers, body: Buffer.concat(chunks) });
+    respond(req, res);
+  });
+  await new Promise(resolve => server.listen(0, '127.0.0.1', resolve));
+  // Real HTTP streaming on loopback; public HTTPS destination is checked before mapping.
+  const targets = [];
+  const request = (url, opts, callback) => {
+    targets.push(url.href);
+    return http.request({ hostname: '127.0.0.1', port: server.address().port, path: url.pathname + url.search, ...opts }, callback);
+  };
+  const client = createClient({ key: 'test-secret', request, timeout: 1000 });
+  const json = value => { respond = (_, res) => { res.setHeader('Content-Type', 'application/json'); res.end(JSON.stringify(value)); }; };
+  const ids = { thread_id: 'marketing-thread', run_id: 'marketing-run' };
+  const response = (state, extra = {}) => ({ ret: '0', data: { ...ids, run_state: state, ...extra } });
+  try {
+    const body = { message: '按原文生成 🛍️', general_agent_settings: { video_model: 'seedance2.0_vision', ratio: 3, show_subtitle: false, duration_start: 15, duration_end: 15 } };
+    assert.strictEqual(validate(body), body);
+    for (const invalid of [
+      { message: '', general_agent_settings: {} },
+      { message: 'x' },
+      { message: 'x', general_agent_settings: {} },
+      { message: 'x', general_agent_settings: { video_model: ' ' } },
+      { message: 'x', general_agent_settings: { video_model: 'future-model', ratio: '9:16' } },
+      { message: 'x', general_agent_settings: { video_model: 'future-model', show_subtitle: 'false' } },
+      { message: 'x', general_agent_settings: { video_model: 'future-model', duration_start: 20, duration_end: 15 } },
+      { message: 'x', general_agent_settings: { video_model: 'future-model', duration_start: 1.5 } },
+      { message: 'x', general_agent_settings: { video_model: 'future-model', duration_start: 2147483648 } },
+      { message: 'x', general_agent_settings: {}, asset_ids: [123] },
+      { message: 'x', general_agent_settings: {}, TeamID: 'invented' },
+    ]) assert.throws(() => validate(invalid));
+    // New server model values remain usable without a Skill update.
+    validate({ message: 'x', general_agent_settings: { video_model: 'future-model' } });
+
+    const file = path.join(dir, 'request.json');
+    fs.writeFileSync(file, JSON.stringify(body));
+    const output = [];
+    assert.strictEqual(await main(['generate', '--request', file], {
+      env: {}, out: line => output.push(JSON.parse(line)), clientFactory: () => { throw new Error('dry-run contacted API'); },
+    }), 0);
+    assert.deepStrictEqual(output[0], { dry_run: true, url: BASE + PATHS.generate, body });
+    await assert.rejects(main(['generate', '--request', file, '--execute', '--dry-run']), /不能同时/);
+    await assert.rejects(main(['query', '--thread-id', ids.thread_id]), /run-id/);
+    await assert.rejects(main(['query', '--thread-id', ids.thread_id, '--run-id', ids.run_id, '--timeout', '0']), /timeout/);
+    await assert.rejects(main(['generate', '--request', file, '--source', 'codex']), /无效/);
+    await assert.rejects(createClient({ key: '', request }).api('balance', {}), /XYQ_ACCESS_KEY/);
+    assert.strictEqual(received.length, 0);
+
+    json({ ret: 0, log_id: 'log-submit', data: { run: { ...ids, state: 1 }, web_thread_link: 'https://xyq.jianying.com/task' } });
+    assert.strictEqual(await main(['generate', '--request', file, '--execute'], { out: () => {}, clientFactory: () => client }), 0);
+    assert.strictEqual(received.length, 1);
+    assert.deepStrictEqual(JSON.parse(received[0].body), body);
+    assert.strictEqual(received[0].url, PATHS.generate);
+    assert.strictEqual(received[0].headers.authorization, 'Bearer test-secret');
+    assert.strictEqual(targets[0], BASE + PATHS.generate);
+
+    const uploadFile = path.join(dir, '商品.png');
+    const imageBytes = Buffer.from([0, 1, 2, 255, 13, 10]);
+    fs.writeFileSync(uploadFile, imageBytes);
+    json({ ret: '0', data: { pippit_asset_id: 'asset-real' } });
+    assert.strictEqual((await client.upload(uploadFile)).data.pippit_asset_id, 'asset-real');
+    const upload = received[received.length - 1];
+    assert.strictEqual(upload.url, PATHS.upload);
+    assert(upload.body.includes(imageBytes));
+    assert(upload.body.includes(Buffer.from('name="file"')));
+    assert(upload.headers['content-type'].startsWith('multipart/form-data; boundary='));
+    assert.strictEqual(Number(upload.headers['content-length']), upload.body.length);
+    assert(!upload.body.includes(Buffer.from('test-secret')));
+    await assert.rejects(client.upload(dir), /非空文件/);
+
+    json({ ret: '0', data: { total_remain_amount: '0' } });
+    assert.strictEqual((await client.api('balance', {})).data.total_remain_amount, '0');
+    json({ ret: '12004', errmsg: 'permission denied', log_id: 'log-failure' });
+    await assert.rejects(client.api('generate', body), /12004.*permission denied.*log-failure/);
+    json({ ret: '0', data: { run: { thread_id: ids.thread_id } } });
+    await assert.rejects(client.api('generate', body), /禁止自动重提/);
+    json({ ret: false, data: {} });
+    await assert.rejects(client.api('balance', {}), /API 失败/);
+    json(response('3', { run_id: 'different' }));
+    await assert.rejects(client.api('query', ids), /不一致/);
+    json(response('unknown'));
+    await assert.rejects(client.api('query', ids), /run_state 缺失或格式异常/);
+    respond = (_, res) => { res.writeHead(302, { Location: 'https://other.example/secret' }); res.end(); };
+    let before = received.length;
+    await assert.rejects(client.api('generate', body), /HTTP 302/);
+    assert.strictEqual(received.length - before, 1, 'API redirect must not be followed');
+    respond = (_, res) => { res.writeHead(504); res.end(); };
+    before = received.length;
+    await assert.rejects(client.api('generate', body), /HTTP 504/);
+    assert.strictEqual(received.length - before, 1, 'submission must not retry');
+    respond = (_, res) => res.end('<html>not json</html>');
+    await assert.rejects(client.api('generate', body), /有效 JSON/);
+    respond = () => {};
+    await assert.rejects(createClient({ key: 'test-secret', request, timeout: 20 }).api('generate', body), /超时/);
+
+    const queryArgs = ['query', '--thread-id', ids.thread_id, '--run-id', ids.run_id];
+    const seenActions = [];
+    let states = [1, '2', 7, '8', 3];
+    let clock = 0;
+    const outputs = [];
+    const runtime = {
+      out: line => outputs.push(JSON.parse(line)), now: () => clock, pause: async ms => { clock += ms; },
+      clientFactory: () => ({ api: async (action, input) => {
+        seenActions.push(action); assert.deepStrictEqual(input, ids);
+        return response(states.shift(), { video_urls: ['https://cdn.example/final.mp4'] });
+      } }),
+    };
+    assert.strictEqual(await main([...queryArgs, '--wait'], runtime), 0);
+    assert.deepStrictEqual(seenActions, ['query', 'query', 'query', 'query', 'query']);
+    assert.strictEqual(outputs[0].data.run_state, 3);
+    assert.strictEqual(clock, 40000);
+    for (const state of [6, '6', 9, '9']) {
+      states = [state, 3];
+      const beforeClock = clock;
+      assert.strictEqual(await main([...queryArgs, '--wait'], runtime), 4);
+      assert.strictEqual(states.length, 1, 'input-required run must not be polled again');
+      assert.strictEqual(clock, beforeClock, 'input-required run must not sleep');
+      const result = outputs[outputs.length - 1];
+      assert.strictEqual(result.action_required, true);
+      assert.strictEqual(result.run_state_name, state == 9 ? 'HITL_Interrupt' : 'InputRequired');
+      assert.deepStrictEqual(result.data, response(state, { video_urls: ['https://cdn.example/final.mp4'] }).data);
+    }
+    states = [2, 7, 9, 3];
+    assert.strictEqual(await main([...queryArgs, '--wait'], runtime), 4);
+    assert.strictEqual(states.length, 1);
+    for (const state of [0, 99, '99']) {
+      states = [state, 3];
+      assert.strictEqual(await main([...queryArgs, '--wait'], runtime), 5);
+      assert.strictEqual(states.length, 1);
+      assert.strictEqual(outputs[outputs.length - 1].unknown_state, true);
+      assert.strictEqual(outputs[outputs.length - 1].data.run_state, state);
+    }
+    for (const state of [4, '5']) {
+      states = [state];
+      assert.strictEqual(await main([...queryArgs, '--wait'], runtime), 2);
+      assert.strictEqual(states.length, 0);
+    }
+    states = [8, 2];
+    assert.strictEqual(await main([...queryArgs, '--wait', '--max-wait', '1'], runtime), 3);
+    assert.strictEqual(states.length, 1, 'stop at deadline without a further query');
+    assert.strictEqual(outputs[outputs.length - 1].wait_timed_out, true);
+    states = [2];
+    assert.strictEqual(await main(queryArgs, runtime), 0, 'single pending query is not a completed video');
+    const emptyRuntime = { out: () => {}, clientFactory: () => ({ api: async () => response(3, { video_urls: [] }) }) };
+    assert.strictEqual(await main([...queryArgs, '--wait'], emptyRuntime), 2);
+
+    const media = Buffer.from('test-media-bytes');
+    respond = (req, res) => {
+      if (req.url === '/redirect') { res.writeHead(302, { Location: 'https://cdn.example/final.mp4' }); res.end(); }
+      else { res.setHeader('Content-Type', 'video/mp4'); res.end(media); }
+    };
+    before = received.length;
+    const dest = path.join(dir, 'video.mp4');
+    await client.download('https://cdn.example/redirect', dest);
+    assert.deepStrictEqual(fs.readFileSync(dest), media);
+    for (const call of received.slice(before)) assert.strictEqual(call.headers.authorization, undefined);
+    await assert.rejects(client.download('https://cdn.example/final.mp4', dest), /EEXIST/);
+    assert.deepStrictEqual(fs.readFileSync(dest), media);
+    await assert.rejects(client.download('http://cdn.example/final.mp4', path.join(dir, 'bad')), /HTTPS/);
+    respond = (_, res) => { res.setHeader('Content-Type', 'text/html'); res.end('login'); };
+    await assert.rejects(client.download('https://cdn.example/login', path.join(dir, 'login.mp4')), /未取得媒体/);
+    assert(!fs.existsSync(path.join(dir, 'login.mp4')));
+    respond = (_, res) => res.end();
+    const emptyFile = path.join(dir, 'empty.mp4');
+    await assert.rejects(client.download('https://cdn.example/empty', emptyFile), /为空/);
+    assert(!fs.existsSync(emptyFile));
+
+    // Exercise query + download orchestration and preserve raw IDs before delivery.
+    respond = (req, res) => {
+      if (req.url === PATHS.query) res.end(JSON.stringify(response('3', { video_urls: ['https://cdn.example/v.mp4'], image_urls: ['https://cdn.example/i.png'] })));
+      else { res.setHeader('Content-Type', 'application/octet-stream'); res.end(media); }
+    };
+    const delivery = [];
+    assert.strictEqual(await main([...queryArgs, '--output-dir', path.join(dir, 'results')], { out: line => delivery.push(JSON.parse(line)), clientFactory: () => client }), 0);
+    assert.strictEqual(delivery[0].data.run_id, ids.run_id);
+    assert.strictEqual(delivery[delivery.length - 1].downloaded_files.length, 2);
+    for (const file of delivery[delivery.length - 1].downloaded_files) assert.deepStrictEqual(fs.readFileSync(file.path), media);
+
+    const executable = path.resolve(__dirname, '../skills/xyq-marketing-skill/scripts/marketing.js');
+    const help = spawnSync(process.execPath, [executable, '--help'], { encoding: 'utf8', env: { ...process.env, XYQ_ACCESS_KEY: '' } });
+    assert.strictEqual(help.status, 0);
+    assert(help.stdout.includes('generate --request'));
+    console.log('Marketing Skill: validation, multipart, API errors, no replay, polling and media delivery passed');
+  } finally {
+    await new Promise(resolve => server.close(resolve));
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+}
+test().catch(error => { console.error(error); process.exitCode = 1; });