openxiangda 1.0.228 → 1.0.230

package/lib/application-environments.js

@@ -17,8 +17,21 @@ const SIDE_EFFECT_POLICY_FIELDS = new Set([
   'environmentBanner',
   'externalDingTalkDepartmentRootId',
 ]);
-const CANDIDATE_STATE_HASH_POLICY =
+const CANDIDATE_STATE_HASH_POLICY_V1 =
   'openxiangda-state-without-runtime-promotion-v1';
+const CANDIDATE_STATE_HASH_POLICY =
+  'openxiangda-state-stable-managed-bindings-v2';
+const CANDIDATE_STATE_HASH_POLICIES = new Set([
+  CANDIDATE_STATE_HASH_POLICY_V1,
+  CANDIDATE_STATE_HASH_POLICY,
+]);
+const CANDIDATE_RESOURCE_OBSERVATION_FIELDS = new Set([
+  'createdAt',
+  'updatedAt',
+  'syncedAt',
+  'schemaSyncedAt',
+  'bundlePublishedAt',
+]);
 
 function canonicalJson(value) {
   if (Array.isArray(value)) {
@@ -611,7 +624,7 @@ function hashCandidateWorkspaceFile(cwd, relativePath, options = {}) {
     ? options.hashPolicy
     : candidateFileHashPolicy(normalized);
   if (!hashPolicy) return hashWorkspaceFile(cwd, normalized);
-  if (hashPolicy !== CANDIDATE_STATE_HASH_POLICY) {
+  if (!CANDIDATE_STATE_HASH_POLICIES.has(hashPolicy)) {
     const error = new Error(
       `不支持的 candidate 文件哈希策略: ${hashPolicy}`
     );
@@ -636,7 +649,10 @@ function hashCandidateWorkspaceFile(cwd, relativePath, options = {}) {
     invalid.code = 'CANDIDATE_STATE_INPUT_INVALID';
     throw invalid;
   }
-  const normalizedState = normalizeCandidateProjectStateForHash(state);
+  const normalizedState = normalizeCandidateProjectStateForHash(
+    state,
+    hashPolicy
+  );
   const buffer = Buffer.from(canonicalJson(normalizedState), 'utf8');
   return {
     path: normalized,
@@ -647,7 +663,7 @@ function hashCandidateWorkspaceFile(cwd, relativePath, options = {}) {
   };
 }
 
-function normalizeCandidateProjectStateForHash(input) {
+function normalizeCandidateProjectStateForHash(input, hashPolicy) {
   const state = cloneJsonValue(input);
   if (!state || typeof state !== 'object' || Array.isArray(state)) {
     const error = new Error(
@@ -674,6 +690,18 @@ function normalizeCandidateProjectStateForHash(input) {
       // that caused the release, while all durable binding fields remain hashed.
       delete binding.promotion;
       delete binding.updatedAt;
+      if (
+        collectionName === 'targets' &&
+        hashPolicy === CANDIDATE_STATE_HASH_POLICY
+      ) {
+        // Managed release stages persist discovered/created resource IDs and
+        // the activated runtime head as their durable local execution result.
+        // The sealed environmentBindings manifest independently protects every
+        // resource identity that existed before sealing, while intentionally
+        // allowing additive bindings created by the candidate itself.
+        delete binding.resources;
+        delete binding.runtime;
+      }
     }
   }
   return state;
@@ -686,7 +714,7 @@ function normalizeCandidateResourceBindings(value) {
   if (!value || typeof value !== 'object') return value;
   return Object.fromEntries(
     Object.entries(value)
-      .filter(([key]) => !['createdAt', 'updatedAt', 'syncedAt'].includes(key))
+      .filter(([key]) => !CANDIDATE_RESOURCE_OBSERVATION_FIELDS.has(key))
       .sort(([left], [right]) => left.localeCompare(right))
       .map(([key, item]) => [
         key,
@@ -901,7 +929,7 @@ function inspectCandidateBundleFiles(candidate, cwd = process.cwd()) {
     }
     seen.add(file);
     const hashPolicy = expected.hashPolicy || null;
-    if (hashPolicy && hashPolicy !== CANDIDATE_STATE_HASH_POLICY) {
+    if (hashPolicy && !CANDIDATE_STATE_HASH_POLICIES.has(hashPolicy)) {
       mismatches.push({
         path: file,
         reason: 'unsupported-hash-policy',

package/lib/cli.js

@@ -14212,18 +14212,36 @@ async function resource(args) {
         .map(item => item.formCode || item.form)
         .filter(Boolean)
     );
+    const scopeGrantSourceNeedsInitialSync = (
+      manifest.scopeGrantSources || []
+    ).some(item => item.sync === true);
     const stagedChangeId =
       readStringFlag(flags, 'change') ||
       getStoredChangeBaseline(target, { access: 'reconciliation-read' })
         ?.changeId ||
       '';
-    if (workflowFormCodes.length > 0 && stagedChangeId) {
+    const scopeGrantSourceFormCodes =
+      scopeGrantSourceNeedsInitialSync && stagedChangeId
+        ? await resolveScopeGrantSourceFormCodes(
+            config,
+            target,
+            manifest.scopeGrantSources || []
+          )
+        : [];
+    const stagedContractFormCodes = unique([
+      ...workflowFormCodes,
+      ...scopeGrantSourceFormCodes,
+    ]).sort();
+    if (
+      stagedContractFormCodes.length > 0 &&
+      stagedChangeId
+    ) {
       stagedFormBindingOverlays =
         await resolveReusableStagedFormReleaseOverlays(
           config,
           target,
           stagedChangeId,
-          { formCodes: workflowFormCodes }
+          { formCodes: stagedContractFormCodes }
         );
     }
     validateWorkspaceResourceBindings(
@@ -14381,6 +14399,7 @@ async function resource(args) {
           replaceManifest: Boolean(flags['replace-manifest']),
           changeId:
             flags.change || getStoredChangeBaseline(target)?.changeId || null,
+          stagedFormBindingOverlays,
           activateFormBundles: Boolean(flags.activate),
           stageBackendReleaseOnly:
             Boolean(flags['stage-only']) &&
@@ -23293,7 +23312,84 @@ async function publishScopeDimensionResources(config, target, dimensions, result
   }
 }
 
+async function resolveScopeGrantSourceFormCodes(
+  config,
+  target,
+  sources = []
+) {
+  const formCodes = [];
+  const appendFormCode = value => {
+    const candidate = String(value || '').trim();
+    if (!candidate) return;
+    if (target.bound.resources?.forms?.[candidate]?.formUuid) {
+      formCodes.push(candidate);
+      return;
+    }
+    for (const [code, entry] of Object.entries(
+      target.bound.resources?.forms || {}
+    )) {
+      if (String(entry?.formUuid || '').trim() === candidate) {
+        formCodes.push(code);
+        return;
+      }
+    }
+  };
+  const dimensionCodes = new Set();
+  for (const source of sources || []) {
+    appendFormCode(
+      source.sourceFormCode ||
+        source.formCode ||
+        source.sourceFormUuid ||
+        source.formUuid
+    );
+    for (const mapping of source.dimensionMappings || source.dimensions || []) {
+      const code = String(
+        mapping?.dimensionCode || mapping?.dimension || ''
+      ).trim();
+      if (code) dimensionCodes.add(code);
+    }
+  }
+  if (dimensionCodes.size > 0) {
+    const dimensions = await requestWithAuth(
+      config,
+      target.profileName,
+      `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/scope/dimensions`
+    );
+    for (const dimension of normalizeItems(dimensions)) {
+      const code = String(
+        dimension?.code || dimension?.resourceCode || ''
+      ).trim();
+      if (!dimensionCodes.has(code)) continue;
+      appendFormCode(dimension.sourceFormUuid || dimension.formUuid);
+    }
+  }
+  return unique(formCodes).sort();
+}
+
 async function publishScopeGrantSourceResources(config, target, sources, result, options = {}) {
+  const stagedFormBindingOverlays =
+    options.stagedFormBindingOverlays instanceof Map
+      ? options.stagedFormBindingOverlays
+      : new Map();
+  let dimensionMap = new Map();
+  if (
+    stagedFormBindingOverlays.size > 0 &&
+    (sources || []).some(item => item.sync === true)
+  ) {
+    const dimensions = await requestWithAuth(
+      config,
+      target.profileName,
+      `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/scope/dimensions`
+    );
+    dimensionMap = new Map(
+      normalizeItems(dimensions)
+        .map(item => [
+          String(item.code || item.resourceCode || '').trim(),
+          item,
+        ])
+        .filter(([code]) => Boolean(code))
+    );
+  }
   for (const item of sources) {
     const code = item.code || item.resourceCode;
     if (shouldSkipNoopResource(options, 'scopeGrantSource', code)) {
@@ -23316,17 +23412,88 @@ async function publishScopeGrantSourceResources(config, target, sources, result,
       id: data?.id,
     };
     if (item.sync === true) {
-      published.sync = await requestWithAuth(
-        config,
-        target.profileName,
-        `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/scope/grant-sources/${encodeURIComponent(code)}/sync`,
-        { method: 'POST', body: { dryRun: false } }
-      );
+      const syncDecision = buildScopeGrantSourceSyncDecision({
+        source: body,
+        dimensionMap,
+        stagedFormBindingOverlays,
+      });
+      if (syncDecision.defer) {
+        published.sync = {
+          status: 'deferred-until-form-activation',
+          reason: syncDecision.reason,
+          formUuids: syncDecision.formUuids,
+          formCodes: syncDecision.formCodes,
+          resumeTrigger: 'on_write_after_app_finalize',
+        };
+        result.warnings.push(
+          `scopeGrantSource:${code}: 初始同步依赖同一 deployment 的新 staged FormRelease，当前尚无 active 数据表；已保存 on_write 配置，App finalize 后首次表单写入会自动物化`
+        );
+      } else {
+        published.sync = await requestWithAuth(
+          config,
+          target.profileName,
+          `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/scope/grant-sources/${encodeURIComponent(code)}/sync`,
+          { method: 'POST', body: { dryRun: false } }
+        );
+      }
     }
     result.published.push(published);
   }
 }
 
+function buildScopeGrantSourceSyncDecision({
+  source,
+  dimensionMap = new Map(),
+  stagedFormBindingOverlays = new Map(),
+} = {}) {
+  const stagedNewForms = new Map(
+    Array.from(stagedFormBindingOverlays.values())
+      .filter(item => item?.parentReleaseId === null && item?.formUuid)
+      .map(item => [
+        String(item.formUuid).trim(),
+        String(item.formCode || '').trim(),
+      ])
+  );
+  if (stagedNewForms.size === 0) {
+    return {
+      defer: false,
+      reason: null,
+      formUuids: [],
+      formCodes: [],
+    };
+  }
+  const referencedFormUuids = [
+    source?.sourceFormUuid,
+    ...(source?.dimensionMappings || []).map(mapping => {
+      const code = String(
+        mapping?.dimensionCode || mapping?.dimension || ''
+      ).trim();
+      const dimension = dimensionMap.get(code);
+      return dimension?.sourceFormUuid || dimension?.formUuid;
+    }),
+  ]
+    .map(value => String(value || '').trim())
+    .filter(Boolean);
+  const formUuids = unique(
+    referencedFormUuids.filter(formUuid =>
+      stagedNewForms.has(formUuid)
+    )
+  ).sort();
+  return {
+    defer: formUuids.length > 0,
+    reason:
+      formUuids.length > 0
+        ? 'staged_new_form_has_no_active_data_table'
+        : null,
+    formUuids,
+    formCodes: unique(
+      formUuids
+        .map(formUuid => stagedNewForms.get(formUuid))
+        .filter(Boolean)
+    ).sort(),
+  };
+}
+
 async function publishDataScopePolicyResources(config, target, policies, result, options = {}) {
   for (const item of policies) {
     const code = item.code || item.resourceCode;
@@ -29263,6 +29430,7 @@ function buildWorkspacePublishEnv(
 
 module.exports = {
   buildResourceManifestSddTargets,
+  buildScopeGrantSourceSyncDecision,
   main,
   satisfiedFormCodesFromContext,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.228",
+  "version": "1.0.230",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {