openyida 2026.8.31 → 2026.9.2-beta.0

package/README.md

@@ -200,7 +200,7 @@ openyida configure-process APP_XXX FORM_XXX .cache/openyida/process/process.json
 openyida process preview APP_XXX PROC_INST_XXX --output .cache/openyida/process/process.html
 openyida data query form APP_XXX FORM_XXX --page 1 --size 20
 openyida data query form APP_XXX FORM_XXX --dynamic-order '{"dateField_xxx":"-"}'
-openyida data create form APP_XXX FORM_XXX --data-file .cache/openyida/data-import/record.json
+openyida data create form APP_XXX FORM_XXX --expect-form-name 客户 --expect-form-type receipt --data-file .cache/openyida/data-import/record.json
 openyida get-permission APP_XXX FORM_XXX
 ```
 
@@ -430,7 +430,7 @@ Run `openyida --help` or `openyida <command> --help` for detailed usage.
 
 | Command | Description |
 |---------|-------------|
-| `openyida data <query\|get\|create\|update> <resource> ... \| delete form <appType> <formUuid> --inst-id <id> --confirm [--json]` | Unified data management (form/process/task/subform) |
+| `openyida data <query\|get\|create\|update> <resource> ... \| delete form <appType> <formUuid> --inst-id <id> --expect-form-name <name> --expect-form-type receipt --confirm [--json]` | Unified data management (form/process/task/subform) |
 | `openyida task-center <type> [options]` | Global task center (todo/processed/cc etc.) |
 | `openyida basic-info <overview\|commodity\|grant\|capacity\|quota\|abs-path\|dataflow\|i18n\|domain>` | Query organization basic info, capacity, quotas, and domain settings |
 | `openyida read-dingtalk-doc <docUrl> [--output <file>] [--json]` | Fetch Markdown content from a DingTalk document |

package/lib/app/create-app.js

@@ -269,6 +269,7 @@ function buildCreateAppPayload(params, auth, contentLocale, openExclusive, openP
     openPhysicColumn,
     openIsolationDatabase: 'n',
     openExclusiveUnit: 'n',
+    createWithModernTheme: 'y',
     group: 'ALL',
     fromBuilderAi: 'y',
     builderAiSource: resolveBuilderAiSource(),

package/lib/app/create-form.js

@@ -84,6 +84,13 @@ const { dispatchCreateFormCommand } = require('./create-form/commands');
 const { buildApiPath } = require('./create-form/api-path');
 const { deepMerge, splitJsonPointer } = require('./create-form/schema-patch');
 const { ensureYidaGlobalThemeAction } = require('./form-theme-action');
+const {
+  actionRefName,
+  buildDesignerEventBinding,
+  extractExportedActionFunctionNames,
+  inspectActionBindings,
+  syncDesignerActionCatalog,
+} = require('./form-action-binding');
 const { FORM_RULES_BLOCK_END, FORM_RULES_BLOCK_START } = require('./create-form/rule-builder');
 const { SMART_VALIDATION_BLOCK_END, SMART_VALIDATION_BLOCK_START } = require('./create-form/validation-builder');
 const { createFieldNormalizers } = require('./create-form/field-normalizers');
@@ -2678,6 +2685,116 @@ function compileActionSource(source) {
   return compiledResult.compiled;
 }
 
+function bindFieldAction(schema, formContainer, operation) {
+  if (!formContainer || !formContainer.children) {
+    throw new Error('未找到 FormContainer');
+  }
+  const fieldKey = operation.fieldId || operation.field || operation.label;
+  const eventName = operation.event || 'onChange';
+  const actionName = operation.name || operation.actionName;
+  if (!actionName) {
+    throw new Error('bind-field-action 必须提供 name/actionName');
+  }
+  if (!isValidActionIdentifier(actionName)) {
+    throw new Error('动作名称不是合法的 JavaScript 标识符: ' + actionName);
+  }
+  const found = findFieldByIdOrLabelDeep(formContainer.children, fieldKey);
+  if (!found) {
+    throw new Error('未找到字段: ' + fieldKey);
+  }
+  found.field.props = found.field.props || {};
+  const existingActionName = actionRefName(found.field.props[eventName]);
+  if (existingActionName && existingActionName !== actionName && operation.replaceExisting !== true) {
+    throw createCreateFormError(
+      t('create_form.action_event_conflict', fieldKey, eventName, existingActionName),
+      'FORM_ACTION_EVENT_CONFLICT',
+      {
+        status: 'SEMANTIC_FAILURE',
+        retryable: false,
+        sideEffectState: 'none',
+        nextStep: 'review_existing_field_action',
+        field: fieldKey,
+        event: eventName,
+        existingActionName,
+        requestedActionName: actionName,
+      }
+    );
+  }
+
+  found.field.props[eventName] = buildDesignerEventBinding(
+    actionName,
+    operation.params || {},
+    found.field.props[eventName]
+  );
+
+  const actions = ensureActionModule(schema);
+  const fieldId = found.field.props.fieldId || found.field.id || String(fieldKey || '');
+  const relatedEventId = operation.relatedEventId || ((found.field.id || fieldId) + ':' + eventName);
+  syncDesignerActionCatalog(actions);
+
+  return {
+    action: operation.action === 'field-action' ? 'field-action' : 'bind-field-action',
+    field: fieldKey,
+    fieldId,
+    event: eventName,
+    actionName,
+    relatedEventId,
+    replacedActionName: existingActionName && existingActionName !== actionName ? existingActionName : '',
+  };
+}
+
+function applyAtomicFieldAction(schema, formContainer, operation) {
+  const actionName = operation.name || operation.actionName;
+  if (!actionName) {
+    throw new Error('field-action 必须提供 name/actionName');
+  }
+  if (!isValidActionIdentifier(actionName)) {
+    throw new Error('动作名称不是合法的 JavaScript 标识符: ' + actionName);
+  }
+
+  const actions = ensureActionModule(schema);
+  const source = readOptionalSource(operation, 'source', 'sourceFile');
+  if (source !== undefined) {
+    if (!extractExportedActionFunctionNames(source).includes(actionName)) {
+      throw createCreateFormError(
+        t('create_form.action_source_export_missing', actionName),
+        'FORM_ACTION_FUNCTION_MISSING',
+        {
+          status: 'SEMANTIC_FAILURE',
+          retryable: false,
+          sideEffectState: 'none',
+          nextStep: 'export_named_action_function',
+          actionName,
+        }
+      );
+    }
+    const blockStart = '/* openyida:field-action:start:' + actionName + ' */';
+    const blockEnd = '/* openyida:field-action:end:' + actionName + ' */';
+    actions.module.source = upsertGeneratedSourceBlockWithBounds(
+      actions.module.source || '',
+      source,
+      blockStart,
+      blockEnd
+    );
+    actions.module.compiled = compileActionSource(actions.module.source);
+    actions.type = actions.type || 'FUNCTION';
+  } else if (!extractExportedActionFunctionNames(actions.module.source || '').includes(actionName)) {
+    throw createCreateFormError(
+      t('create_form.action_source_missing', actionName),
+      'FORM_ACTION_FUNCTION_MISSING',
+      {
+        status: 'SEMANTIC_FAILURE',
+        retryable: false,
+        sideEffectState: 'none',
+        nextStep: 'provide_action_source',
+        actionName,
+      }
+    );
+  }
+
+  return bindFieldAction(schema, formContainer, Object.assign({}, operation, { action: 'field-action' }));
+}
+
 function readOptionalSource(operation, key, fileKey) {
   if (operation[fileKey]) {
     const sourcePath = path.resolve(operation[fileKey]);
@@ -2773,6 +2890,11 @@ function applySchemaPatchOperations(schema, operations) {
       return;
     }
 
+    if (action === 'field-action') {
+      applied.push(applyAtomicFieldAction(schema, formContainer, operation));
+      return;
+    }
+
     if (['bind-datasource', 'data-source', 'datasource', 'select-datasource'].includes(String(action).toLowerCase())) {
       if (!formContainer || !formContainer.children) {
         throw new Error('未找到 FormContainer');
@@ -2802,42 +2924,7 @@ function applySchemaPatchOperations(schema, operations) {
     }
 
     if (action === 'bind-field-action') {
-      if (!formContainer || !formContainer.children) {
-        throw new Error('未找到 FormContainer');
-      }
-      const fieldKey = operation.fieldId || operation.field || operation.label;
-      const eventName = operation.event || 'onChange';
-      const actionName = operation.name || operation.actionName;
-      if (!actionName) {
-        throw new Error('bind-field-action 必须提供 name/actionName');
-      }
-      const found = findFieldByIdOrLabelDeep(formContainer.children, fieldKey);
-      if (!found) {
-        throw new Error('未找到字段: ' + fieldKey);
-      }
-      found.field.props = found.field.props || {};
-      found.field.props[eventName] = {
-        name: actionName,
-        id: actionName,
-        params: operation.params || {},
-        type: 'actionRef',
-      };
-
-      const actions = ensureActionModule(schema);
-      const relatedEventId = operation.relatedEventId || (found.field.id + ':' + eventName);
-      const existing = actions.list.find(function (item) {
-        return item.relatedEventId === relatedEventId && item.id === actionName;
-      });
-      if (!existing) {
-        actions.list.push({
-          relatedEventId,
-          name: actionName,
-          id: actionName,
-          type: 'componentEvent',
-          params: operation.params || {},
-        });
-      }
-      applied.push({ action: 'bind-field-action', field: fieldKey, event: eventName, actionName });
+      applied.push(bindFieldAction(schema, formContainer, operation));
       return;
     }
 
@@ -3246,18 +3333,71 @@ function upsertActionListEntry(actions, entry) {
   actions.list.push(entry);
 }
 
+function removeObsoleteGeneratedRuleCatalogEntries(actions, activeActionNames) {
+  // Only prune OpenYida-owned rule wrappers; unknown user/platform entries must survive catalog sync.
+  const activeNames = new Set(activeActionNames || []);
+  actions.list = (actions.list || []).filter(function (item) {
+    const names = [item && item.id, item && item.name].filter(Boolean).map(String);
+    const generatedNames = names.filter(function (name) {
+      return name.startsWith('openyidaRuleChange_');
+    });
+    return generatedNames.length === 0 || generatedNames.some(function (name) {
+      return activeNames.has(name);
+    });
+  });
+}
+
+function previousRuleActionName(source, wrapperName) {
+  const start = String(source || '').indexOf('export function ' + wrapperName + '(');
+  if (start === -1) {return '';}
+  const end = String(source || '').indexOf('return this.openyidaApplyRules', start);
+  const wrapperSource = String(source || '').slice(start, end === -1 ? undefined : end);
+  const match = wrapperSource.match(/typeof this\.([A-Za-z_$][A-Za-z0-9_$]*) === ["']function["']/);
+  return match ? match[1] : '';
+}
+
+function reconcileGeneratedRuleBindings(value, nextSourceFieldIds, actionsSource) {
+  if (!value) {return;}
+  if (Array.isArray(value)) {
+    value.forEach(function (item) {
+      reconcileGeneratedRuleBindings(item, nextSourceFieldIds, actionsSource);
+    });
+    return;
+  }
+  if (typeof value !== 'object') {return;}
+
+  const props = value.props || {};
+  const fieldId = String(props.fieldId || '');
+  const existingActionName = actionRefName(props.onChange);
+  if (fieldId && existingActionName.startsWith('openyidaRuleChange_') && !nextSourceFieldIds.has(fieldId)) {
+    const previousActionName = previousRuleActionName(actionsSource, existingActionName);
+    if (previousActionName) {
+      props.onChange = buildDesignerEventBinding(previousActionName, {}, props.onChange);
+    } else {
+      delete props.onChange;
+    }
+  }
+
+  Object.values(value).forEach(function (child) {
+    if (child !== props) {
+      reconcileGeneratedRuleBindings(child, nextSourceFieldIds, actionsSource);
+    }
+  });
+}
+
 function buildFormRulesActionSource(rules, fieldMap, bindings) {
   const rulesJson = JSON.stringify(rules, null, 2);
   const fieldMapJson = JSON.stringify(fieldMap, null, 2);
   const wrapperSource = bindings.map(function (binding) {
     const previousCall = binding.previousActionName && isValidActionIdentifier(binding.previousActionName)
-      ? '  if (typeof ' + binding.previousActionName + ' === "function") {\n    ' + binding.previousActionName + '.call(this, event);\n  }\n'
+      ? '  if (typeof this.' + binding.previousActionName + ' === "function") {\n    this.' + binding.previousActionName + '(event);\n  }\n'
       : '';
-    return 'export function ' + binding.wrapperName + '(event) {\n' +
+    const title = binding.label ? '/** @title ' + binding.label + '值发生变化 */\n' : '';
+    return title + 'export function ' + binding.wrapperName + '(event) {\n' +
       '  event = event || {};\n' +
       '  event.__openyidaSourceFieldId = "' + binding.fieldId + '";\n' +
       previousCall +
-      '  return openyidaApplyRules.call(this, event);\n' +
+      '  return this.openyidaApplyRules(event);\n' +
       '}';
   }).join('\n\n');
 
@@ -3405,10 +3545,10 @@ export function openyidaApplyRules(event) {
 }
 
 export function openyidaRulesDidMount(event) {
-  if (typeof didMount === 'function') {
-    didMount.call(this, event);
+  if (typeof this.didMount === 'function') {
+    this.didMount(event);
   }
-  return openyidaApplyRules.call(this, event || {});
+  return this.openyidaApplyRules(event || {});
 }
 
 ${wrapperSource}
@@ -3434,6 +3574,8 @@ function applyFormRules(schema, rawRules) {
     }
   });
 
+  reconcileGeneratedRuleBindings(formContainer.children, sourceFieldIds, actions.module.source || '');
+
   const bindings = [];
   sourceFieldIds.forEach(function (fieldId) {
     const found = findFieldByIdOrLabelDeep(formContainer.children, fieldId);
@@ -3443,32 +3585,18 @@ function applyFormRules(schema, rawRules) {
     found.field.props = found.field.props || {};
     const eventName = 'onChange';
     const existingAction = found.field.props[eventName];
-    const previousActionName = existingAction &&
-      existingAction.type === 'actionRef' &&
-      existingAction.name &&
-      !String(existingAction.name).startsWith('openyidaRuleChange_')
-      ? String(existingAction.name)
-      : '';
+    const existingActionName = actionRefName(existingAction);
     const wrapperName = 'openyidaRuleChange_' + sanitizeActionName(fieldId);
+    const previousActionName = existingActionName.startsWith('openyidaRuleChange_')
+      ? previousRuleActionName(actions.module.source || '', existingActionName)
+      : existingActionName;
     const relatedEventId = (found.field.id || fieldId) + ':' + eventName;
 
-    found.field.props[eventName] = {
-      name: wrapperName,
-      id: wrapperName,
-      params: {},
-      type: 'actionRef',
-    };
-
-    actions.list = actions.list.filter(function (item) {
-      return !(item.relatedEventId === relatedEventId && String(item.id || '').startsWith('openyidaRuleChange_'));
-    });
-    upsertActionListEntry(actions, {
-      relatedEventId,
-      name: wrapperName,
-      id: wrapperName,
-      type: 'componentEvent',
-      params: {},
-    });
+    found.field.props[eventName] = buildDesignerEventBinding(
+      wrapperName,
+      {},
+      found.field.props[eventName]
+    );
 
     bindings.push({
       fieldId,
@@ -3516,6 +3644,11 @@ function applyFormRules(schema, rawRules) {
   actions.module.source = upsertGeneratedSourceBlock(actions.module.source || '', generatedSource);
   actions.module.compiled = compileActionSource(actions.module.source);
   actions.type = actions.type || 'FUNCTION';
+  removeObsoleteGeneratedRuleCatalogEntries(actions, bindings.map(function (binding) {
+    return binding.wrapperName;
+  }));
+  // Merge source exports after the rich lifecycle/component entries above so their metadata is preserved.
+  syncDesignerActionCatalog(actions);
 
   return {
     rules: normalized.rules,
@@ -5332,7 +5465,22 @@ async function mainRule(parsedArgs, authRef) {
     fillSerialNumberFormulas(formContainer.children, corpId, appType, formUuid);
   }
 
+  const actionBindingExpectations = applied.bindings.map(function (binding) {
+    return {
+      fieldId: binding.fieldId,
+      event: binding.eventName,
+      actionName: binding.wrapperName,
+      relatedEventId: binding.relatedEventId,
+    };
+  });
+  assertFormActionBindings(schema, actionBindingExpectations);
   await saveFormSchema(authRef, appType, formUuid, schema, version, 4);
+  const actionReadback = await readBackFormActionBindings(
+    authRef,
+    appType,
+    formUuid,
+    actionBindingExpectations
+  );
 
   const formUrl = authRef.baseUrl + '/' + appType + '/workbench/' + formUuid;
   result(true, '表单联动规则保存成功', [
@@ -5347,6 +5495,7 @@ async function mainRule(parsedArgs, authRef) {
       formUuid,
       appType,
       rulesApplied: applied.rules.length,
+      readbackVerified: actionReadback.verified,
       rules: applied.rules.map(function (rule) {
         return {
           type: rule.type,
@@ -5358,11 +5507,16 @@ async function mainRule(parsedArgs, authRef) {
         };
       }),
       eventBindings: applied.bindings.map(function (binding) {
+        const readback = actionReadback.bindings.find(function (item) {
+          return item.fieldId === binding.fieldId && item.event === binding.eventName;
+        });
         return {
           fieldId: binding.fieldId,
           label: binding.label,
           event: binding.eventName,
           actionName: binding.wrapperName,
+          designerBindingFound: readback && readback.designerBindingFound,
+          verified: readback && readback.verified,
           resolved: getFieldEvidenceFromLookup(applied.fieldLookup, binding.fieldId),
         };
       }),
@@ -5376,6 +5530,97 @@ async function mainRule(parsedArgs, authRef) {
 
 // ── patch 模式主流程 ──────────────────────────────────
 
+function actionBindingExpectationsFromOperations(appliedOperations) {
+  return (appliedOperations || []).filter(function (operation) {
+    return operation.action === 'field-action' || operation.action === 'bind-field-action';
+  }).map(function (operation) {
+    return {
+      fieldId: operation.fieldId,
+      event: operation.event,
+      actionName: operation.actionName,
+      relatedEventId: operation.relatedEventId,
+    };
+  });
+}
+
+function assertFormActionBindings(schema, expectations, options) {
+  const inspection = inspectActionBindings(schema, expectations);
+  if (inspection.verified) {
+    return inspection;
+  }
+  const readback = options && options.readback === true;
+  throw createCreateFormError(
+    t(readback ? 'create_form.action_readback_mismatch' : 'create_form.action_binding_incomplete'),
+    readback ? 'FORM_ACTION_BINDING_READBACK_MISMATCH' : 'FORM_ACTION_BINDING_INCOMPLETE',
+    {
+      status: 'SEMANTIC_FAILURE',
+      retryable: false,
+      retrySafe: false,
+      sideEffectState: readback ? 'committed' : 'none',
+      mutationAccepted: readback,
+      readbackVerified: false,
+      readbackAllowed: true,
+      nextStep: readback ? 'inspect_existing_form_action_binding' : 'fix_action_binding_patch',
+      bindings: inspection.bindings,
+    }
+  );
+}
+
+async function readBackFormActionBindings(authRef, appType, formUuid, expectations) {
+  const schemaResult = await requestWithAutoLogin(function (auth) {
+    return sendGetRequest(
+      auth.baseUrl,
+      buildApiPath(appType, 'getFormSchema', { prefix: '_view', namespace: 'alibaba' }),
+      { formUuid: formUuid, schemaVersion: 'V5' }
+    );
+  }, authRef);
+
+  if (!schemaResult || schemaResult.success === false || schemaResult.__needLogin) {
+    const errorMsg = schemaResult ? schemaResult.errorMsg || t('common.unknown_error') : t('common.request_failed');
+    throw createCreateFormError(
+      t('create_form.action_readback_failed', errorMsg),
+      'FORM_ACTION_BINDING_READBACK_FAILED',
+      {
+        status: 'READBACK_UNVERIFIED',
+        retryable: true,
+        retrySafe: false,
+        sideEffectState: 'committed',
+        mutationAccepted: true,
+        readbackVerified: false,
+        readbackAllowed: true,
+        nextStep: 'retry_readback_only',
+        target: { appType, formUuid },
+        result: sanitizeFailureResult(schemaResult),
+      }
+    );
+  }
+
+  let schema;
+  try {
+    schema = schemaResult.content
+      ? (typeof schemaResult.content === 'string' ? JSON.parse(schemaResult.content) : schemaResult.content)
+      : schemaResult;
+  } catch (parseError) {
+    throw createCreateFormError(
+      t('create_form.action_readback_failed', parseError.message),
+      'FORM_ACTION_BINDING_READBACK_FAILED',
+      {
+        status: 'READBACK_UNVERIFIED',
+        retryable: true,
+        retrySafe: false,
+        sideEffectState: 'committed',
+        mutationAccepted: true,
+        readbackVerified: false,
+        readbackAllowed: true,
+        nextStep: 'retry_readback_only',
+        target: { appType, formUuid },
+      }
+    );
+  }
+
+  return assertFormActionBindings(schema, expectations, { readback: true });
+}
+
 async function mainPatch(parsedArgs, authRef) {
   const { appType, formUuid, patchJsonOrFile } = parsedArgs;
 
@@ -5429,6 +5674,9 @@ async function mainPatch(parsedArgs, authRef) {
   try {
     appliedOperations = applySchemaPatchOperations(schema, operations);
   } catch (patchError) {
+    if (patchError && patchError.isCliError) {
+      throw patchError;
+    }
     fail('Schema 补丁应用失败: ' + patchError.message);
     console.log(JSON.stringify({
       success: false,
@@ -5441,6 +5689,10 @@ async function mainPatch(parsedArgs, authRef) {
       formUuid,
     });
   }
+  const actionBindingExpectations = actionBindingExpectationsFromOperations(appliedOperations);
+  const localActionInspection = actionBindingExpectations.length > 0
+    ? assertFormActionBindings(schema, actionBindingExpectations)
+    : null;
   success('已应用 ' + appliedOperations.length + ' 个补丁操作');
   appliedOperations.forEach(function (operation, index) {
     listItem((index + 1) + '. ' + operation.action + (operation.field ? ' ' + operation.field : '') + (operation.path ? ' ' + operation.path : ''));
@@ -5455,6 +5707,9 @@ async function mainPatch(parsedArgs, authRef) {
   }
 
   await saveFormSchema(authRef, appType, formUuid, schema, version, 4);
+  const actionReadback = actionBindingExpectations.length > 0
+    ? await readBackFormActionBindings(authRef, appType, formUuid, actionBindingExpectations)
+    : null;
 
   const formUrl = authRef.baseUrl + '/' + appType + '/workbench/' + formUuid;
   result(true, 'Schema 补丁保存成功', [
@@ -5464,7 +5719,16 @@ async function mainPatch(parsedArgs, authRef) {
   ]);
 
   console.log(JSON.stringify(withBrowserHandoff(
-    { success: true, formUuid, appType, operationsApplied: appliedOperations.length, operations: appliedOperations, url: formUrl },
+    {
+      success: true,
+      formUuid,
+      appType,
+      operationsApplied: appliedOperations.length,
+      operations: appliedOperations,
+      readbackVerified: actionReadback ? actionReadback.verified : undefined,
+      eventBindings: actionReadback ? actionReadback.bindings : (localActionInspection ? localActionInspection.bindings : undefined),
+      url: formUrl,
+    },
     formUrl,
     { stage: 'patch_form_success', title: formUuid },
     parsedArgs.browserOpenMode
@@ -5811,5 +6075,9 @@ module.exports = {
     ensureYidaGlobalThemeAction,
     applyDefaultFormDetailStyle,
     applyChangesToSchema,
+    applyFormRules,
+    applySchemaPatchOperations,
+    actionBindingExpectationsFromOperations,
+    assertFormActionBindings,
   },
 };

package/lib/app/display-page-readback.js

@@ -23,10 +23,30 @@ function fingerprint(value) {
   return crypto.createHash('sha256').update(normalized).digest('hex');
 }
 
+function rawFingerprint(value) {
+  if (typeof value !== 'string' || !value) {
+    return '';
+  }
+  return crypto.createHash('sha256').update(value, 'utf8').digest('hex');
+}
+
+function positiveSize(value) {
+  const size = Number(value);
+  return Number.isFinite(size) && size > 0 ? size : 0;
+}
+
+function sha256(value) {
+  const digest = String(value || '').toLowerCase();
+  return /^[a-f0-9]{64}$/.test(digest) ? digest : '';
+}
+
 function createEmptyDisplayInfo() {
   return {
     hasYidaCodeCanvas: false,
+    hasCodeBundle: false,
     hasNativeJsx: false,
+    codeBundleCount: 0,
+    bundleIds: [],
     runtimeCodeBytes: 0,
     sourceCodeBytes: 0,
     compiledCodeBytes: 0,
@@ -34,6 +54,8 @@ function createEmptyDisplayInfo() {
     componentCount: 0,
     canvasRuntimeCode: '',
     canvasSourceCode: '',
+    canvasRuntimeSha256: '',
+    canvasSourceSha256: '',
     nativeCompiledCode: '',
     nativeSourceCode: '',
   };
@@ -79,12 +101,37 @@ function traverseDisplayNodes(node, info) {
 
   if (node.componentName === 'YidaCodeCanvas') {
     const props = node.props || {};
+    const codeBundle = props.codeBundle && typeof props.codeBundle === 'object'
+      ? props.codeBundle
+      : null;
     info.hasYidaCodeCanvas = true;
     info.componentCount++;
-    info.canvasRuntimeCode = props.runtimeCode || '';
-    info.canvasSourceCode = props.code || '';
+    if (typeof props.runtimeCode === 'string' && props.runtimeCode) {
+      info.canvasRuntimeCode = props.runtimeCode;
+    }
+    if (typeof props.code === 'string' && props.code) {
+      info.canvasSourceCode = props.code;
+    }
     info.runtimeCodeBytes += codeBytes(props.runtimeCode);
     info.sourceCodeBytes += codeBytes(props.code);
+    if (codeBundle) {
+      const bundleId = String(codeBundle.bundleId || '');
+      const runtime = codeBundle.runtime && typeof codeBundle.runtime === 'object'
+        ? codeBundle.runtime
+        : {};
+      const source = codeBundle.source && typeof codeBundle.source === 'object'
+        ? codeBundle.source
+        : {};
+      info.hasCodeBundle = true;
+      info.codeBundleCount++;
+      if (bundleId && !info.bundleIds.includes(bundleId)) {
+        info.bundleIds.push(bundleId);
+      }
+      info.runtimeCodeBytes += positiveSize(runtime.size);
+      info.sourceCodeBytes += positiveSize(source.size);
+      info.canvasRuntimeSha256 = sha256(runtime.sha256) || info.canvasRuntimeSha256;
+      info.canvasSourceSha256 = sha256(source.sha256) || info.canvasSourceSha256;
+    }
     addImportedModules(info.importedModules, props.importedModules);
   } else if (node.componentName === 'Jsx') {
     info.hasNativeJsx = true;
@@ -133,7 +180,9 @@ function hasExpectedDisplayComponent(info, publishMode) {
     return false;
   }
   if (publishMode === 'canvas') {
-    return info.hasYidaCodeCanvas && info.runtimeCodeBytes > 0;
+    return info.hasYidaCodeCanvas && (
+      info.runtimeCodeBytes > 0 || !!info.canvasRuntimeSha256
+    );
   }
   return info.hasNativeJsx && info.compiledCodeBytes > 0;
 }
@@ -144,7 +193,10 @@ function summarizeDisplayPublishInfo(info) {
   }
   return {
     hasYidaCodeCanvas: info.hasYidaCodeCanvas,
+    hasCodeBundle: info.hasCodeBundle,
     hasNativeJsx: info.hasNativeJsx,
+    codeBundleCount: info.codeBundleCount,
+    bundleIds: info.bundleIds.slice(),
     runtimeCodeBytes: info.runtimeCodeBytes,
     sourceCodeBytes: info.sourceCodeBytes,
     compiledCodeBytes: info.compiledCodeBytes,
@@ -159,8 +211,13 @@ function verifyPublishedContentMatch(readbackSchema, expectedSchemaContent, publ
   const displayComponentPresent = hasExpectedDisplayComponent(readbackInfo, publishMode);
   const readbackArtifact = getPublishArtifact(readbackInfo, publishMode);
   const expectedArtifact = getPublishArtifact(expectedInfo, publishMode);
-  const readbackFingerprint = fingerprint(readbackArtifact);
-  const expectedFingerprint = fingerprint(expectedArtifact);
+  const codeBundleReadback = publishMode === 'canvas' && readbackInfo && readbackInfo.hasCodeBundle;
+  const readbackFingerprint = codeBundleReadback
+    ? readbackInfo.canvasRuntimeSha256
+    : fingerprint(readbackArtifact);
+  const expectedFingerprint = codeBundleReadback
+    ? rawFingerprint(expectedArtifact)
+    : fingerprint(expectedArtifact);
 
   return {
     readbackInfo,
@@ -180,6 +237,7 @@ function verifyPublishedContentMatch(readbackSchema, expectedSchemaContent, publ
 module.exports = {
   extractDisplayPublishInfo,
   fingerprint,
+  rawFingerprint,
   hasExpectedDisplayComponent,
   parseSchemaContent,
   summarizeDisplayPublishInfo,