openyida 2026.9.13 → 2026.9.15

package/lib/app/canvas-compile.js

@@ -24,12 +24,13 @@
  *   3) 第三方依赖以 `window.<别名>` 形式引用（antd→window.antd、react→window.React …），
  *      这些 UMD 依赖由画布运行时依据 importedModules 白名单按需注入。
  *
- * 因此本地编译 = Babel 把 JSX/TS 转成 ES5 → 把 import 改写成 window 别名引用、
- * 把 export default 改写成画布入口 `YidaComp` → 正则抽出依赖包名。
+ * 因此本地编译 = Babel 把 JSX/TS 转成 JS → 把 import 改写成 window 别名引用、
+ * 把 export default 改写成画布入口 `YidaComp` → UglifyJS 压缩 → 正则抽出依赖包名。
  */
 
 const Babel = require('@babel/standalone');
 const globals = require('globals');
+const UglifyJS = require('uglify-js');
 const {
   assertNoEmojiInArtifactName,
   assertNoEmojiInText,
@@ -877,6 +878,36 @@ function assertCanvasRuntimeParseable(runtimeCode, options = {}) {
   }
 }
 
+/**
+ * 压缩画布运行态代码，并显式保留装配器读取的 YidaComp 入口名。
+ */
+function minifyCanvasRuntime(runtimeCode, options = {}) {
+  let result;
+  try {
+    result = UglifyJS.minify(runtimeCode, {
+      compress: true,
+      mangle: {
+        reserved: ['YidaComp'],
+      },
+    });
+  } catch (error) {
+    result = { error };
+  }
+  if (!result || result.error || typeof result.code !== 'string' || !result.code) {
+    const detail = result && result.error && result.error.message
+      ? result.error.message
+      : '压缩结果为空';
+    throw new CliError(`Code Canvas runtimeCode 压缩失败: ${detail}`, {
+      code: 'OPENYIDA_CANVAS_MINIFY_FAILED',
+      details: {
+        stage: 'canvas_minify',
+        sourcePath: options.sourcePath || '',
+      },
+    });
+  }
+  return result.code;
+}
+
 /**
  * 本地编译 Code Canvas 源码。
  * @param {string} source 原始 React/JSX/TSX 源码
@@ -984,11 +1015,12 @@ function compileCanvasLocal(source, options = {}) {
     configFile: false,
   });
 
-  const runtimeCode = stage2.code || '';
-  assertNoEmojiInText(runtimeCode, {
+  const unminifiedRuntimeCode = stage2.code || '';
+  assertNoEmojiInText(unminifiedRuntimeCode, {
     artifact: options.sourcePath ? options.sourcePath + ' runtime' : 'Code Canvas runtime',
     code: 'OPENYIDA_CANVAS_SOURCE_EMOJI_FORBIDDEN',
   });
+  const runtimeCode = minifyCanvasRuntime(unminifiedRuntimeCode, options);
   assertCanvasRuntimeParseable(runtimeCode, options);
   assertDependencyManifestConsistent(runtimeCode, importedModules, options);
   return {
@@ -1059,6 +1091,7 @@ module.exports = {
   resolveWindowAlias,
   shouldAllowUnsupportedBareImports,
   assertCanvasRuntimeParseable,
+  minifyCanvasRuntime,
   findBareDependencyGlobalIssues,
   findSelfReferentialDependencyBindingIssues,
   findDependencyManifestIssues,

package/lib/app/create-form/batch.js

@@ -225,6 +225,25 @@ function readbackMismatch(formUuid, form, schema) {
   });
 }
 
+function buildPartialFailureRecovery(results) {
+  const items = Object.values(results || {});
+  const hasUnknownWrite = items.some(item =>
+    item && (item.status === 'running' || (item.status === 'failed' && !item.formUuid))
+  );
+  const recoveryAction = hasUnknownWrite
+    ? 'inspect_unknown_write_then_reconcile'
+    : 'rerun_unchanged_plan';
+  return { recoveryAction, nextAction: recoveryAction };
+}
+
+function buildDeliveryUrls(baseUrl, appType, formUuid) {
+  const normalizedBaseUrl = String(baseUrl || '').replace(/\/+$/, '');
+  if (!normalizedBaseUrl || !appType || !formUuid) { return {}; }
+  const appUrl = `${normalizedBaseUrl}/${appType}/workbench`;
+  const formUrl = `${appUrl}/${formUuid}`;
+  return { url: formUrl, formUrl, appUrl };
+}
+
 function execute(args, { execFile: execFileImpl = execFile } = {}) {
   return new Promise((resolve, reject) => {
     execFileImpl(process.execPath, [path.resolve(__dirname, '../../../bin/yida.js'), ...args, '--quiet'], {
@@ -317,13 +336,15 @@ async function run(args, dependencies = {}) {
   try {
     const state = fs.existsSync(stateFile) ? JSON.parse(fs.readFileSync(stateFile, 'utf8')) : { fingerprint, appType: options.appType, results: {} };
     if (state.fingerprint !== fingerprint) { invalid('state belongs to a different plan; reconcile existing resources before preparing a new batch'); }
-    await call(['login', '--check-only', '--json']);
+    const loginStatus = await call(['login', '--check-only', '--json']);
+    const baseUrl = loginStatus?.base_url || loginStatus?.baseUrl || '';
     // Read back completed resources before their IDs can be used by dependent forms.
     for (const form of forms.filter(item => state.results[item.key]?.status === 'success')) {
       const item = state.results[form.key];
       const schema = await call(['get-schema', options.appType, item.formUuid, '--field-map-json']);
       if (schema.formUuid !== item.formUuid || !Array.isArray(schema.fields)) { invalid(`schema: ${form.key}`); }
       item.fields = schema.fields;
+      Object.assign(item, buildDeliveryUrls(baseUrl, options.appType, item.formUuid));
     }
     const resolve = (key, field) => {
       const item = state.results[key];
@@ -336,6 +357,7 @@ async function run(args, dependencies = {}) {
     await schedule(forms, options.concurrency, state.results, async form => {
       let formUuid = form.formUuid || state.results[form.key]?.formUuid;
       let shouldResume = Boolean(!form.formUuid && formUuid);
+      let delivery = buildDeliveryUrls(baseUrl, options.appType, formUuid);
       const resolvedFields = mapReferences(form.fields, resolve);
       if (!formUuid) {
         const argv = ['create-form', 'create', options.appType, form.title, JSON.stringify(resolvedFields), '--no-open'];
@@ -344,6 +366,12 @@ async function run(args, dependencies = {}) {
           const created = await call(argv);
           if (typeof created.formUuid !== 'string' || !created.formUuid.startsWith('FORM')) { invalid(`create result: ${form.key}`); }
           formUuid = created.formUuid;
+          delivery = {
+            ...buildDeliveryUrls(baseUrl, options.appType, formUuid),
+            ...(created.url ? { url: created.url } : {}),
+            ...(created.formUrl ? { formUrl: created.formUrl } : {}),
+            ...(created.appUrl ? { appUrl: created.appUrl } : {}),
+          };
         } catch (error) {
           const createdFormUuid = error.output?.formUuid || error.output?.details?.formUuid;
           if (typeof createdFormUuid !== 'string' || !createdFormUuid.startsWith('FORM')) {
@@ -357,25 +385,43 @@ async function run(args, dependencies = {}) {
       save(state);
       let resumed = false;
       if (shouldResume) {
-        await call(['create-form', 'resume', options.appType, formUuid, JSON.stringify(resolvedFields), '--json']);
+        const resumeOutput = await call(['create-form', 'resume', options.appType, formUuid, JSON.stringify(resolvedFields), '--json']);
+        delivery = {
+          ...buildDeliveryUrls(baseUrl, options.appType, formUuid),
+          ...(resumeOutput.url ? { url: resumeOutput.url } : {}),
+          ...(resumeOutput.formUrl ? { formUrl: resumeOutput.formUrl } : {}),
+          ...(resumeOutput.appUrl ? { appUrl: resumeOutput.appUrl } : {}),
+        };
         resumed = true;
       }
       let schema = await call(['get-schema', options.appType, formUuid, '--field-map-json']);
       if (!readbackMatchesExpectedFields(schema, resolvedFields) && !resumed && !form.formUuid) {
-        await call(['create-form', 'resume', options.appType, formUuid, JSON.stringify(resolvedFields), '--json']);
+        const resumeOutput = await call(['create-form', 'resume', options.appType, formUuid, JSON.stringify(resolvedFields), '--json']);
+        delivery = {
+          ...buildDeliveryUrls(baseUrl, options.appType, formUuid),
+          ...(resumeOutput.url ? { url: resumeOutput.url } : {}),
+          ...(resumeOutput.formUrl ? { formUrl: resumeOutput.formUrl } : {}),
+          ...(resumeOutput.appUrl ? { appUrl: resumeOutput.appUrl } : {}),
+        };
         resumed = true;
         schema = await call(['get-schema', options.appType, formUuid, '--field-map-json']);
       }
       if (schema.formUuid !== formUuid || !readbackMatchesExpectedFields(schema, resolvedFields)) {
         throw readbackMismatch(formUuid, { ...form, fields: resolvedFields }, schema);
       }
-      return { formUuid, fields: schema.fields };
+      return { formUuid, fields: schema.fields, ...delivery };
     }, () => save(state));
     const success = Object.values(state.results).every(item => item.status === 'success');
-    const output = { success, groups, stateFile, results: state.results };
+    const output = {
+      success,
+      groups,
+      stateFile,
+      results: state.results,
+      ...((baseUrl && options.appType) ? { appUrl: `${String(baseUrl).replace(/\/+$/, '')}/${options.appType}/workbench` } : {}),
+    };
     if (!success) {
       output.errorCode = 'FORM_BATCH_PARTIAL_FAILURE';
-      output.nextAction = 'Inspect the saved state and child error, then fix the batch input or recover known formUuid values. Do not fall back to create-form create.';
+      Object.assign(output, buildPartialFailureRecovery(state.results));
     }
     console.log(JSON.stringify(output));
     if (!output.success) { process.exitCode = 1; }
@@ -397,5 +443,7 @@ module.exports = {
   execute,
   expectedReadbackFields,
   readbackMatchesExpectedFields,
+  buildPartialFailureRecovery,
+  buildDeliveryUrls,
   validateStaticDefinition,
 };

package/lib/app/create-form.js

@@ -4858,7 +4858,10 @@ async function saveFormSchema(authRef, appType, formUuid, schema, version, stepO
       formUuid,
       result: sanitizeFailureResult(saveResult),
     });
-    if (failureContext) {
+    if (failureContext && failureContext.deferFailureOutput) {
+      // Resume may safely resolve an HTTP 5xx by exact readback. Defer the
+      // failure payload so a recovered command emits one authoritative result.
+    } else if (failureContext) {
       emitCreateFormPostCreateFailure(Object.assign({}, failureContext, {
         stage: 'saveFormSchema',
         error: saveError,
@@ -4879,6 +4882,13 @@ async function saveFormSchema(authRef, appType, formUuid, schema, version, stepO
 
 // ── create 模式主流程 ─────────────────────────────────
 
+function buildFormDeliveryUrls(baseUrl, appType, formUuid) {
+  return {
+    appUrl: baseUrl + '/' + appType + '/workbench',
+    formUrl: baseUrl + '/' + appType + '/workbench/' + formUuid,
+  };
+}
+
 async function mainValidateFields(parsedArgs) {
   const { fieldsJsonOrFile } = parsedArgs;
   assertNoEmojiInDefinitionFileName(fieldsJsonOrFile);
@@ -5034,13 +5044,13 @@ async function mainCreate(parsedArgs, authRef) {
   }
 
   // 输出结果
-  const formUrl = authRef.baseUrl + '/' + appType + '/workbench/' + formUuid;
+  const { appUrl, formUrl } = buildFormDeliveryUrls(authRef.baseUrl, appType, formUuid);
   result(true, t('create_form.create_success'), [
     ['Form UUID', formUuid],
     ['URL', formUrl],
   ]);
   console.log(JSON.stringify(withBrowserHandoff(
-    { success: true, formUuid, formTitle, appType, fieldCount, icon: formIcon, iconSource: iconResolution.source, url: formUrl },
+    { success: true, formUuid, formTitle, appType, fieldCount, icon: formIcon, iconSource: iconResolution.source, url: formUrl, formUrl, appUrl },
     formUrl,
     { stage: 'create_form_success', title: formTitle },
     parsedArgs.browserOpenMode
@@ -5127,6 +5137,7 @@ async function createFormForLegacyProcessQuiet(context, input) {
   }
   const saveResult = await saveFormSchema(authRef, appType, formUuid, schema, serverRevision, 4);
   const navIconResult = await updateCreatedFormNavigationIcon(authRef, appType, formUuid, formIcon);
+  const { appUrl, formUrl } = buildFormDeliveryUrls(authRef.baseUrl, appType, formUuid);
   return {
     success: true,
     appType,
@@ -5138,7 +5149,9 @@ async function createFormForLegacyProcessQuiet(context, input) {
     navIconResult,
     icon: formIcon,
     iconSource: iconResolution.source,
-    url: authRef.baseUrl + '/' + appType + '/workbench/' + formUuid,
+    url: formUrl,
+    formUrl,
+    appUrl,
   };
 }
 
@@ -5319,7 +5332,7 @@ async function mainAddOption(parsedArgs, authRef) {
   // Step 4: 保存 Schema
   await saveFormSchema(authRef, appType, formUuid, schema, version, 4);
 
-  const formUrl = authRef.baseUrl + '/' + appType + '/workbench/' + formUuid;
+  const { appUrl, formUrl } = buildFormDeliveryUrls(authRef.baseUrl, appType, formUuid);
   result(true, '选项追加成功', [
     ['Form UUID', formUuid],
     ['Field', fieldLabel],
@@ -5339,6 +5352,8 @@ async function mainAddOption(parsedArgs, authRef) {
     skipped: skippedOptions,
     totalOptions: existingDataSource.length,
     url: formUrl,
+    formUrl,
+    appUrl,
   }));
 }
 
@@ -5438,7 +5453,7 @@ async function mainBindDataSource(parsedArgs, authRef) {
 
   await saveFormSchema(authRef, appType, formUuid, schema, version, 4);
 
-  const formUrl = authRef.baseUrl + '/' + appType + '/workbench/' + formUuid;
+  const { appUrl, formUrl } = buildFormDeliveryUrls(authRef.baseUrl, appType, formUuid);
   result(true, '字段数据源保存成功', [
     ['Form UUID', formUuid],
     ['Field', fieldLabel],
@@ -5459,6 +5474,8 @@ async function mainBindDataSource(parsedArgs, authRef) {
       options: normalized.options.length,
       filterLocal: targetComponent.props.filterLocal,
       pageUrl: formUrl,
+      formUrl,
+      appUrl,
     },
     formUrl,
     { stage: 'bind_datasource_success', title: formUuid },
@@ -6109,6 +6126,59 @@ async function readResumeSchema(authRef, appType, formUuid) {
   return { schemaResult, schema, version: extractSchemaServerRevision(schemaResult) };
 }
 
+function isRetryableResumeSaveServerFailure(errorObject) {
+  const status = Number(errorObject?.details?.result?.__httpStatus);
+  return errorObject?.code === 'CREATE_FORM_SAVE_SCHEMA_FAILED' &&
+    Number.isInteger(status) && status >= 500 && status <= 599;
+}
+
+async function saveResumeSchemaWithSafeRetry(authRef, appType, formUuid, schema, version, fields) {
+  const save = (value, revision) => saveFormSchema(
+    authRef, appType, formUuid, value, revision, 4, { deferFailureOutput: true }
+  );
+  try {
+    await save(schema, version);
+    return '';
+  } catch (originalError) {
+    if (!isRetryableResumeSaveServerFailure(originalError)) { throw originalError; }
+
+    let readback;
+    try { readback = await readResumeSchema(authRef, appType, formUuid); } catch (_) { throw originalError; }
+    const root = readback.schema.pages[0].componentsTree && readback.schema.pages[0].componentsTree[0];
+    const container = root ? findFormContainer(root) : null;
+    if (!container) { throw originalError; }
+    const evidence = collectResumeFieldEvidence(container.children);
+    const verified = buildResumeChanges(
+      evidence,
+      collectResumeDesiredFields(fields, { verifyNestedFields: true })
+    );
+    if (verified.conflicts.length > 0) { throw originalError; }
+    if (verified.missing.length === 0) { return 'save_schema_recovered_by_readback'; }
+    const retryPlan = buildResumeChanges(evidence, collectResumeDesiredFields(fields));
+    if (retryPlan.conflicts.length > 0 || retryPlan.missing.length === 0) { throw originalError; }
+    const applied = applyChangesToSchema(
+      readback.schema,
+      retryPlan.missing.map(function (field) { return { action: 'add', field }; }),
+      { verbose: true }
+    );
+    if ((applied.diagnostics || []).length > 0) { throw originalError; }
+    const updatedContainer = findFormContainer(readback.schema.pages[0].componentsTree[0]);
+    fillSerialNumberFormulas(updatedContainer.children, resolveCorpId(authRef.authData), appType, formUuid);
+
+    try {
+      await save(readback.schema, readback.version);
+    } catch (retryError) {
+      originalError.details = Object.assign({}, originalError.details, {
+        safeRetryAttempted: true,
+        retryErrorCode: retryError?.code || 'CREATE_FORM_SAVE_SCHEMA_FAILED',
+        retryResult: sanitizeFailureResult(retryError?.details?.result),
+      });
+      throw originalError;
+    }
+    return 'save_schema_retried';
+  }
+}
+
 async function mainResume(parsedArgs, authRef) {
   const { appType, formUuid, fieldsJsonOrFile } = parsedArgs;
   assertNoEmojiInDefinitionFileName(fieldsJsonOrFile);
@@ -6139,8 +6209,11 @@ async function mainResume(parsedArgs, authRef) {
     if (resumeValidationRules.length > 0) {
       applySmartValidations(firstRead.schema, resumeValidationRules);
     }
-    await saveFormSchema(authRef, appType, formUuid, firstRead.schema, firstRead.version, 4);
+    const saveRecoveryStage = await saveResumeSchemaWithSafeRetry(
+      authRef, appType, formUuid, firstRead.schema, firstRead.version, fields
+    );
     completedStages.push('rebuild_blank_schema', 'save_schema');
+    if (saveRecoveryStage) { completedStages.push(saveRecoveryStage); }
     recoveredBlankShell = true;
     plan = {
       existing: [],
@@ -6189,8 +6262,11 @@ async function mainResume(parsedArgs, authRef) {
     const corpId = resolveCorpId(authRef.authData);
     const updatedContainer = findFormContainer(firstRead.schema.pages[0].componentsTree[0]);
     fillSerialNumberFormulas(updatedContainer.children, corpId, appType, formUuid);
-    await saveFormSchema(authRef, appType, formUuid, firstRead.schema, firstRead.version, 4);
+    const saveRecoveryStage = await saveResumeSchemaWithSafeRetry(
+      authRef, appType, formUuid, firstRead.schema, firstRead.version, fields
+    );
     completedStages.push('add_missing_fields', 'save_schema');
+    if (saveRecoveryStage) { completedStages.push(saveRecoveryStage); }
   }
 
   const finalRead = await readResumeSchema(authRef, appType, formUuid);
@@ -6211,7 +6287,7 @@ async function mainResume(parsedArgs, authRef) {
     });
   }
   completedStages.push('verify_final_schema');
-  const formUrl = authRef.baseUrl + '/' + appType + '/workbench/' + formUuid;
+  const { appUrl, formUrl } = buildFormDeliveryUrls(authRef.baseUrl, appType, formUuid);
   const output = {
     success: true,
     appType,
@@ -6223,6 +6299,8 @@ async function mainResume(parsedArgs, authRef) {
     finalFieldCount: collectResumeFieldEvidence(finalContainer.children).length,
     recoveredBlankShell,
     url: formUrl,
+    formUrl,
+    appUrl,
   };
   console.log(JSON.stringify(withBrowserHandoff(
     output,
@@ -6384,14 +6462,14 @@ async function mainUpdate(parsedArgs, authRef) {
   await saveFormSchema(authRef, appType, formUuid, schema, version, 6);
 
   // 输出结果
-  const formUrl = authRef.baseUrl + '/' + appType + '/workbench/' + formUuid;
+  const { appUrl, formUrl } = buildFormDeliveryUrls(authRef.baseUrl, appType, formUuid);
   result(true, t('create_form.update_success'), [
     ['Form UUID', formUuid],
     ['URL', formUrl],
     ['Changes', String(appliedChanges.length)],
   ]);
   console.log(JSON.stringify(withBrowserHandoff(
-    { success: true, formUuid, appType, changesApplied: appliedChanges.length, changes: appliedChanges, url: formUrl },
+    { success: true, formUuid, appType, changesApplied: appliedChanges.length, changes: appliedChanges, url: formUrl, formUrl, appUrl },
     formUrl,
     { stage: 'update_form_success', title: formUuid },
     parsedArgs.browserOpenMode

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,