openyida 2026.9.21 → 2026.9.22-beta.2

package/lib/design-plan/normalize.js

@@ -2,10 +2,18 @@
 
 const path = require('path');
 const { CliError } = require('../core/cli-error');
-const { t } = require('../core/i18n');
 const { readJson } = require('./files');
 
-const { PLAN_SKILL_ROOT, loadThemeIndex, themeNavTheme } = require('./themes');
+const PACKAGE_ROOT = path.resolve(__dirname, '..', '..');
+const PLAN_SKILL_ROOT = path.join(
+  PACKAGE_ROOT,
+  'yida-skills',
+  'skills',
+  'yida-design',
+  'sub_skill',
+  'yida-design-plan'
+);
+const THEME_INDEX_PATH = path.join(PLAN_SKILL_ROOT, 'templates', 'design-themes', 'index.json');
 const PAGE_PATTERN_INDEX_PATH = path.join(PLAN_SKILL_ROOT, 'templates', 'page-patterns', 'index.json');
 
 function clone(value) {
@@ -20,53 +28,6 @@ function compactSchema(plan) {
   return /^2(?:\.|$)/.test(String(plan.schemaVersion || ''));
 }
 
-// Validate before normalization writes properties (a string previously caused
-// a raw TypeError), and reuse this contract at fragment / init boundaries.
-function assertVisualFieldObjects(forUser, options = {}) {
-  const prefix = options.prefix || 'visualStyle.forUser';
-  const object = value => value !== null && typeof value === 'object' && !Array.isArray(value);
-  const examples = {
-    visualDirection: { label: '<label>', description: '<description>' },
-    navigationStyle: { structure: 'top' },
-  };
-  const issues = [];
-  const check = (value, field, example) => {
-    if (value === undefined || object(value)) { return; }
-    issues.push({ path: field, expectedType: 'object', receivedType: value === null ? 'null' : Array.isArray(value) ? 'array' : typeof value,
-      example, message: t('cli.design_plan_visual_object_required', field, JSON.stringify(example)) });
-  };
-  check(forUser, prefix, examples);
-  if (object(forUser)) {
-    for (const [field, example] of Object.entries(examples)) { check(forUser[field], `${prefix}.${field}`, example); }
-  }
-  if (issues.length) {
-    throw new CliError(issues.map(issue => issue.message).join('\n'), {
-      code: 'DESIGN_PLAN_VISUAL_FIELD_TYPE_INVALID',
-      details: { ...issues[0], issues, ...(options.sourcePath ? { sourcePath: options.sourcePath } : {}) },
-    });
-  }
-}
-
-// Ordered business blocks provide one source for content, priority and coverage.
-// Explicit overrides remain authoritative; incomplete blocks stay visible to validation.
-function derivePageContent(page) {
-  const blocks = page?.blocks;
-  const filled = value => typeof value === 'string' && value.trim().length > 0;
-  if (!Array.isArray(blocks) || !blocks.length || !blocks.every(block => block && typeof block === 'object'
-    && !Array.isArray(block) && filled(block.name) && filled(block.purpose)
-    && Object.keys(block).every(key => ['name', 'purpose'].includes(key)))) {return page;}
-  const descriptions = blocks.map(block => `${block.name}：${block.purpose}`);
-  return {
-    ...page,
-    blocks: descriptions,
-    contentPriority: page.contentPriority === undefined ? blocks.map(block => block.name) : page.contentPriority,
-    contentRichness: {
-      ...page.contentRichness,
-      contentLayers: page.contentRichness?.contentLayers === undefined ? descriptions : page.contentRichness.contentLayers,
-    },
-  };
-}
-
 function normalizeEquivalentAuthoring(plan) {
   const summary = plan.overview?.rolePermissionSummary;
   if (Array.isArray(summary)) {
@@ -219,7 +180,6 @@ function ensurePageRules(plan, pagePatternIndex) {
   const patterns = new Map(list(pagePatternIndex.patterns).map(pattern => [pattern.id, pattern]));
   const richnessDefaults = pagePatternIndex.contentRichness || {};
   for (const page of list((plan.pages || {}).customPageDetails)) {
-    Object.assign(page, derivePageContent(page));
     const pattern = page.layoutPattern = page.layoutPattern || {};
     pattern.id = pattern.id || 'custom-page-pattern';
     const preset = patterns.get(pattern.id);
@@ -270,7 +230,7 @@ function selectedTheme(plan, themeIndex) {
       details: { themeId: selected.themeId },
     });
   }
-  if (selected.templatePath && selected.templatePath !== theme.templatePath && selected.templatePath !== theme.legacyTemplatePath) {
+  if (selected.templatePath && selected.templatePath !== theme.templatePath) {
     throw new CliError('selectedTheme 的 themeId 与 templatePath 不属于主题索引中的同一记录', {
       code: 'DESIGN_PLAN_THEME_MISMATCH',
       details: { selectedTheme: selected },
@@ -278,42 +238,34 @@ function selectedTheme(plan, themeIndex) {
   }
   selected.label = selected.label || theme.label;
   selected.templatePath = theme.templatePath;
-  selected.summary = selected.summary || [theme.styleSummary, selected.customText].filter(Boolean).join('；');
+  selected.summary = selected.summary || [theme.description, selected.customText].filter(Boolean).join('；');
   assertThemeProfile(forUser.themeProfile, theme);
   forUser.themeProfile = { ...(theme.defaultProfile || {}) };
-  return { ...theme, navTheme: themeNavTheme(theme) };
+  return theme;
 }
 
-function pageApplicationDefaults(page) {
+function pageApplicationDefaults(page, color) {
   const pattern = page.layoutPattern || {};
+  const colorUsage = color.usage || `${color.primaryColorName || '主题色'}用于主操作、关键焦点和选中状态，页面与卡片按项目配色适配保持协调`;
   return {
     pageId: page.pageId,
     pageName: page.name,
     layoutPatternMode: pattern.mode,
     layoutPatternId: pattern.id,
-    firstScreenFocus: '',
-    layout: '',
-    responsive: '',
-    acceptanceChecks: [],
     visualApplication: `继承项目设计系统的完整 Token、组件、状态与响应式规则，不改变 ${page.name} 的 ${pattern.id} 页面模式。`,
     surface: '画布、容器、边框、圆角与阴影按项目设计系统执行，不另写页面级标准。',
-    primaryAction: '',
+    primaryAction: `按钮与动作层级按项目设计系统执行；${colorUsage}。`,
     states: '默认、悬停、按下、聚焦、禁用、加载、空态、错误、无权限和选中状态按项目设计系统执行。',
   };
 }
 
-function ensureVisual(plan, theme) {
+function ensureVisual(plan) {
   const visual = plan.visualStyle;
   const forUser = visual.forUser;
   const selected = visual.internal.selectedTheme;
   const direction = forUser.visualDirection || {};
   const color = forUser.colorStrategy = forUser.colorStrategy || {};
-  const navigation = forUser.navigationStyle = forUser.navigationStyle || {};
-  if (theme.mode !== 'creative') {navigation.tone = theme.navTheme;}
-  navigation.toneSource = theme.mode === 'creative' ? 'project_defined' : 'theme_derived';
-  if (!['light', 'dark'].includes(navigation.tone)) {
-    throw new CliError('visualStyle.forUser.navigationStyle.tone 必须是 light 或 dark', { code: 'DESIGN_PLAN_INVALID_NAVIGATION_TONE' });
-  }
+  const navigation = forUser.navigationStyle || {};
   if (!direction.label || !direction.description) {
     throw new CliError('schemaVersion 2.0 必须提供 visualStyle.forUser.visualDirection.label 和 description', {
       code: 'DESIGN_PLAN_VISUAL_DIRECTION_REQUIRED',
@@ -325,10 +277,16 @@ function ensureVisual(plan, theme) {
       details: { structure: navigation.structure },
     });
   }
+  if (!['light', 'dark'].includes(navigation.tone)) {
+    throw new CliError('visualStyle.forUser.navigationStyle.tone 必须是 light 或 dark', {
+      code: 'DESIGN_PLAN_INVALID_NAVIGATION_TONE',
+      details: { tone: navigation.tone },
+    });
+  }
   const sourceApplications = new Map(list(forUser.pageApplications).map(item => [item.pageId || item.pageName, item]));
   forUser.pageApplications = list((plan.pages || {}).customPageDetails).map(page => {
     const source = sourceApplications.get(page.pageId) || sourceApplications.get(page.name) || {};
-    const application = { ...pageApplicationDefaults(page), ...source };
+    const application = { ...pageApplicationDefaults(page, color), ...source };
     application.pageId = page.pageId;
     application.pageName = page.name;
     application.layoutPatternMode = (page.layoutPattern || {}).mode;
@@ -355,7 +313,7 @@ function ensureVisual(plan, theme) {
     missingAssets: [],
     notes: '需要图片时使用 yida-image-assets。',
   };
-  forUser.designMdReady = forUser.designMdReady || '页面配色、布局和组件样式将整理为完整设计说明。';
+  forUser.designMdReady = forUser.designMdReady || 'materialize 将从所选完整主题模板生成 design.md。';
 
   const forDesignMd = visual.forDesignMd = visual.forDesignMd || {};
   forDesignMd.designTemplate = {
@@ -397,21 +355,18 @@ function normalizePlan(sourcePlan) {
     return sourcePlan;
   }
   const plan = clone(sourcePlan);
-  assertVisualFieldObjects(plan.visualStyle?.forUser);
   normalizeEquivalentAuthoring(plan);
-  const themeIndex = loadThemeIndex();
+  const themeIndex = readJson(THEME_INDEX_PATH, '主题索引');
   const pagePatternIndex = readJson(PAGE_PATTERN_INDEX_PATH, '页面模式索引');
   ensureOverview(plan);
   ensurePageRules(plan, pagePatternIndex);
-  const theme = selectedTheme(plan, themeIndex);
-  ensureVisual(plan, theme);
+  selectedTheme(plan, themeIndex);
+  ensureVisual(plan);
   return plan;
 }
 
 module.exports = {
   normalizePlan,
-  assertVisualFieldObjects,
-  derivePageContent,
   assertThemeProfile,
   ensureOverview,
 };

package/lib/design-plan/parallel.js

@@ -2,9 +2,7 @@
 
 const { createHash } = require('crypto');
 const { CliError } = require('../core/cli-error');
-const { t } = require('../core/i18n');
 const { readJson } = require('./files');
-const { assertVisualFieldObjects } = require('./normalize');
 
 const object = value => value && typeof value === 'object' && !Array.isArray(value);
 
@@ -12,14 +10,13 @@ function planBase(plan) {
   return { revision: plan.meta?.revision, digest: createHash('sha256').update(JSON.stringify(plan)).digest('hex') };
 }
 
-function readPart(file, role, base, allowed, supplied) {
-  const part = supplied || readJson(file, `${role} 规划片段`);
+function readPart(file, role, base, allowed) {
+  const part = readJson(file, `${role} 规划片段`);
   if (!object(part) || part.ready !== true || !object(part.facts)) {
     throw new CliError(`${role} 规划尚未完成，请补齐 facts 并设置 ready=true`, { code: 'DESIGN_PLAN_PART_NOT_READY' });
   }
   if (part.base?.revision !== base.revision || part.base?.digest !== base.digest) {
-    throw new CliError(`${role} 规划来自旧版本，请根据当前计划重新整理`, { code: 'DESIGN_PLAN_STALE_PART',
-      details: { sourcePath: file, expectedBase: base, actualBase: part.base, nextStep: t('design_plan.rebase_required') } });
+    throw new CliError(`${role} 规划来自旧版本，请根据当前计划重新整理`, { code: 'DESIGN_PLAN_STALE_PART' });
   }
   const unknown = Object.keys(part.facts).filter(key => !allowed.includes(key));
   if (unknown.length) {
@@ -28,64 +25,10 @@ function readPart(file, role, base, allowed, supplied) {
   return part.facts;
 }
 
-// Report all binding defects at once so agents can repair the existing part.
-function assertPageBindings(pages, applications, visualFile, businessFile) {
-  const prefix = 'facts.visualStyle.forUser.pageApplications';
-  const issues = [];
-  const pageIds = [];
-  pages.forEach((page, index) => {
-    const field = `facts.pages.customPageDetails[${index}].pageId`;
-    if (!object(page) || typeof page.pageId !== 'string' || !page.pageId.trim()) {
-      issues.push({ sourcePath: businessFile, path: field, code: 'expected_nonempty_string' });
-    } else if (pageIds.includes(page.pageId)) {
-      issues.push({ sourcePath: businessFile, path: field, code: 'duplicate_page', pageId: page.pageId });
-    } else { pageIds.push(page.pageId); }
-  });
-  const seen = new Set();
-  if (!Array.isArray(applications)) {
-    issues.push({ sourcePath: visualFile, path: prefix, code: 'expected_array' });
-  } else {
-    applications.forEach((item, index) => {
-      const field = `${prefix}[${index}]`;
-      if (!object(item)) {
-        issues.push({ sourcePath: visualFile, path: field, code: 'expected_object' });
-        return;
-      }
-      if (typeof item.pageId !== 'string' || !item.pageId.trim()) {
-        issues.push({ sourcePath: visualFile, path: `${field}.pageId`, code: 'expected_nonempty_string' });
-      } else {
-        if (!pageIds.includes(item.pageId)) {
-          issues.push({ sourcePath: visualFile, path: `${field}.pageId`, code: 'unexpected_page', pageId: item.pageId });
-        }
-        if (seen.has(item.pageId)) {
-          issues.push({ sourcePath: visualFile, path: `${field}.pageId`, code: 'duplicate_page', pageId: item.pageId });
-        }
-        seen.add(item.pageId);
-      }
-      if (!Array.isArray(item.visualMemoryApplications)) {
-        issues.push({ sourcePath: visualFile, path: `${field}.visualMemoryApplications`, code: 'expected_array' });
-      }
-    });
-  }
-  pageIds.filter(pageId => !seen.has(pageId)).forEach(pageId => {
-    issues.push({ sourcePath: visualFile, path: prefix, code: 'missing_page', pageId });
-  });
-  if (issues.length) {
-    const nextStep = t('design_plan.repair_page_bindings');
-    const summary = issues.map(issue => `${issue.path}: ${issue.code}${issue.pageId ? ` (${issue.pageId})` : ''}`).join('; ');
-    throw new CliError(`${nextStep} ${summary}`, {
-      code: 'DESIGN_PLAN_PAGE_BINDINGS_REQUIRED',
-      details: { sourcePath: visualFile, expectedPageIds: pageIds, issues, nextStep },
-    });
-  }
-}
-
-function mergeParts(source, businessFile, visualFile, options = {}) {
+function mergeParts(source, businessFile, visualFile) {
   const base = planBase(source);
-  const rebased = options.rebaseParts ? require('./rebase').rebaseParts(source, options.input, businessFile, visualFile) : [];
-  const business = readPart(businessFile, 'business', base, ['overview', 'dataModels', 'businessFlows', 'pages', 'execution', 'meta'], rebased[0]);
-  const visual = readPart(visualFile, 'visual', base, ['visualStyle'], rebased[1]);
-  assertVisualFieldObjects(visual.visualStyle?.forUser, { prefix: 'facts.visualStyle.forUser', sourcePath: visualFile });
+  const business = readPart(businessFile, 'business', base, ['overview', 'dataModels', 'businessFlows', 'pages', 'execution', 'meta']);
+  const visual = readPart(visualFile, 'visual', base, ['visualStyle']);
   if (!object(business.overview) || !Array.isArray(business.dataModels) || !Array.isArray(business.businessFlows)
     || !Array.isArray(business.pages?.customPageDetails) || !object(visual.visualStyle)) {
     throw new CliError('业务片段需包含 overview/dataModels/businessFlows/pages；视觉片段需包含 visualStyle', { code: 'DESIGN_PLAN_PART_INCOMPLETE' });
@@ -94,17 +37,19 @@ function mergeParts(source, businessFile, visualFile, options = {}) {
     || Object.keys(business.meta).some(key => !['businessDomain', 'experienceTopology'].includes(key)))) {
     throw new CliError('业务 meta 仅填写 businessDomain/experienceTopology，版本由 CLI 维护', { code: 'DESIGN_PLAN_PART_CONFLICT' });
   }
-  assertPageBindings(business.pages.customPageDetails, visual.visualStyle.forUser?.pageApplications, visualFile, businessFile);
+  const pageIds = business.pages.customPageDetails.map(page => page.pageId);
+  const applications = visual.visualStyle.forUser?.pageApplications;
+  if (!Array.isArray(applications) || applications.length !== pageIds.length
+    || new Set(applications.map(item => item.pageId)).size !== pageIds.length
+    || applications.some(item => !pageIds.includes(item.pageId) || !Array.isArray(item.visualMemoryApplications))) {
+    throw new CliError('视觉规划需按业务页面逐一完成 pageApplications，再合并产物', { code: 'DESIGN_PLAN_PAGE_BINDINGS_REQUIRED' });
+  }
   const plan = JSON.parse(JSON.stringify({ ...source, ...business, ...visual, meta: { ...source.meta, ...business.meta },
-    ...(source.execution || business.execution ? { execution: { ...source.execution, ...business.execution,
-      ...(source.execution?.appConfig || business.execution?.appConfig
-        ? { appConfig: { ...source.execution?.appConfig, ...business.execution?.appConfig } } : {}),
-    } } : {}),
+    execution: { ...source.execution, ...business.execution, appConfig: { ...source.execution?.appConfig, ...business.execution?.appConfig } },
   }));
   // Load after module initialization: patch also uses the materializer.
-  if (require('./patch').invalidateConfirmation(plan, source) || plan.meta.status === 'draft') {
-    plan.meta.status = 'awaiting_confirmation';
-  }
+  require('./patch').invalidateConfirmation(plan);
+  plan.meta.status = 'awaiting_confirmation';
   return plan;
 }
 

package/lib/design-plan/patch.js

@@ -1,9 +1,8 @@
 'use strict';
 
 const path = require('path');
-const { isDeepStrictEqual } = require('util');
 const { CliError } = require('../core/cli-error');
-const { prepareArtifacts, prepareArtifactUpdate } = require('./materialize');
+const { prepareArtifacts } = require('./materialize');
 const { readJson, writeFiles } = require('./files');
 
 const PROTECTED_PATHS = [
@@ -12,13 +11,10 @@ const PROTECTED_PATHS = [
   'meta.updatedAt',
   'meta.planState',
   'visualStyle.forUser.themeProfile',
-  'visualStyle.forUser.navigationStyle.tone',
-  'visualStyle.forUser.navigationStyle.toneSource',
-  'execution.appConfig.navTheme',
 ];
 const DANGEROUS_SEGMENTS = new Set(['__proto__', 'prototype', 'constructor']);
 
-function parsePath(pathExpression, options = {}) {
+function parsePath(pathExpression) {
   const expression = String(pathExpression || '').trim();
   if (!expression || !/^[A-Za-z_$][\w$-]*(?:(?:\.(?:[A-Za-z_$][\w$-]*|--[\w-]+))|(?:\[\d+\]))*$/.test(expression)) {
     throw new CliError(`无效字段路径：${expression || '(empty)'}`, {
@@ -31,16 +27,11 @@ function parsePath(pathExpression, options = {}) {
       code: 'DESIGN_PLAN_UNSAFE_PATH',
     });
   }
-  const protectedPaths = options.creative ? PROTECTED_PATHS.filter(field => field !== 'visualStyle.forUser.navigationStyle.tone') : PROTECTED_PATHS;
-  if (protectedPaths.some(protectedPath => expression === protectedPath
+  if (PROTECTED_PATHS.some(protectedPath => expression === protectedPath
     || expression.startsWith(`${protectedPath}.`)
     || expression.startsWith(`${protectedPath}[`)
     || protectedPath.startsWith(`${expression}.`))) {
-    const hint = expression.includes('themeProfile')
-      ? '；themeProfile 只读，请改 visualStyle.tokens 或 colorStrategy.primaryColor'
-      : /(?:navigationStyle\.(?:tone|toneSource)|appConfig\.navTheme)/.test(expression)
-        ? '；导航明暗由所选主题模板派生，请改选主题'
-        : '';
+    const hint = expression.includes('themeProfile') ? '；themeProfile 只读，请改 visualStyle.tokens 或 colorStrategy.primaryColor' : '';
     throw new CliError(`字段 ${expression} 由 design-plan patch 自动维护，不能通过 --set 修改${hint}`, {
       code: 'DESIGN_PLAN_PROTECTED_PATH',
     });
@@ -57,7 +48,7 @@ function parseValue(rawValue) {
   }
 }
 
-function parseSetExpression(expression, options = {}) {
+function parseSetExpression(expression) {
   const separator = String(expression || '').indexOf('=');
   if (separator <= 0) {
     throw new CliError(`--set 必须使用 path=value 格式：${expression || '(empty)'}`, {
@@ -67,21 +58,19 @@ function parseSetExpression(expression, options = {}) {
   const pathExpression = expression.slice(0, separator).trim();
   return {
     path: pathExpression,
-    segments: parsePath(pathExpression, options),
+    segments: parsePath(pathExpression),
     value: parseValue(expression.slice(separator + 1)),
   };
 }
 
 const OPTIONAL_PATHS = [
   /^execution$/,
-  /^execution\.(resourceBlueprint|resourceCreationOrder|pageImplementationOrder|navigationOrder|navigationFallback|entryRecommendation|sampleDataPlan|interactionStates|acceptanceCriteria|explicitScope|appConfig)$/,
-  /^execution\.appConfig\.(appType|corpId|baseUrl|navigationType|hideAppNav|layoutDirection|logoSource)$/,
+  /^execution\.(resourceBlueprint|resourceCreationOrder|pageImplementationOrder|navigationOrder|navigationFallback|sampleDataPlan|interactionStates|acceptanceCriteria|explicitScope|appConfig)$/,
+  /^execution\.appConfig\.(appType|corpId|baseUrl|navigationType|hideAppNav|layoutDirection|navTheme|logoSource)$/,
   /^execution\.interactionStates\.(empty|loading|error|formEntry|detail)$/,
   /^visualStyle\.tokens(?:\.--[\w-]+)?$/,
-  /^visualStyle\.forUser\.iconSystem(?:\.(library|mappings|colorPairs))?$/,
-  /^visualStyle\.forUser\.assetStrategy\.(materialStatus|missingAssets)$/,
   /^pages\.customPageDetails\[\d+\]\.(scene|sceneKey|pageStructure|entryMode|dataSources|dataBinding|emptyReason|pageSpecHandoff)$/,
-  /^pages\.customPageDetails\[\d+\]\.pageSpecHandoff\.(scene|pageStructure|entryMode|navigation|contentBlocks|dataSources|dataBinding|emptyReason|primaryAction|themeSummary|designFile|designRefs)$/,
+  /^pages\.customPageDetails\[\d+\]\.pageSpecHandoff\.(scene|pageStructure|entryMode|contentBlocks|dataSources|dataBinding|emptyReason|primaryAction|themeSummary|designFile|designRefs)$/,
   /^dataModels\[\d+\]\.(sampleRecords|skipSampleReason)$/,
 ];
 
@@ -118,15 +107,9 @@ function incrementRevision(revision) {
   return value ? `${value}-01` : `${date}-01`;
 }
 
-function invalidateConfirmation(plan, original) {
-  if (original && isDeepStrictEqual(plan, original)) { return false; }
+function invalidateConfirmation(plan) {
   plan.meta = plan.meta || {};
-  const state = plan.meta.planState;
-  // Legacy plans without presentation facts keep conservative version invalidation.
-  if (!state || state.presentedRevision === plan.meta.revision
-    || state.confirmedRevision === plan.meta.revision || state.planConfirmed === true || plan.meta.status === 'confirmed') {
-    plan.meta.revision = incrementRevision(plan.meta.revision);
-  }
+  plan.meta.revision = incrementRevision(plan.meta.revision);
   plan.meta.status = 'draft';
   plan.meta.updatedAt = new Date().toISOString();
   plan.meta.planState = plan.meta.planState || {};
@@ -135,21 +118,6 @@ function invalidateConfirmation(plan, original) {
   plan.meta.planState.planConfirmed = false;
   plan.meta.planState.confirmationInteractionId = '';
   plan.meta.planState.confirmedAt = '';
-  return true;
-}
-
-// Collection results describe execution progress; the approved design stays the same.
-function isAssetProgressOnly(original, patched) {
-  const withoutProgress = (plan) => {
-    const copy = JSON.parse(JSON.stringify(plan));
-    const strategy = copy.visualStyle?.forUser?.assetStrategy;
-    if (strategy) {
-      delete strategy.materialStatus;
-      delete strategy.missingAssets;
-    }
-    return JSON.stringify(copy);
-  };
-  return withoutProgress(original) === withoutProgress(patched);
 }
 
 function patchPlan(inputPath, setExpressions, options = {}) {
@@ -162,17 +130,12 @@ function patchPlan(inputPath, setExpressions, options = {}) {
   }
   const original = readJson(resolvedInput);
   const patched = JSON.parse(JSON.stringify(original));
-  const selectedTheme = original.visualStyle?.internal?.selectedTheme || original.visualStyle?.forUser?.selectedTheme;
-  const creative = selectedTheme?.themeId === 'free-creative';
-  const changes = expressions.map(expression => parseSetExpression(expression, { creative })).map(change => ({
+  const changes = expressions.map(parseSetExpression).map(change => ({
     ...change,
     previousValue: setExistingPath(patched, change),
   }));
   const effectiveChanges = changes.filter(change => JSON.stringify(change.previousValue) !== JSON.stringify(change.value));
   if (JSON.stringify(original) === JSON.stringify(patched)) {
-    if (options.materialize) {
-      return { ...require('./materialize').materialize(resolvedInput, { outputDir: options.outputDir }), changed: false, materialized: true, changedPaths: [], confirmationInvalidated: false };
-    }
     return {
       success: true,
       changed: false,
@@ -182,21 +145,13 @@ function patchPlan(inputPath, setExpressions, options = {}) {
       changedPaths: [],
       confirmationInvalidated: false,
       materialized: false,
-      updated: [],
     };
   }
   const previousRevision = (patched.meta || {}).revision || null;
-  const assetProgressOnly = isAssetProgressOnly(original, patched);
-  if (assetProgressOnly) {
-    patched.meta.updatedAt = new Date().toISOString();
-  } else {
-    invalidateConfirmation(patched);
-  }
-  const outputDir = path.resolve(options.outputDir || path.dirname(resolvedInput));
-  const artifacts = prepareArtifacts(patched, outputDir, undefined, { renderHtml: options.materialize === true });
-  const updates = options.materialize ? prepareArtifactUpdate(artifacts, outputDir, () => prepareArtifacts(original, outputDir)) : null;
+  invalidateConfirmation(patched);
+  const artifacts = prepareArtifacts(patched, path.resolve(options.outputDir || path.dirname(resolvedInput)));
   const files = [[resolvedInput, `${JSON.stringify(patched, null, 2)}\n`]];
-  if (updates) {files.push(...updates.files);}
+  if (options.materialize) {files.push(...artifacts.files);}
   writeFiles(files);
   return {
     success: true,
@@ -205,11 +160,9 @@ function patchPlan(inputPath, setExpressions, options = {}) {
     previousRevision,
     revision: patched.meta.revision,
     changedPaths: effectiveChanges.map(change => change.path),
-    confirmationInvalidated: !assetProgressOnly,
+    confirmationInvalidated: true,
     materialized: options.materialize === true,
     outputs: options.materialize ? artifacts.outputs : undefined,
-    ...(options.materialize ? { confirmation: require('./confirmation').confirmationPayload(artifacts.outputs, artifacts.revision) } : {}),
-    updated: updates?.updated || [],
   };
 }
 

package/lib/design-plan/preview.js

@@ -121,9 +121,12 @@ function preview(inputPath, options = {}) {
     for (const [key, fragment] of Object.entries(fragments)) { html = updateBlock(html, key, fragment); }
     const files = [[outputs.prd, prd], [outputs.html, html]];
     if (accepted.visualStyle && changed.some(key => ['visualStyle', 'pages'].includes(key))) {
-      // Optional theme recipes do not determine whether a real page exists.
-      // Preserve accepted page drafts; final materialization checks completeness.
-      const design = renderDesign(plan, { outputDir: dir, draft: true });
+      const applications = plan.visualStyle.forUser?.pageApplications || [];
+      const pages = plan.pages.customPageDetails || [];
+      const bindingsReady = pages.every(page => applications.some(item => item.pageId === page.pageId && item.visualMemoryApplications?.length));
+      const designPlan = clone(plan);
+      if (!bindingsReady) { designPlan.pages = { customPageDetails: [] }; }
+      const design = renderDesign(designPlan);
       const oldDesign = hadVisual && fs.existsSync(outputs.design) ? fs.readFileSync(outputs.design, 'utf8') : undefined;
       const css = hadVisual && fs.existsSync(outputs.theme) ? fs.readFileSync(outputs.theme, 'utf8') : fs.readFileSync(CSS_TEMPLATE, 'utf8');
       files.push([outputs.design, design], [outputs.theme, applyDesignTokens(css, design, oldDesign)]);
@@ -143,9 +146,8 @@ function finalizePreview(source, stateFile) {
   const { facts } = readPart(stateFile, planBase(source));
   if (MODULES.some(key => !(key in facts))) { invalid('complete all preview modules before final validation'); }
   const merged = clone({ ...source, ...facts });
-  if (require('./patch').invalidateConfirmation(merged, source) || merged.meta.status === 'draft') {
-    merged.meta.status = 'awaiting_confirmation';
-  }
+  require('./patch').invalidateConfirmation(merged);
+  merged.meta.status = 'awaiting_confirmation';
   return merged;
 }