@lingjingai/lj-awb-cli-pre 0.3.16 → 0.3.18

package/README.md

@@ -22,12 +22,9 @@ CLI 本身只负责平台调用、参数校验、精简输出和安全确认；
 | 积分 | `credits` | 可扣积分余额、项目组预算、任务用量统计 |
 | 模型 | `model` | 生图 / 生视频模型发现、模型参数白名单 |
 | 上传 | `upload` | 本地图片 / 视频 / 音频上传为平台可访问素材 |
-| 图片 | `image` | 生图估价、提交、批量提交、状态查询 |
-| 视频 | `video` | 生视频估价、提交、批量提交、状态查询、去字幕 |
+| 创建 | `create` | 生图、生视频、主体、音色、素材和去字幕提交 |
 | 任务 | `task` | 任务列表、等待、任务台账和台账轮询 |
-| 资产 | `asset` | 素材库匹配、素材组、素材注册 |
 | 最终产物 | `artifact` | Workbench 剧本、资产、视频最终产物 CRUD 与本地 JSON 导入 |
-| 主体 | `subject` | 可复用主体资产发布与查询 |
 
 ## 环境要求
 
@@ -42,7 +39,7 @@ export LINGJING_AWB_API_ORIGIN=https://animeworkbench.lingjingai.cn
 export LINGJING_AWB_ACCESS_KEY=<access_key>
 ```
 
-兼容的 access key 变量：`LINGJING_AWB_ACCESS_KEY`、`AWB_ACCESS_KEY`、`AWB_CODE`、`ANIME_ACCESS_KEY`。
+`lj-awb` 只读取 `LINGJING_AWB_ACCESS_KEY` 作为环境变量 access key。
 
 ## 安装与运行
 
@@ -83,13 +80,13 @@ macOS 本地 wrapper `packages/awb-cli/bin/lj-awb` 会自动补充 Node 证书
 保存 access key 到本地认证文件：
 
 ```bash
-lj-awb auth login-key --access-key <access_key>
+lj-awb auth login --access-key <access_key>
 ```
 
 从环境变量读取并保存：
 
 ```bash
-LINGJING_AWB_ACCESS_KEY=<access_key> lj-awb auth login-key --from-env
+LINGJING_AWB_ACCESS_KEY=<access_key> lj-awb auth login
 ```
 
 不落盘，直接让每次调用读取环境变量：
@@ -114,7 +111,7 @@ lj-awb account info
 lj-awb doctor
 lj-awb doctor --verify
 lj-awb schema -f json
-lj-awb schema --domain video -f json
+lj-awb schema --domain create -f json
 lj-awb auth status
 lj-awb auth verify
 lj-awb account info
@@ -148,8 +145,8 @@ Agent 不应该靠记忆猜命令参数。进入任务前推荐先读取机器
 
 ```bash
 lj-awb schema -f json
-lj-awb schema --domain image -f json
-lj-awb schema --domain video --command create -f json
+lj-awb schema --domain create -f json
+lj-awb schema --domain create --command video -f json
 ```
 
 正式创作前推荐做一次体检：
@@ -235,7 +232,7 @@ lj-awb create video \
 如果参考图会复用，推荐先发布主体资产：
 
 ```bash
-lj-awb create subject --name 女主 --primary-file ./actor.png --yes
+lj-awb create subject --model-code tx --name 女主 --resource primary:./actor.png --yes
 lj-awb create subject-wait --element-id <elementId> --wait-seconds 300
 lj-awb create video \
   --model-group-code <modelGroupCode> \
@@ -247,7 +244,7 @@ lj-awb create video \
 
 ## JSON 输出契约
 
-默认输出是 compact text，适合终端和 Agent 低 token 读取；只有需要完整嵌套结构、稳定 JSON envelope 或脚本严格解析时才追加 `-f json` 或 `--json`。`schema` 通常使用 JSON；`model options` 和 `model create-spec` 默认 text 先读，必要时再切 JSON。
+默认输出是 compact text，适合终端和 Agent 低 token 读取；复杂模型命令使用 `section:` + 缩进 `key=value` 的分区格式，避免 `params`、`resources`、`intents`、`next` 混在一屏里。只有需要完整嵌套结构、稳定 JSON envelope 或脚本严格解析时才追加 `-f json` 或 `--json`。`schema` 通常使用 JSON；`model options` 和 `model create-spec` 默认 text 先读，必要时再切 JSON。
 
 输出字段只保留后续动作不可替代的信息。默认不返回平台原始 `raw`、COS 签名细节、重复的首个结果字段；任务结果统一使用 `resultUrls` 表达。
 
@@ -273,7 +270,7 @@ lj-awb create video \
   "error": {
     "type": "auth_required",
     "message": "缺少 access key",
-    "hint": "请设置 LINGJING_AWB_ACCESS_KEY / AWB_ACCESS_KEY，或运行 lj-awb auth login-key。"
+    "hint": "请设置 LINGJING_AWB_ACCESS_KEY，或运行 lj-awb auth login。"
   },
   "meta": {
     "command": "account info",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingjingai/lj-awb-cli-pre",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "Lingjing AWB CLI monorepo with shared core, standalone CLI, and agent skills (pre-release build pointing to https://animeworkbench-pre.lingjingai.cn)",
   "license": "MIT",
   "type": "module",

package/packages/awb-cli/README.md

@@ -13,7 +13,4 @@ node bin/lj-awb.js auth status -f json
 
 ```bash
 export LINGJING_AWB_ACCESS_KEY=<access_key>
-# 兼容 AWB 既有变量：
-export AWB_ACCESS_KEY=<access_key>
-export AWB_CODE=<access_key>
 ```

package/packages/awb-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingjingai/awb-cli-bin",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "Standalone CLI for Lingjing AWB",
   "private": true,
   "license": "MIT",
@@ -13,6 +13,6 @@
     "README.md"
   ],
   "dependencies": {
-    "@lingjingai/awb-core": "0.3.16"
+    "@lingjingai/awb-core": "0.3.18"
   }
 }

package/packages/awb-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingjingai/awb-core",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "Shared core runtime for Lingjing AWB CLI",
   "license": "MIT",
   "type": "module",

package/packages/awb-core/src/api.js

@@ -177,6 +177,10 @@ export async function fetchModelGroupInfoAll(modelGroupCode) {
   return await apiFetch(`/api/resource/model/info/group/${encodeURIComponent(modelGroupCode)}/all`, { method: 'GET' });
 }
 
+export async function fetchAssetReviewModels() {
+  return await apiFetch('/api/material/creation/model/asset-review/list', { method: 'GET' });
+}
+
 export async function fetchUploadSecret(payload = {}) {
   return await apiFetch('/api/anime/workbench/TencentCloud/getSecret', { body: payload });
 }
@@ -241,8 +245,11 @@ export async function listAssetGroups(payload = {}) {
   return await apiFetch('/api/material/asset-groups/list', { body: payload });
 }
 
-export async function getAssetGroup(groupId) {
-  return await apiFetch(`/api/material/asset-groups/${encodeURIComponent(groupId)}`, { method: 'GET' });
+export async function getAssetGroup(groupId, payload = {}) {
+  return await apiFetch(`/api/material/asset-groups/${encodeURIComponent(groupId)}`, {
+    method: 'GET',
+    query: payload,
+  });
 }
 
 export async function createAssetGroup(payload = {}) {

package/packages/awb-core/src/auth.js

@@ -37,7 +37,7 @@ export async function resolveAuthContext({ required = true } = {}) {
     throw new LingjingAwbCliError('缺少 access key', {
       type: 'auth_required',
       exitCode: 3,
-      hint: '请设置 LINGJING_AWB_ACCESS_KEY / AWB_ACCESS_KEY，或运行 lj-awb auth login。',
+      hint: '请设置 LINGJING_AWB_ACCESS_KEY，或运行 lj-awb auth login。',
     });
   }
   return {

package/packages/awb-core/src/commands.js

@@ -8,6 +8,7 @@ import {
   assetGroupList,
   assetGroupUpdate,
   assetMatchActor,
+  assetReviewModels,
   assetRegister,
   creditsBalance,
   creditsUsageSummary,
@@ -74,6 +75,7 @@ const PROJECT_ID_ARG = { name: 'project-id', valueName: 'projectId', description
 const PROJECT_GROUP_ARG = { name: 'project-group-no', valueName: 'no', description: '项目组编号；不传时读取当前项目组 / 环境变量 / 本地状态' };
 const CUSTOM_BIZ_ARG = { name: 'custom-biz-id', valueName: 'id', description: '外部追踪 ID；不传则请求不携带 customBizId' };
 const MODEL_GROUP_ARG = { name: 'model-group-code', valueName: 'code', description: '模型组编码；创建和参数查询只传这个字段' };
+const ASSET_PLATFORM_ARG = { name: 'platform', valueName: 'platform', description: '素材加白平台，必须显式传 JIMENG 或 BYTEPLUS，不做别名推断' };
 const MODEL_LIST_ARGS = [
   { name: 'model', valueName: 'keyword', description: '按模型名、编码、供应商或输入方式过滤；不传时查询全部' },
   { name: 'limit', valueName: 'n', description: '默认文本最多展示 N 条，默认 8；JSON 输出始终返回全部匹配' },
@@ -167,7 +169,7 @@ export function registerAwbCommands(cli) {
         'LINGJING_AWB_ACCESS_KEY=<key> lj-awb auth login',
         'lj-awb auth login --access-key <key> --skip-verify',
       ],
-      hint: '不要写成 lj-awb auth <key>。不传 --access-key 时自动读取 LINGJING_AWB_ACCESS_KEY / AWB_ACCESS_KEY / AWB_CODE 环境变量。',
+      hint: '不要写成 lj-awb auth <key>。不传 --access-key 时只读取 LINGJING_AWB_ACCESS_KEY 环境变量。',
     }),
     args: [
       { name: 'access-key', valueName: 'key', description: '平台 access key；不传时读取环境变量' },
@@ -176,7 +178,7 @@ export function registerAwbCommands(cli) {
     ],
     func: async (_ctx, kwargs) => {
       const skipVerify = toBool(kwargs.skipVerify);
-      const accessKey = trimSecret(kwargs.accessKey || process.env.LINGJING_AWB_ACCESS_KEY || process.env.AWB_ACCESS_KEY || process.env.AWB_CODE || process.env.ANIME_ACCESS_KEY || '');
+      const accessKey = trimSecret(kwargs.accessKey || process.env.LINGJING_AWB_ACCESS_KEY || '');
       if (!accessKey) {
         throw new LingjingAwbCliError('缺少 access key', {
           type: 'argument_error',
@@ -399,6 +401,24 @@ export function registerAwbCommands(cli) {
     func: async (_ctx, kwargs) => listModels('video', kwargs),
   });
 
+  cli({
+    name: 'model asset-review-models',
+    description: commandHelp('查询支持素材加白的模型组与平台平铺关系', {
+      examples: [
+        'lj-awb model asset-review-models',
+        'lj-awb model asset-review-models --platform JIMENG',
+        'lj-awb model asset-review-models --model-group-code <code>',
+      ],
+      hint: '该命令只负责发现 modelGroupCode 与 platform 的关系；资产组和素材创建仍通过 create asset-group / create asset 显式传 --platform。',
+    }),
+    args: [
+      MODEL_GROUP_ARG,
+      ASSET_PLATFORM_ARG,
+      INCLUDE_RAW_ARG,
+    ],
+    func: async (_ctx, kwargs) => assetReviewModels(kwargs),
+  });
+
   cli({
     name: 'model options',
     description: commandHelp('查询指定模型支持的 CLI 参数、枚举值、素材约束和条件约束', {
@@ -448,7 +468,8 @@ export function registerAwbCommands(cli) {
     description: commandHelp('上传本地图片 / 视频 / 音频到平台 COS，并返回 backendPath / URL', {
       examples: [
         'lj-awb upload files --files ./a.png,./b.mp4 --dry-run',
-        'lj-awb upload files --file ./ref.png --scene-type material-video-create',
+        'lj-awb upload files --file ./ref.png',
+        'lj-awb upload files --file ./first-frame.png --scene-type material-video-create',
       ],
       hint: '不会暴露 COS 临时密钥；skill 只使用返回的 backendPath / url。',
     }),
@@ -456,7 +477,7 @@ export function registerAwbCommands(cli) {
       { name: 'file', valueName: 'path', description: '单个文件路径' },
       { name: 'files', valueName: 'paths', description: '多个文件路径，逗号分隔' },
       { name: 'files-json', valueName: 'path|json', description: '文件数组 JSON 或 JSON 文件路径' },
-      { name: 'scene-type', valueName: 'scene', description: '上传场景，默认 material-image-edit' },
+      { name: 'scene-type', valueName: 'scene', description: '上传场景；未传时图片默认 material-image-draw，音视频默认 material-video-create；图片用于视频 / 主体复用时显式传 material-video-create' },
       { name: 'project-no', valueName: 'no', description: '可选项目组编号；不传时读取当前项目组 / 环境变量 / 本地状态' },
       DRY_RUN_ARG,
     ],
@@ -726,10 +747,11 @@ export function registerAwbCommands(cli) {
   cli({
     name: 'create asset-groups',
     description: commandHelp('查询素材组', {
-      examples: ['lj-awb create asset-groups --name "女主"'],
+      examples: ['lj-awb create asset-groups --platform JIMENG --name "女主"'],
     }),
     args: [
       { name: 'name', valueName: 'keyword', description: '素材组名称关键词' },
+      ASSET_PLATFORM_ARG,
       { name: 'group-ids', valueName: 'ids', description: '素材组 ID，逗号分隔' },
       { name: 'page-number', valueName: 'n', description: '页码' },
       { name: 'page-size', valueName: 'n', description: '每页数量' },
@@ -741,9 +763,12 @@ export function registerAwbCommands(cli) {
   cli({
     name: 'create asset-group-get',
     description: commandHelp('查看素材组详情', {
-      examples: ['lj-awb create asset-group-get --group-id <id>'],
+      examples: ['lj-awb create asset-group-get --group-id <id> --platform JIMENG'],
     }),
-    args: [{ name: 'group-id', valueName: 'id', description: '素材组 ID' }],
+    args: [
+      { name: 'group-id', valueName: 'id', description: '素材组 ID' },
+      ASSET_PLATFORM_ARG,
+    ],
     func: async (_ctx, kwargs) => assetGroupGet(kwargs),
   });
 
@@ -751,13 +776,14 @@ export function registerAwbCommands(cli) {
     name: 'create asset-group',
     description: commandHelp('创建素材组（用于素材注册时作为命名空间）', {
       examples: [
-        'lj-awb create asset-group --name "女主素材组" --dry-run',
-        'lj-awb create asset-group --name "女主素材组" --description "用于第二集女主相关素材" --yes',
+        'lj-awb create asset-group --name "女主素材组" --platform JIMENG --dry-run',
+        'lj-awb create asset-group --name "女主素材组" --platform JIMENG --description "用于第二集女主相关素材" --yes',
       ],
     }),
     args: [
       { name: 'name', valueName: 'name', description: '素材组名称' },
       { name: 'description', valueName: 'text', description: '素材组描述' },
+      ASSET_PLATFORM_ARG,
       { name: 'project-name', valueName: 'name', description: '项目名，默认 default' },
       DRY_RUN_ARG,
       YES_ARG,
@@ -768,12 +794,13 @@ export function registerAwbCommands(cli) {
   cli({
     name: 'create asset-group-update',
     description: commandHelp('更新素材组名称 / 描述', {
-      examples: ['lj-awb create asset-group-update --group-id <id> --name "新名称" --dry-run'],
+      examples: ['lj-awb create asset-group-update --group-id <id> --platform JIMENG --name "新名称" --dry-run'],
     }),
     args: [
       { name: 'group-id', valueName: 'id', description: '素材组 ID' },
       { name: 'name', valueName: 'name', description: '新名称' },
       { name: 'description', valueName: 'text', description: '新描述' },
+      ASSET_PLATFORM_ARG,
       { name: 'project-name', valueName: 'name', description: '项目名' },
       DRY_RUN_ARG,
       YES_ARG,
@@ -784,7 +811,7 @@ export function registerAwbCommands(cli) {
   cli({
     name: 'create asset',
     description: commandHelp('把 COS 路径 / URL / 本地文件注册成平台素材', {
-      examples: ['lj-awb create asset --group-id <id> --url "material/upload/a.png" --name "女主正面" --dry-run'],
+      examples: ['lj-awb create asset --group-id <id> --platform JIMENG --url "asset-review/upload/a.png" --name "女主正面" --dry-run'],
     }),
     args: [
       { name: 'group-id', valueName: 'id', description: '素材组 ID' },
@@ -792,7 +819,7 @@ export function registerAwbCommands(cli) {
       { name: 'file', valueName: 'path', description: '本地素材文件；会先上传' },
       { name: 'url', valueName: 'url', description: '素材 URL 或 COS 路径' },
       { name: 'backend-path', valueName: 'path', description: 'upload files 返回的 backendPath' },
-      { name: 'platform', valueName: 'platform', description: '可选平台字段' },
+      ASSET_PLATFORM_ARG,
       DRY_RUN_ARG,
       YES_ARG,
     ],
@@ -1276,12 +1303,12 @@ export function registerAwbCommands(cli) {
         'lj-awb create subject --model-code tx --name 女主 --resource primary:./three-view.png --dry-run',
         'lj-awb create subject --model-code vidu --name 女主 --resource primary:material/assets/a.png --resource face:./face.png --yes',
       ],
-      hint: '参考图 slot：primary | three-view | face | side | back。主体 modelCode：KeLing / 可灵 → tx，Vidu → vidu。无 primary 时 three-view 自动升为主图；本地路径（./ 或绝对路径）会自动上传，含 :// 或 material/ 前缀的视为已上传 URL。',
+      hint: '参考图 slot：primary | three-view | face | side | back。主体 modelCode 只接受 tx / vidu：KeLing / 可灵主体明确传 tx，Vidu 主体明确传 vidu。无 primary 时 three-view 自动升为主图；本地路径（./ 或绝对路径）会自动上传，含 :// 或 material/ 前缀的视为已上传 URL。',
     }),
     args: [
       { name: 'name', valueName: 'name', description: '主体名称' },
       { name: 'description', valueName: 'text', description: '主体描述' },
-      { name: 'model-code', valueName: 'code', description: '主体创建模型编码 tx / vidu；KeLing / 可灵用 tx，Vidu 用 vidu' },
+      { name: 'model-code', valueName: 'code', description: '主体创建模型编码，仅 tx / vidu；KeLing / 可灵传 tx，Vidu 传 vidu' },
       { name: 'reference-type', valueName: 'type', description: '参考类型，默认 image_refer' },
       { name: 'voice-id', valueName: 'id', description: '参考音色 ID，可选' },
       { name: 'tags-json', valueName: 'json', description: '标签数组，例如 [{"tagId":"o_102"}]' },
@@ -1363,7 +1390,7 @@ export function registerAwbCommands(cli) {
     }),
     args: [
       { name: 'input-file', valueName: 'path', description: '批量输入文件' },
-      { name: 'model-code', valueName: 'code', description: '默认主体创建模型编码 tx / vidu；单条可覆盖' },
+      { name: 'model-code', valueName: 'code', description: '默认主体创建模型编码，仅 tx / vidu；单条可覆盖' },
       { name: 'project-name', valueName: 'name', description: '默认项目名' },
       { name: 'concurrency', valueName: 'n', description: '并发数，默认 1' },
       DRY_RUN_ARG,

package/packages/awb-core/src/common.js

@@ -14,14 +14,15 @@ export const API_ORIGIN = (
 export const APP_HOME_DIR = process.env.LINGJING_AWB_STATE_DIR || process.env.ANIME_STATE_DIR || path.join(os.homedir(), '.lingjingai', 'awb');
 export const AUTH_PATH = process.env.LINGJING_AWB_AUTH_PATH || process.env.ANIME_AUTH_PATH || path.join(APP_HOME_DIR, 'auth.json');
 export const STATE_PATH = process.env.LINGJING_AWB_STATE_PATH || process.env.ANIME_STATE_PATH || path.join(APP_HOME_DIR, 'state.json');
-export const ACCESS_KEY_ENV_NAMES = ['LINGJING_AWB_ACCESS_KEY', 'AWB_ACCESS_KEY', 'AWB_CODE', 'ANIME_ACCESS_KEY'];
+export const ACCESS_KEY_ENV_NAMES = ['LINGJING_AWB_ACCESS_KEY'];
 export const TASK_UPLOAD_SCENE = {
   IMAGE_CREATE: 'material-image-draw',
   IMAGE_EDIT: 'material-image-edit',
   VIDEO_CREATE: 'material-video-create',
   VIDEO_GROUP: 'material-video-create',
   SUBJECT: 'material-video-create',
-  DEFAULT: 'material-image-edit',
+  ASSET_REVIEW: 'asset-review',
+  DEFAULT: 'material-image-draw',
 };
 export const TERMINAL_TASK_STATES = new Set([
   'SUCCESS',