openyida 2026.9.11-3 → 2026.9.11

package/README.md

@@ -210,8 +210,6 @@ openyida data create form APP_XXX FORM_XXX --expect-form-name 客户 --expect-fo
 openyida get-permission APP_XXX FORM_XXX
 ```
 
-Append and forward permissions are configured in the process definition through `nodes[].actions.normalActions/appendActions`. Both `create-process` and `configure-process` compile these settings into matching designer and runtime properties. See [approval action configuration](yida-skills/skills/yida-process-rule/references/approval-actions.md) for the JSON example, defaults, and verification limits.
-
 `configure-process` 的流程 JSON 中，审批人可配置为发起人、指定成员、指定角色、部门主管或直属主管，例如：
 
 ```json
@@ -456,8 +454,8 @@ Run `openyida --help` or `openyida <command> --help` for detailed usage.
 
 | Command | Description |
 |---------|-------------|
-| `openyida configure-process <appType> <formUuid> <definition> [processCode] [--replace]` | Configure and publish process rules; Supports append/forward via JSON nodes[].actions.normalActions/appendActions |
-| `openyida create-process <appType> ... [--replace]` | Create process form (all-in-one); Supports append/forward via JSON nodes[].actions.normalActions/appendActions |
+| `openyida configure-process <appType> <formUuid> <definition> [processCode] [--replace]` | Configure and publish process rules |
+| `openyida create-process <appType> ... [--replace]` | Create process form (all-in-one) |
 | `openyida ai-form-setting <get\|fields\|models\|enable\|disable\|save> <appType> ...` | Manage process form AI approval prompts |
 | `openyida process preview <appType> ...` | Preview process instance (visual flowchart) |
 
@@ -531,7 +529,7 @@ Run `openyida --help` or `openyida <command> --help` for detailed usage.
 | `openyida batch <file>\|--commands "cmd1 ; cmd2" [--stop-on-error] [--json]` | Run OpenYida commands in batch |
 | `openyida flash-to-prd --file <path> --name "<project>"` | Convert flash notes or meeting notes to a PRD prompt |
 | `openyida ai <text\|image> [options]` | Call Yida AI text and image recognition APIs |
-| `openyida asset <status\|resolve\|sources> [options]` | Detect asset capability / resolve materials |
+| `openyida asset <status\|resolve\|generate> [options]` | Detect asset capability / resolve materials |
 | `openyida cdn-config [options]` | Configure CDN / OSS upload |
 | `openyida cdn-upload <image-path>` | Upload image to CDN |
 | `openyida cdn-refresh [options]` | Refresh CDN cache |
@@ -562,7 +560,7 @@ The runner rejects public generic echo services such as httpbin and example.com.
 
 The opt-in `node scripts/e2e-real/connector/action-update-runner.js` regression uses the owner-confirmed login-free `www.aliwork.com` fixture and a single owned NONE-auth connector containing a target action plus one preservation sentinel. Enable it with `OPENYIDA_E2E=1 OPENYIDA_E2E_CONNECTOR_ACTION_UPDATE=1`. It verifies isolated `currentPage`, `pageSize`, `userLanguage`, `searchFieldJson`, and dynamic `_stamp` edits, restores each field and the final baseline, and persists only response structure, data count, and SHA-256. It never stores response row values or auth/profile/corp identifiers, never retries unknown writes, and intentionally leaves the owned connector as a `cleanup_blocked` residual because no proven delete API exists.
 
-`openyida asset resolve --input manifest-draft.json --manifest asset-manifest.json --json` validates every image slot and writes a traceable manifest. Search assets only accept Unsplash/Pexels; draft results exit with code 2. Use `--offline` to block URL checks and uploads.
+`openyida asset resolve --hero <path-or-url> --product <path-or-url> --require-hero --upload-assets --json` is the preferred preflight for homepage visuals. It handles local files and external image references in one flow, uploads or mirrors them when CDN is configured, and returns `materialStatus: final|draft|none` so agents do not claim an unfinished visual page is final.
 
 #### Environment and Localization
 

package/bin/yida.js

@@ -496,7 +496,6 @@ const MANIFEST_HELP_PATHS = Object.freeze({
   data: ['data'],
   report: ['report'],
   'create-process': ['create-process'],
-  'configure-process': ['configure-process'],
   'create-report': ['create-report'],
   'append-chart': ['append-chart'],
   'save-share-config': ['save-share-config'],

package/lib/ai/ai.js

@@ -31,7 +31,6 @@ const IMAGE_MIME_TYPES = {
   '.gif': 'image/gif',
   '.webp': 'image/webp',
   '.bmp': 'image/bmp',
-  '.svg': 'image/svg+xml',
 };
 
 function printHelp() {
@@ -501,7 +500,6 @@ module.exports = {
   getAuthRef,
   callTextFromAI,
   uploadImageForAI,
-  inferAppType,
   invokeImageRecognition,
   normalizeImageResult,
   parseArgs,

package/lib/app/update-app.js

@@ -221,16 +221,6 @@ function normalizeLayoutDirection(layoutDirection) {
   return normalized;
 }
 
-/** 与 yc-utils 的应用配置归一化一致；不应用详情页 Shell 的 top_fold 覆盖。 */
-function normalizeStoredLayoutDirection(layoutDirection, navType) {
-  if (SUPPORTED_LAYOUT_DIRECTIONS.includes(layoutDirection)) {return layoutDirection;}
-  if (layoutDirection === 'hoz') {return navType === 'top_side' ? 'l_shape' : 'top';}
-  if (layoutDirection === 'ver') {return 'side';}
-  if (navType === 'top_fold') {return 'top';}
-  if (navType === 'top_side') {return 'l_shape';}
-  return 'side';
-}
-
 function pickAppField(currentApp, fieldName, configName) {
   if (currentApp[fieldName] !== undefined && currentApp[fieldName] !== null) {
     return currentApp[fieldName];
@@ -306,8 +296,6 @@ function buildUpdateAppPostData(params, currentApp = {}, authRef) {
   const currentCustomThemeStyle = pickAppField(currentApp, 'customThemeStyle', 'CUSTOM_THEME_STYLE');
   const addWaterMark = pickAppField(currentApp, 'addWaterMark', 'ADDWATERMARK');
   const sentryMode = pickAppField(currentApp, 'sentryMode', 'SENTRY_MODE');
-  const currentNavType = currentApp.navType || (currentApp.config && currentApp.config.NAVTYPE);
-  const currentLayoutDirection = currentApp.layoutDirection || (currentApp.config && currentApp.config.LAY_OUT_DIRECTION);
   if (params.colour === 'custom' && !params.themeColor && !currentThemeColor) {
     throw new Error(t('update_app.custom_theme_color_required'));
   }
@@ -331,10 +319,9 @@ function buildUpdateAppPostData(params, currentApp = {}, authRef) {
     mode: currentApp.mode || (currentApp.config && currentApp.config.APPMODE) || 'normal',
     type: currentApp.type || (currentApp.config && currentApp.config.APPTYPE) || 'single',
     navTheme: params.navTheme || currentApp.navTheme || (currentApp.config && currentApp.config.NAV_THEME) || 'light',
+    navType: currentApp.navType || (currentApp.config && currentApp.config.NAVTYPE) || 'top_side',
     navLayout: currentApp.navLayout || (currentApp.config && currentApp.config.NAVLAYOUT) || 'auto',
-    layoutDirection: params.layoutDirection
-      ? normalizeLayoutDirection(params.layoutDirection)
-      : normalizeStoredLayoutDirection(currentLayoutDirection, currentNavType),
+    layoutDirection: params.layoutDirection || currentApp.layoutDirection || (currentApp.config && currentApp.config.LAY_OUT_DIRECTION) || 'side',
     homepageLogo: currentApp.homepageLogo || (currentApp.config && currentApp.config.HOMEPAGELOGO) || '',
     logoSource: params.logoSource || currentApp.logoSource || (currentApp.config && currentApp.config.LOGO_SOURCE) || 'appIcon',
     logoLink: currentApp.logoLink || (currentApp.config && currentApp.config.LOGOLINK) || '',
@@ -359,8 +346,6 @@ function buildUpdateAppPostData(params, currentApp = {}, authRef) {
     pageFooter: currentApp.pageFooter || '',
   };
 
-  // ThemeNavSetting 保存现有 navType；新布局由 layoutDirection 控制，不反写或补造旧字段。
-  if (currentNavType) {postDataObj.navType = currentNavType;}
   if (addWaterMark !== undefined && addWaterMark !== null) {
     postDataObj.addWaterMark = addWaterMark;
   }

package/lib/asset/ai-image.js

@@ -1,60 +1,89 @@
 
+/**
+ * ai-image.js - 图片素材来源能力检测（诚实降级 + 引导本地 agent）
+ *
+ * P3 素材工具化的关键澄清：openyida 本身没有内置「文生图」API，
+ * `openyida ai` 只支持文生文与识图，不能凭空生成图片 URL。
+ *
+ * 因此本模块不假装能生成图片，而是：
+ *   1. 诚实地检测「是否存在内置图片生成能力」（目前恒为 false）；
+ *   2. 把「生成/寻找素材」这件事交回给正在驱动本 CLI 的智能体（Claude/Codex 等），
+ *      由 skill 文档引导它：能自己生成就生成，否则去免费素材库搜真实图片；
+ *   3. 提供推荐的免费/可商用素材库清单与使用纪律，供 skill / agent 参考。
+ *
+ * 无论走哪条路，候选素材都交给 asset resolve 统一解析；有 CDN 时再转存，
+ * 绝不把编造的 URL 直接写进页面。
+ *
+ * 用法：
+ *   const { detectImageGenerator, getFreeStockLibraries, getMaterialSourcingGuidance } = require('./ai-image');
+ *   const g = detectImageGenerator();  // { available:false, reason, delegateToAgent:true }
+ */
+
 'use strict';
 
+/**
+ * 推荐的免费 / 可商用图片素材库
+ * 说明：这些站点提供免费可商用（多为 CC0 / 自有免费授权）的高质量图片，
+ * 适合官网 Hero、产品图、场景配图。agent 应优先从这里取真实图片 URL，
+ * 取到后交给 `openyida asset resolve` 统一处理。
+ */
 const FREE_STOCK_LIBRARIES = [
   {
     name: 'Unsplash',
     site: 'https://unsplash.com',
-    license: '遵守 Unsplash License 和 API Guidelines',
-    bestFor: 'Hero、生活方式和场景图',
-    directImageHint: '使用 API 返回的 images.unsplash.com URL。',
-    deliveryPolicy: '下载授权图片后上传宜搭附件；保留署名和 download_location 记录。',
+    license: 'Unsplash License（免费可商用，无需署名）',
+    bestFor: '高质量摄影级 Hero 大图、生活方式/场景图',
+    directImageHint:
+      'images.unsplash.com/photo-... 形式的直链可直接用于 <img>；页面链接需先取得图片直链。',
   },
   {
     name: 'Pexels',
     site: 'https://www.pexels.com',
-    license: '遵守 Pexels License 和 API Guidelines',
-    bestFor: '产品、办公、人物和场景图',
+    license: 'Pexels License（免费可商用，无需署名）',
+    bestFor: '产品/办公/团队/自然等主题摄影图与短视频',
     directImageHint: 'images.pexels.com/photos/... 形式为图片直链。',
-    deliveryPolicy: '下载后上传宜搭附件；保留 Pexels 链接和摄影师信息。',
+  },
+  {
+    name: 'Pixabay',
+    site: 'https://pixabay.com',
+    license: 'Pixabay Content License（免费可商用）',
+    bestFor: '插画、矢量、照片综合库',
+    directImageHint: 'cdn.pixabay.com/photo/... 形式为图片直链。',
+  },
+  {
+    name: 'Undraw',
+    site: 'https://undraw.co/illustrations',
+    license: 'unDraw open-source license（免费可商用，可改色）',
+    bestFor: '扁平风品牌插画、空状态/引导插画（SVG，可随品牌色变量着色）',
+    directImageHint: '导出 SVG 或使用官方 CDN SVG 直链。',
   },
 ];
 
 /**
  * 检测是否存在「内置图片生成能力」。
  *
- * openyida 无内置文生图连接器。宿主能力未确认时返回 available:null，
- * 由 Agent 检查真实工具清单。
+ * 目前 openyida 无内置文生图连接器，恒返回 available:false，并显式声明
+ * 由 agent 接管素材来源（避免任何模块据此伪造图片 URL）。
  *
  * @param {object} [options]
- * @returns {{ status: string, available: boolean|null, reason: string, delegateToAgent: boolean }}
+ * @param {boolean} [options.hasImageGenConnector] 预留：未来若配置了文生图连接器可置 true
+ * @returns {{ available: boolean, reason: string, delegateToAgent: boolean }}
  */
 function detectImageGenerator(options = {}) {
-  const capability = options.hostCapabilities && options.hostCapabilities.image_generation;
-  if (capability && capability.status === 'available') {
+  if (options.hasImageGenConnector) {
     return {
-      status: 'available',
       available: true,
-      reason: '当前宿主可生成图片；生成后交给 asset resolve。',
-      delegateToAgent: true,
-      source: capability.source || 'host_capability',
-    };
-  }
-  if (capability && capability.status === 'unavailable') {
-    return {
-      status: 'unavailable',
-      available: false,
-      reason: '当前宿主不支持图片生成。',
+      reason: '检测到已配置的文生图连接器，可由连接器生成图片后再转存 CDN。',
       delegateToAgent: false,
-      source: capability.source,
     };
   }
   return {
-    status: 'unknown',
-    available: null,
-    reason: '当前宿主未确认图片生成能力。',
+    available: false,
+    reason:
+      'openyida 无内置文生图能力（`openyida ai` 仅支持文生文/识图）。' +
+      '图片素材应由智能体自行生成，或到免费素材库（Unsplash/Pexels 等）检索真实图片，' +
+      '再交给 `openyida asset resolve` 解析、（有 CDN 时）转存 CDN 后回填 spec。',
     delegateToAgent: true,
-    source: (capability && capability.source) || 'host_tool_inventory_required',
   };
 }
 
@@ -73,18 +102,17 @@ function getFreeStockLibraries() {
 function getMaterialSourcingGuidance() {
   return {
     steps: [
-      '1. 先用用户提供的素材。',
-      '2. 再从 Unsplash / Pexels 搜图。',
-      '3. 仍有缺口时使用宿主生图。',
-      '4. 最后使用中性占位并保持 draft。',
-      '5. 所有候选图通过 asset resolve 写入 manifest。',
+      '1. 判断页面是否需要真实图片（官网 Hero / 产品图 / 场景图通常需要）。',
+      '2. 优先：若智能体自身具备图片生成能力，按品牌调性生成图片并保存到本地。',
+      '3. 备选：到免费可商用素材库（见 libraries）检索与主题匹配的真实图片，拿到图片直链。',
+      '4. 解析：把本地文件或外链交给 `openyida asset resolve` 统一处理并回填 spec.assets；已配置 CDN 时转存为稳定 URL。',
+      '5. 兜底：若既无生成能力又找不到可用素材，交付「标注素材缺口」的低保真草稿，绝不编造图片 URL 或声称已上传。',
     ],
     libraries: getFreeStockLibraries(),
     rules: [
-      '不编造图片 URL；按 manifest 的页面状态继续，只使用当前页 materialStatus=final 的图片。',
-      '默认下载并上传宜搭图片附件；超过 20 MiB 保留原链接；不额外探测 URL，下载失败跳过并记录缺口。',
-      '联网搜图仅使用 Unsplash / Pexels。',
-      '来源不明时使用中性占位或宿主生成图。',
+      '绝不编造图片 URL；素材经 `openyida asset resolve` 统一处理后再写进页面。',
+      '无 CDN 时不得声称「已上传」或「已是最终版」。',
+      '素材授权需为免费可商用；如不确定授权，改用文字排版/数据图示/插画（如 unDraw）替代。',
     ],
   };
 }

package/lib/asset/asset-cmd.js

@@ -1,104 +1,82 @@
+
+/**
+ * asset-cmd.js - `openyida asset` 素材能力命令
+ *
+ * 素材工具的统一入口，把「检测素材能力 / 解析回填 / 素材来源引导」
+ * 暴露为可脚本化命令，供本地智能体在生成官网/落地页前调用，
+ * 从而做到：无 CDN 不谎称已上传、无可用素材不交付「最终版」。
+ *
+ * 子命令：
+ *   status                     检测当前素材能力（CDN / 生成 / 推荐策略）
+ *   resolve --hero <..> [--product <..>] [--upload-assets]  解析并回填一组素材，输出 materialStatus/缺口
+ *   generate                   输出素材来源引导（免费素材库清单 + 纪律）
+ *
+ * 所有子命令均支持 --json 便于智能体解析。
+ */
+
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
-const { readDesignAssetStrategy } = require('./asset-plan');
 const { getAssetStatus } = require('./asset-status');
-const { resolveAssets, ASSET_SOURCES } = require('./asset-resolve');
-const { detectImageGenerator, getMaterialSourcingGuidance } = require('./ai-image');
-const { throwCommandError, throwStatus, throwUsage } = require('../core/command-errors');
-
-const RESOLVE_USAGE = '用法: openyida asset resolve (--input <manifest-draft.json> | --slot <slotId>=<路径或URL> ...) [--manifest <asset-manifest.json>] [--design <design.md>] [--source search|user|generated] [--app-type <appType>] [--upload-assets] [--offline] [--json]';
+const { resolveAssets } = require('./asset-resolve');
+const {
+  detectImageGenerator,
+  getMaterialSourcingGuidance,
+} = require('./ai-image');
+const { throwCommandError, throwStatus } = require('../core/command-errors');
 
 function printHelp() {
   console.log(`
 用法:
   openyida asset status [--offline] [--json]
-  openyida asset resolve (--input <manifest-draft.json> | --slot <slotId>=<路径或URL> ...) [--manifest <asset-manifest.json>] [--design <design.md>] [--source search|user|generated] [--app-type <appType>] [--upload-assets] [--offline] [--json]
-  openyida asset sources [--json]
+  openyida asset resolve --hero <路径或URL> [--product <路径或URL> ...] [--require-hero] [--upload-assets] [--offline] [--json]
+  openyida asset generate [--json]
 
 子命令:
-  status    检测素材能力
-  resolve   校验图片、默认上传宜搭图片附件并生成清单
+  status       检测当前素材能力：是否配置 CDN、是否可生成、推荐素材策略
+  resolve      把本地/外链素材解析为稳定 URL 并回填，输出 materialStatus(final|draft|none) 与缺口
+  generate     输出素材来源引导（免费可商用素材库清单 + 使用纪律，供智能体检索真实图片）
 
-图片不超过 20 MiB 时上传；超过限制的外链保留原地址。
---app-type 指定目标应用，省略时读取项目 config.json。
---upload-assets 仅兼容旧命令，默认已上传；--offline 不联网、不上传。
-  sources   输出 Unsplash/Pexels 使用规则
+说明:
+  openyida 无内置文生图能力；图片应由智能体自行生成或到免费素材库检索，
+  再通过 resolve 解析，并在配置 CDN 时转存后回填 spec。
 `);
 }
 
-function parseSlot(value) {
-  const index = String(value || '').indexOf('=');
-  if (index <= 0 || index === String(value).length - 1) {return null;}
-  const slotId = String(value).slice(0, index).trim();
-  const input = String(value).slice(index + 1).trim();
-  if (!slotId || !input) {return null;}
-  return {
-    slotId,
-    input,
-    required: true,
-  };
-}
-
 function parseArgs(args) {
   const parsed = {
     subCommand: args[0],
-    slots: [],
-    input: '',
-    manifest: '',
-    design: '',
+    hero: '',
+    products: [],
+    requireHero: false,
     offline: false,
     uploadAssets: false,
-    appType: '',
-    source: 'search',
     timeout: 0,
     json: false,
     help: false,
-    errors: [],
-    usedOptions: [],
   };
+
   for (let i = 1; i < args.length; i++) {
     const arg = args[i];
     if (arg === '--help' || arg === '-h') {
       parsed.help = true;
     } else if (arg === '--json') {
-      parsed.usedOptions.push('--json');
       parsed.json = true;
     } else if (arg === '--offline') {
-      parsed.usedOptions.push('--offline');
       parsed.offline = true;
-    } else if (arg === '--app-type') {
-      parsed.usedOptions.push('--app-type');
-      parsed.appType = args[++i] || '';
-      if (!parsed.appType || parsed.appType.startsWith('--')) {parsed.errors.push('ASSET_APP_TYPE_REQUIRED');}
-    } else if (arg === '--upload-assets') {
-      parsed.usedOptions.push('--upload-assets');
+    } else if (arg === '--require-hero') {
+      parsed.requireHero = true;
+    } else if (arg === '--upload-assets' || arg === '--mirror-external') {
       parsed.uploadAssets = true;
-    } else if (arg === '--source') {
-      parsed.usedOptions.push('--source');
-      parsed.source = args[++i] || '';
-    } else if (arg === '--input') {
-      parsed.usedOptions.push('--input');
-      parsed.input = args[++i] || '';
-    } else if (arg === '--design') {
-      parsed.usedOptions.push('--design');
-      parsed.design = args[++i] || '';
-      if (!parsed.design || parsed.design.startsWith('--')) {parsed.errors.push('ASSET_DESIGN_REQUIRED');}
-    } else if (arg === '--manifest') {
-      parsed.usedOptions.push('--manifest');
-      parsed.manifest = args[++i] || '';
-    } else if (arg === '--slot') {
-      parsed.usedOptions.push('--slot');
-      const slot = parseSlot(args[++i]);
-      if (slot) {parsed.slots.push(slot);} else {parsed.errors.push('--slot 格式应为 <slotId>=<路径或URL>');}
+    } else if (arg === '--hero') {
+      parsed.hero = args[++i] || '';
+    } else if (arg === '--product') {
+      const v = args[++i];
+      if (v) {parsed.products.push(v);}
     } else if (arg === '--timeout') {
-      parsed.usedOptions.push('--timeout');
       parsed.timeout = parseInt(args[++i], 10) || 0;
-    } else {
-      parsed.errors.push(`未知参数：${arg}`);
     }
   }
+
   return parsed;
 }
 
@@ -109,88 +87,74 @@ function runStatus(options) {
     return;
   }
   console.log('素材能力检测');
-  console.log('  上传目标   : 宜搭图片附件（需要登录态和 appType）');
-  console.log('  上传条件   : ' + (status.canUpload ? '联网已启用；实际上传时验证登录态和应用权限' : '离线，不上传'));
-  console.log('  可生成图片 : ' + (status.canGenerate === true ? '是' : status.canGenerate === false ? '否' : '未确认'));
-  console.log('  建议策略   : ' + status.recommendedStrategy);
-  status.reasons.forEach(reason => console.log('  - ' + reason));
-}
-
-function readDraft(filePath) {
-  let draft;
-  try {
-    draft = JSON.parse(fs.readFileSync(path.resolve(filePath), 'utf8'));
-  } catch (error) {
-    throwCommandError(`无法读取素材草稿：${error.message}`, { code: 'ASSET_INPUT_INVALID' });
+  console.log('  CDN 已配置    : ' + (status.cdnConfigured ? '是' : '否'));
+  console.log('  可上传转存    : ' + (status.canUpload ? '是' : '否'));
+  console.log('  可 AI 生成    : ' + (status.canGenerate ? '是' : '否（由智能体生成/检索素材）'));
+  console.log('  推荐素材策略  : ' + status.recommendedStrategy);
+  console.log('  CDN 配置文件  : ' + status.cdn.configPath);
+  if (status.cdn.missing.length) {
+    console.log('  缺失 CDN 字段 : ' + status.cdn.missing.join(', '));
   }
-  if (!draft || !Array.isArray(draft.assets)) {
-    throwCommandError('素材草稿必须包含 assets 数组', { code: 'ASSET_INPUT_INVALID' });
-  }
-  return draft;
-}
-
-function writeManifest(filePath, manifest) {
-  const target = path.resolve(filePath);
-  fs.mkdirSync(path.dirname(target), { recursive: true });
-  fs.writeFileSync(target, JSON.stringify(manifest, null, 2) + '\n', 'utf8');
-  return target;
+  console.log('原因/建议:');
+  status.reasons.forEach((r) => console.log('  - ' + r));
 }
 
 async function runResolve(options) {
-  if (options.errors.length > 0) {
-    throwUsage(options.errors.join('\n'), RESOLVE_USAGE, { code: 'ASSET_INVALID_ARGUMENTS' });
-  }
-  if (options.input && options.slots.length > 0) {
-    throwUsage('--input 与 --slot 不能同时使用', RESOLVE_USAGE, { code: 'ASSET_INPUT_CONFLICT' });
-  }
-  if (!ASSET_SOURCES.includes(options.source)) {
-    throwUsage('--source 仅支持 search、user 或 generated', RESOLVE_USAGE, { code: 'ASSET_INVALID_SOURCE' });
-  }
-  const draft = options.input ? readDraft(options.input) : {};
-  const assetStrategy = options.design ? readDesignAssetStrategy(path.resolve(options.design)) : draft.assetStrategy;
-  const assets = [
-    ...(draft.assets || []),
-    ...options.slots.map(slot => ({ ...slot, source: options.source })),
-  ];
-  if (assets.length === 0 && !options.input) {
-    throwUsage('至少提供一个 --slot 或 --input', RESOLVE_USAGE, { code: 'ASSET_INPUT_REQUIRED' });
-  }
-
+  const assets = {
+    heroImage: options.hero,
+    productImages: options.products,
+  };
   const result = await resolveAssets(assets, {
-    assetStrategy,
+    requireHero: options.requireHero,
     online: !options.offline,
-    appType: options.appType,
-    assetSource: options.source,
+    mirrorExternal: !!options.uploadAssets,
     timeout: options.timeout || undefined,
   });
-  const manifestPath = options.manifest ? writeManifest(options.manifest, result) : '';
-  if (result.materialStatus === 'draft') {
+  if (options.json) {
+    console.log(JSON.stringify(result, null, 2));
+    return;
+  }
+  console.log('素材解析结果');
+  console.log('  materialStatus : ' + result.materialStatus +
+    (result.materialStatus === 'final' ? '（可交付最终版）'
+      : result.materialStatus === 'draft' ? '（仅可交付标注缺口的草稿）'
+        : '（无可用素材，只能低保真草稿）'));
+  console.log('  strategy       : ' + result.strategy);
+  console.log('  Hero           : ' + (result.assets.heroImage || '(无)'));
+  console.log('  产品图         : ' + (result.assets.productImages.length
+    ? result.assets.productImages.join(', ') : '(无)'));
+  if (result.materialGaps.length) {
+    console.log('素材缺口:');
+    result.materialGaps.forEach((g) => console.log('  - ' + g));
+  }
+  // 非 final 时以非零退出码提示调用方（生成链路可据此拦截「最终版」）
+  if (result.materialStatus !== 'final') {
     throwStatus('素材未达到 final 状态', 2, {
       code: 'ASSET_MATERIAL_NOT_FINAL',
-      details: { ...result, manifestPath },
+      details: result,
     });
   }
-  if (options.json) {
-    console.log(JSON.stringify({ ...result, manifestPath }, null, 2));
-    return;
-  }
-  console.log('素材状态: ' + result.materialStatus);
-  console.log('素材数量: ' + result.assets.length);
-  if (manifestPath) {console.log('素材清单: ' + manifestPath);}
 }
 
-function runSources(options) {
-  const status = getAssetStatus();
-  const output = {
-    generator: detectImageGenerator({ hostCapabilities: status.hostCapabilities }),
-    guidance: getMaterialSourcingGuidance(),
-  };
+function runGenerate(options) {
+  const generator = detectImageGenerator();
+  const guidance = getMaterialSourcingGuidance();
   if (options.json) {
-    console.log(JSON.stringify(output, null, 2));
+    console.log(JSON.stringify({ generator, guidance }, null, 2));
     return;
   }
-  console.log('图片来源: 用户素材、Unsplash、Pexels 或宿主生成');
-  output.guidance.rules.forEach(rule => console.log('  - ' + rule));
+  console.log('图片生成能力: ' + (generator.available ? '可用' : '不可用'));
+  console.log('  ' + generator.reason);
+  console.log('\n素材来源步骤:');
+  guidance.steps.forEach((s) => console.log('  ' + s));
+  console.log('\n免费可商用素材库:');
+  guidance.libraries.forEach((lib) => {
+    console.log('  · ' + lib.name + ' (' + lib.site + ')');
+    console.log('    授权: ' + lib.license);
+    console.log('    适合: ' + lib.bestFor);
+  });
+  console.log('\n纪律:');
+  guidance.rules.forEach((r) => console.log('  - ' + r));
 }
 
 async function run(args) {
@@ -199,27 +163,22 @@ async function run(args) {
     printHelp();
     return;
   }
-  const allowedOptions = {
-    status: new Set(['--offline', '--json']),
-    sources: new Set(['--json']),
-  };
-  if (allowedOptions[options.subCommand]) {
-    const invalid = options.usedOptions.filter(option => !allowedOptions[options.subCommand].has(option));
-    const errors = [...options.errors, ...invalid.map(option => `参数不适用于 ${options.subCommand}：${option}`)];
-    if (errors.length > 0) {
-      throwCommandError(errors.join('\n'), { code: 'ASSET_INVALID_ARGUMENTS' });
-    }
+  switch (options.subCommand) {
+    case 'status':
+      runStatus(options);
+      break;
+    case 'resolve':
+      await runResolve(options);
+      break;
+    case 'generate':
+      runGenerate(options);
+      break;
+    default:
+      printHelp();
+      throwCommandError('未知子命令: ' + options.subCommand, {
+        code: 'ASSET_UNKNOWN_SUBCOMMAND',
+      });
   }
-  if (options.subCommand === 'status') {runStatus(options); return;}
-  if (options.subCommand === 'resolve') {await runResolve(options); return;}
-  if (options.subCommand === 'sources') {runSources(options); return;}
-  throwCommandError(`未知子命令：${options.subCommand}`, { code: 'ASSET_UNKNOWN_SUBCOMMAND' });
 }
 
-module.exports = {
-  run,
-  parseArgs,
-  parseSlot,
-  readDraft,
-  writeManifest,
-};
+module.exports = { run, parseArgs };