openxiangda 1.0.181 → 1.0.183

package/lib/application-environments.js

@@ -45,6 +45,76 @@ function cloneJsonValue(value) {
     : JSON.parse(JSON.stringify(value));
 }
 
+function normalizeIdentityList(values) {
+  return Array.from(
+    new Set(
+      values
+        .map(value => String(value || '').trim().toLowerCase())
+        .filter(value => /^sha256:[0-9a-f]{64}$/.test(value))
+    )
+  ).sort();
+}
+
+function normalizeManagedReleaseSourceRevision(
+  target,
+  sourceRevision,
+  options = {}
+) {
+  const logicalApp = target?.logicalApp || target?.state?.logicalApp;
+  const expectedRepositoryId = String(
+    logicalApp?.sourceRepositoryId || ''
+  )
+    .trim()
+    .toLowerCase();
+  if (!expectedRepositoryId) return cloneJsonValue(sourceRevision);
+  const revision =
+    sourceRevision &&
+    typeof sourceRevision === 'object' &&
+    !Array.isArray(sourceRevision)
+      ? cloneJsonValue(sourceRevision)
+      : {};
+  const repositoryAliases = normalizeIdentityList([
+    revision.repo,
+    revision.repositoryId,
+    ...(Array.isArray(revision.repoAliases) ? revision.repoAliases : []),
+  ]);
+  if (!repositoryAliases.includes(expectedRepositoryId)) {
+    const code =
+      String(options.errorCode || '').trim() ||
+      'MANAGED_SOURCE_REPOSITORY_MISMATCH';
+    const error = new Error(
+      `${code}: 当前 Git 仓库与 logical app 权威仓库不一致`
+    );
+    error.code = code;
+    error.details = {
+      expectedRepositoryId,
+      repositoryAliases,
+    };
+    throw error;
+  }
+  const {
+    capturedAt: _capturedAt,
+    worktreeRoot: _worktreeRoot,
+    ...stableRevision
+  } = revision;
+  return {
+    ...stableRevision,
+    repo: expectedRepositoryId,
+    repositoryId: expectedRepositoryId,
+    repoAliases: normalizeIdentityList([
+      expectedRepositoryId,
+      ...repositoryAliases,
+    ]),
+    ...(Array.isArray(revision.remoteUrlHashAliases)
+      ? {
+          remoteUrlHashAliases: normalizeIdentityList(
+            revision.remoteUrlHashAliases
+          ),
+        }
+      : {}),
+  };
+}
+
 function hasStateResourceMappings(value) {
   if (Array.isArray(value)) return value.length > 0;
   if (!value || typeof value !== 'object') {
@@ -264,11 +334,27 @@ function releaseExecutionPath(changeId, deploymentId, cwd = process.cwd()) {
     : path.join(base, 'execution.json');
 }
 
+function withManagedReleaseForwardedFlags(stepId, args = [], flags = {}) {
+  const forwarded = [...args];
+  if (stepId !== 'backend-stage' || !flags['adopt-online-baseline']) {
+    return forwarded;
+  }
+  forwarded.push('--adopt-online-baseline');
+  const reason = String(
+    flags['adoption-reason'] || flags.reason || ''
+  ).trim();
+  if (reason) {
+    forwarded.push('--adoption-reason', reason);
+  }
+  return forwarded;
+}
+
 module.exports = {
   bindEnvironmentTarget,
   buildCandidateBundle,
   canonicalJson,
   normalizeEnvironmentKind,
+  normalizeManagedReleaseSourceRevision,
   normalizeTargetName,
   hasStateResourceMappings,
   readCandidate,
@@ -278,5 +364,6 @@ module.exports = {
   resolveEnvironmentTarget,
   saveCandidate,
   sha256Canonical,
+  withManagedReleaseForwardedFlags,
   writePrivateJsonAtomic,
 };

package/lib/cli.js

@@ -131,6 +131,7 @@ const {
   bindEnvironmentTarget,
   buildCandidateBundle,
   normalizeEnvironmentKind,
+  normalizeManagedReleaseSourceRevision,
   readCandidate,
   readJsonInput,
   releaseExecutionPath,
@@ -138,6 +139,7 @@ const {
   resolveEnvironmentTarget,
   saveCandidate,
   sha256Canonical,
+  withManagedReleaseForwardedFlags,
 } = require('./application-environments');
 const { startDeveloperCenter } = require('./developer-center');
 const {
@@ -1432,6 +1434,11 @@ function decorateEnvironmentReleaseSteps(steps, target, flags = {}) {
   if (!target.environmentId || !target.targetName) return steps;
   const deploymentId = readStringFlag(flags, 'deployment-id');
   for (const step of steps) {
+    step.args = withManagedReleaseForwardedFlags(
+      step.id,
+      step.args,
+      flags
+    );
     step.args.push('--environment', target.targetName);
     if (deploymentId) step.args.push('--deployment-id', deploymentId);
     if (step.id === 'app-finalize') {
@@ -1557,9 +1564,12 @@ async function publishWorkspaceRelease(config, target, flags = {}) {
       execution: null,
     };
   }
-  const plannedSourceRevision = prepareReleaseSourceRevision({
-    cwd: process.cwd(),
-  });
+  const plannedSourceRevision = normalizeManagedReleaseSourceRevision(
+    target,
+    prepareReleaseSourceRevision({
+      cwd: process.cwd(),
+    })
+  );
   const existing = readReleaseExecution(changeId, deploymentId);
   if (
     existing &&
@@ -2313,16 +2323,11 @@ async function createApplicationCandidate(config, target, flags, positional) {
   if (!changeId) {
     fail('用法: openxiangda release candidate --change <id>');
   }
-  prepareReleaseSourceRevision({ cwd: process.cwd() });
-  const sourceRevision = readGitSourceBase(process.cwd(), 'HEAD');
-  if (
-    logicalApp.sourceRepositoryId !==
-    (sourceRevision.repositoryId || sourceRevision.repo)
-  ) {
-    fail(
-      'CANDIDATE_REPOSITORY_MISMATCH: 当前 Git 仓库与 logical app 权威仓库不一致'
-    );
-  }
+  const sourceRevision = normalizeManagedReleaseSourceRevision(
+    target,
+    prepareReleaseSourceRevision({ cwd: process.cwd() }),
+    { errorCode: 'CANDIDATE_REPOSITORY_MISMATCH' }
+  );
   const plan = buildWorkspaceReleasePlan({
     changed: true,
     since: flags.since,
@@ -4917,9 +4922,13 @@ async function ensureChangeBaseline(
   }
   const activeLease = getUsableStoredPublishLease(target);
   const sourceBase = resolveChangeSourceBase(changeId, flags);
-  const releaseSourceRevision = prepareReleaseSourceRevision({
-    cwd: process.cwd(),
-  });
+  const releaseSourceRevision = normalizeManagedReleaseSourceRevision(
+    target,
+    prepareReleaseSourceRevision({
+      cwd: process.cwd(),
+    }),
+    { errorCode: 'RELEASE_SOURCE_REPOSITORY_MISMATCH' }
+  );
 
   const data = await requestWithAuth(
     config,
@@ -16614,7 +16623,11 @@ async function ensureOwnedImmutableReleasePublishContext(
       `${releaseKind} 只接受与本地冻结基线匹配的 stored lease；外部 opaque lease 不能用于原子发布`
     );
   }
-  const sourceRevision = clonePlainJson(baseline.sourceBase || {});
+  const sourceRevision = normalizeManagedReleaseSourceRevision(
+    target,
+    baseline.releaseSourceRevision || {},
+    { errorCode: 'RELEASE_SOURCE_REPOSITORY_MISMATCH' }
+  );
   const sourceRepositoryId = String(
     sourceRevision.repositoryId || sourceRevision.repo || ''
   ).trim();

package/package.json

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