openxiangda 1.0.235 → 1.0.237

package/lib/cli.js

@@ -166,7 +166,10 @@ const {
   withReleaseClientSessionArgs,
 } = require('./application-environments');
 const { startDeveloperCenter } = require('./developer-center');
-const { createDeliveryV2Cli } = require('./delivery-v2-cli');
+const {
+  createDeliveryV2Cli,
+  deliveryV2SourceRevision,
+} = require('./delivery-v2-cli');
 const {
   describeOpenApiOperation,
   listOpenApiOperations,
@@ -1477,20 +1480,6 @@ function getDeliveryV2Cli() {
   return deliveryV2Cli;
 }
 
-function deliveryV2SourceRevision(packageDigest) {
-  return {
-    repo: `sha256:${packageDigest}`,
-    repositoryId: `sha256:${packageDigest}`,
-    repoAliases: [`sha256:${packageDigest}`],
-    baseCommit: packageDigest,
-    treeHash: packageDigest,
-    branch: 'delivery-v2',
-    mainBranch: null,
-    remoteName: null,
-    remoteUrlHash: null,
-  };
-}
-
 function installDeliveryV2Context(target, run, targets = {}) {
   const control = run?.control || {};
   const publishLeaseId = String(control.publishLeaseId || '').trim();
@@ -1509,7 +1498,7 @@ function installDeliveryV2Context(target, run, targets = {}) {
       'DELIVERY_CONTROL_INVALID: ReleaseRun 缺少 publishLease/baseline/change/session/package 控制信息'
     );
   }
-  const sourceRevision = deliveryV2SourceRevision(packageDigest);
+  const sourceRevision = deliveryV2SourceRevision(target, packageDigest);
   saveChangeBaseline(target, {
     baselineId,
     appType: target.appType,

package/lib/delivery-v2-cli.js

@@ -166,6 +166,35 @@ function createClientSessionId() {
     .toString('hex')}`;
 }
 
+function deliveryV2SourceRevision(target, packageDigest) {
+  const packageRepositoryId = `sha256:${packageDigest}`;
+  const logicalRepositoryId = String(
+    target?.logicalApp?.sourceRepositoryId ||
+      target?.state?.logicalApp?.sourceRepositoryId ||
+      ''
+  )
+    .trim()
+    .toLowerCase();
+  const repoAliases = Array.from(
+    new Set(
+      [packageRepositoryId, logicalRepositoryId].filter(value =>
+        /^sha256:[a-f0-9]{64}$/.test(value)
+      )
+    )
+  ).sort();
+  return {
+    repo: packageRepositoryId,
+    repositoryId: packageRepositoryId,
+    repoAliases,
+    baseCommit: packageDigest,
+    treeHash: packageDigest,
+    branch: 'delivery-v2',
+    mainBranch: null,
+    remoteName: null,
+    remoteUrlHash: null,
+  };
+}
+
 function usageError(message) {
   const error = new Error(message);
   error.code = 'DELIVERY_USAGE_ERROR';
@@ -213,4 +242,5 @@ function assertDependencies(value) {
 
 module.exports = {
   createDeliveryV2Cli,
+  deliveryV2SourceRevision,
 };

package/lib/delivery-v2-executor.js

@@ -232,6 +232,11 @@ function createDeliveryV2Executor(dependencies) {
         activeRun,
         input.targets
       );
+      restoreDeliveryCheckpointFiles(
+        input.executionRoot,
+        activeRun,
+        executionTarget
+      );
       activeRun = await checkpoint(
         input.config,
         executionTarget,
@@ -297,7 +302,11 @@ function createDeliveryV2Executor(dependencies) {
               completed: index + 1,
               total: steps.length,
             },
-            result: compactStepResult(step.id, result),
+            result: compactStepResult(step.id, result, {
+              executionRoot: input.executionRoot,
+              run: activeRun,
+              target: executionTarget,
+            }),
           }
         );
       }
@@ -800,7 +809,7 @@ function packageSummary(manifest, previousManifest) {
   };
 }
 
-function compactStepResult(stepId, result) {
+function compactStepResult(stepId, result, context = {}) {
   if (!result || typeof result !== 'object') return { ok: true };
   if (stepId === 'app-finalize') {
     return {
@@ -811,10 +820,212 @@ function compactStepResult(stepId, result) {
         null,
     };
   }
-  return {
+  const compact = {
     ok: true,
     id: result.id || result.release?.id || null,
   };
+  const stagedResources = normalizeCheckpointStagedResources(
+    Array.isArray(result.stagedResources)
+      ? result.stagedResources
+      : result.stagedResource
+        ? [result.stagedResource]
+        : []
+  );
+  if (stagedResources.length > 0) {
+    compact.stagedResources = stagedResources;
+  }
+  const satisfiedSelectors = uniqueStrings(result.satisfiedSelectors);
+  if (satisfiedSelectors.length > 0) {
+    compact.satisfiedSelectors = satisfiedSelectors;
+  }
+  if (stepId === 'backend-stage') {
+    const bindingContracts = readDeliverySupportFile(
+      context.executionRoot,
+      context.run,
+      context.target,
+      'backend-binding-contracts.json'
+    );
+    if (bindingContracts) {
+      compact.backendBindingContracts = bindingContracts;
+    }
+  }
+  return compact;
+}
+
+function restoreDeliveryCheckpointFiles(executionRoot, run, target) {
+  const changeId = String(run?.control?.changeId || '').trim();
+  if (!changeId) return { stagedResourceCount: 0, restored: false };
+  const checkpointResults = Object.values(run?.result || {});
+  const staged = new Map();
+  const satisfiedSelectors = [];
+  let backendBindingContracts = null;
+  for (const result of checkpointResults) {
+    for (const resource of normalizeCheckpointStagedResources(
+      result?.stagedResources || []
+    )) {
+      staged.set(checkpointStagedResourceKey(resource), resource);
+    }
+    satisfiedSelectors.push(...uniqueStrings(result?.satisfiedSelectors));
+    if (result?.backendBindingContracts) {
+      backendBindingContracts = cloneJson(result.backendBindingContracts);
+    }
+  }
+  if (staged.size === 0 && !backendBindingContracts) {
+    return { stagedResourceCount: 0, restored: false };
+  }
+  const releaseDir = deliveryReleaseDirectory(
+    executionRoot,
+    changeId,
+    target?.deploymentId
+  );
+  fs.mkdirSync(releaseDir, { recursive: true });
+  const resources = Array.from(staged.values()).sort((left, right) =>
+    checkpointStagedResourceKey(left).localeCompare(
+      checkpointStagedResourceKey(right)
+    )
+  );
+  if (resources.length > 0) {
+    writeJsonAtomic(
+      path.join(releaseDir, 'staged-resources.json'),
+      resources
+    );
+    writeJsonAtomic(
+      path.join(releaseDir, 'staged-resources.context.json'),
+      {
+        contractVersion: 'staged_resources_context_v1',
+        appType: target.appType,
+        profile: target.profileName,
+        changeId,
+        deploymentId: target.deploymentId || null,
+        baselineId: run.control?.baselineId || null,
+        clientSessionId: run.control?.clientSessionId || null,
+        initializedAt: new Date().toISOString(),
+        restoredFromDeliveryRunId: run.id,
+        ...(uniqueStrings(satisfiedSelectors).length > 0
+          ? { satisfiedSelectors: uniqueStrings(satisfiedSelectors) }
+          : {}),
+      }
+    );
+  }
+  if (backendBindingContracts) {
+    writeJsonAtomic(
+      path.join(releaseDir, 'backend-binding-contracts.json'),
+      backendBindingContracts
+    );
+  }
+  return {
+    stagedResourceCount: resources.length,
+    restored: true,
+    backendBindingContracts: Boolean(backendBindingContracts),
+  };
+}
+
+function readDeliverySupportFile(
+  executionRoot,
+  run,
+  target,
+  fileName
+) {
+  const changeId = String(run?.control?.changeId || '').trim();
+  if (!changeId || !executionRoot) return null;
+  const file = path.join(
+    deliveryReleaseDirectory(
+      executionRoot,
+      changeId,
+      target?.deploymentId
+    ),
+    fileName
+  );
+  if (!fs.existsSync(file)) return null;
+  try {
+    return cloneJson(JSON.parse(fs.readFileSync(file, 'utf8')));
+  } catch {
+    throw deliveryError(
+      'DELIVERY_CHECKPOINT_FILE_INVALID',
+      `${fileName} 不是合法 JSON，不能创建可恢复检查点`,
+      false
+    );
+  }
+}
+
+function deliveryReleaseDirectory(executionRoot, changeId, deploymentId) {
+  const normalizedChangeId = String(changeId || '').trim();
+  if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(normalizedChangeId)) {
+    throw deliveryError(
+      'DELIVERY_CONTROL_INVALID',
+      'ReleaseRun changeId 不能用于恢复暂存资源',
+      false
+    );
+  }
+  const base = path.join(
+    path.resolve(executionRoot),
+    '.openxiangda',
+    'releases',
+    normalizedChangeId
+  );
+  return deploymentId ? path.join(base, String(deploymentId)) : base;
+}
+
+function normalizeCheckpointStagedResources(values) {
+  if (!Array.isArray(values)) return [];
+  const supportedKinds = new Set([
+    'RuntimeRelease',
+    'PageRelease',
+    'BackendRelease',
+    'WorkflowRelease',
+    'FormRelease',
+  ]);
+  return values
+    .filter(value => value && typeof value === 'object' && !Array.isArray(value))
+    .filter(value => supportedKinds.has(String(value.kind || '').trim()))
+    .filter(value => {
+      const releaseId = String(
+        value.identity?.releaseId || value.releaseId || ''
+      ).trim();
+      const hash = String(value.hash || value.resourceHash || '')
+        .trim()
+        .toLowerCase();
+      const formUuid = String(
+        value.identity?.formUuid || value.formUuid || ''
+      ).trim();
+      return (
+        Boolean(releaseId) &&
+        /^[a-f0-9]{64}$/.test(hash) &&
+        (value.kind !== 'FormRelease' || Boolean(formUuid))
+      );
+    })
+    .map(cloneJson);
+}
+
+function checkpointStagedResourceKey(resource) {
+  if (resource.kind === 'FormRelease') {
+    return `FormRelease:${
+      resource.identity?.formUuid || resource.formUuid
+    }`;
+  }
+  return String(resource.kind);
+}
+
+function uniqueStrings(values) {
+  return Array.from(
+    new Set(
+      (Array.isArray(values) ? values : [])
+        .map(value => String(value || '').trim())
+        .filter(Boolean)
+    )
+  ).sort();
+}
+
+function writeJsonAtomic(file, value) {
+  const temporary = `${file}.${process.pid}.tmp`;
+  fs.writeFileSync(temporary, `${JSON.stringify(value, null, 2)}\n`, {
+    mode: 0o600,
+  });
+  fs.renameSync(temporary, file);
+}
+
+function cloneJson(value) {
+  return JSON.parse(JSON.stringify(value));
 }
 
 function structuredFailure(error, runId, stage, component) {
@@ -949,7 +1160,9 @@ function assertDependencies(value) {
 
 module.exports = {
   CONFIG_TARGET_BY_RESOURCE_TYPE,
+  compactStepResult,
   createDeliveryV2Executor,
   releaseTargets,
+  restoreDeliveryCheckpointFiles,
   structuredFailure,
 };

package/lib/release-plan.js

@@ -251,11 +251,14 @@ function buildTargetedResourceReleaseSteps(
 function buildDirectConfigurationReleaseSteps(
   targets,
   profileArg,
-  changeId
+  changeId,
+  options = {}
 ) {
+  const excludedTypes = new Set(options.excludeTypes || []);
   return Object.entries(targets.resourceSelectors || {})
     .filter(
       ([type, selectors]) =>
+        !excludedTypes.has(type) &&
         directResourceTypeForKey(type) &&
         uniqueSorted(selectors || []).length > 0
     )
@@ -318,11 +321,24 @@ function buildWorkspaceReleaseSteps(
     Object.values(targets.resourceSelectors || {}).some(
       selectors => (selectors || []).length > 0
     );
+  const formPermissionGroups = uniqueSorted(
+    targets.resourceSelectors?.formPermissionGroups || []
+  );
+  const stagesFormRelease =
+    runtimeMode === 'react-spa' &&
+    (targets.forms.length > 0 || formPermissionGroups.length > 0);
   const directConfigurationSteps =
     buildDirectConfigurationReleaseSteps(
       targets,
       profileArg,
-      changeId
+      changeId,
+      {
+        // A FormRelease is a single immutable snapshot. Publishing form
+        // settings and permission groups as sibling steps from the same live
+        // parent lets the second descriptor replace the first and discard its
+        // schema. Stage both resource types in one bundle instead.
+        excludeTypes: stagesFormRelease ? ['formPermissionGroups'] : [],
+      }
     );
   if (runtimeMode === 'react-spa') {
     if (targets.forms.length > 0) {
@@ -336,6 +352,23 @@ function buildWorkspaceReleaseSteps(
           )
         )
       );
+    }
+    if (stagesFormRelease) {
+      const resourceTypes = [
+        ...(targets.forms.length > 0 ? ['form-setting'] : []),
+        ...(formPermissionGroups.length > 0
+          ? ['form-permission-group']
+          : []),
+      ];
+      const qualify = resourceTypes.length > 1;
+      const selectors = [
+        ...targets.forms.map(code =>
+          qualify ? `form-setting:${code}` : code
+        ),
+        ...formPermissionGroups.map(code =>
+          qualify ? `form-permission-group:${code}` : code
+        ),
+      ];
       steps.push(
         createStep(
           'form-stage',
@@ -343,9 +376,9 @@ function buildWorkspaceReleaseSteps(
             [
               'resource',
               'publish',
-              'form-setting',
+              resourceTypes.join(','),
               '--only',
-              targets.forms.join(','),
+              selectors.join(','),
             ],
             profileArg,
             changeId
@@ -378,7 +411,7 @@ function buildWorkspaceReleaseSteps(
       );
     }
     if (
-      targets.forms.length > 0 ||
+      stagesFormRelease ||
       targets.functions.length > 0 ||
       targets.automations.length > 0 ||
       targets.workflows.length > 0 ||
@@ -386,7 +419,7 @@ function buildWorkspaceReleaseSteps(
       directConfigurationSteps.length > 0
     ) {
       const hasStagedChildren =
-        targets.forms.length > 0 ||
+        stagesFormRelease ||
         targets.functions.length > 0 ||
         targets.automations.length > 0 ||
         targets.workflows.length > 0 ||

package/package.json

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