openxiangda 1.0.184 → 1.0.186

package/lib/application-environments.js

@@ -115,6 +115,33 @@ function normalizeManagedReleaseSourceRevision(
   };
 }
 
+function normalizeManagedChangeSourceBase(
+  target,
+  sourceBase,
+  releaseSourceRevision
+) {
+  const logicalApp = target?.logicalApp || target?.state?.logicalApp;
+  if (!logicalApp?.sourceRepositoryId) {
+    return cloneJsonValue(sourceBase);
+  }
+  return normalizeManagedReleaseSourceRevision(
+    target,
+    {
+      ...(sourceBase || {}),
+      repositoryId: sourceBase?.repo,
+      repoAliases: [
+        sourceBase?.repo,
+        releaseSourceRevision?.repo,
+        releaseSourceRevision?.repositoryId,
+        ...(Array.isArray(releaseSourceRevision?.repoAliases)
+          ? releaseSourceRevision.repoAliases
+          : []),
+      ],
+    },
+    { errorCode: 'RELEASE_SOURCE_BASE_REPOSITORY_MISMATCH' }
+  );
+}
+
 function hasStateResourceMappings(value) {
   if (Array.isArray(value)) return value.length > 0;
   if (!value || typeof value !== 'object') {
@@ -349,11 +376,19 @@ function withManagedReleaseForwardedFlags(stepId, args = [], flags = {}) {
   return forwarded;
 }
 
+function withReleaseClientSessionArgs(args = [], flags = {}) {
+  const clientSessionId = String(flags['client-session-id'] || '').trim();
+  return clientSessionId
+    ? [...args, '--client-session-id', clientSessionId]
+    : [...args];
+}
+
 module.exports = {
   bindEnvironmentTarget,
   buildCandidateBundle,
   canonicalJson,
   normalizeEnvironmentKind,
+  normalizeManagedChangeSourceBase,
   normalizeManagedReleaseSourceRevision,
   normalizeTargetName,
   hasStateResourceMappings,
@@ -365,5 +400,6 @@ module.exports = {
   saveCandidate,
   sha256Canonical,
   withManagedReleaseForwardedFlags,
+  withReleaseClientSessionArgs,
   writePrivateJsonAtomic,
 };

package/lib/cli.js

@@ -131,6 +131,7 @@ const {
   bindEnvironmentTarget,
   buildCandidateBundle,
   normalizeEnvironmentKind,
+  normalizeManagedChangeSourceBase,
   normalizeManagedReleaseSourceRevision,
   readCandidate,
   readJsonInput,
@@ -140,6 +141,7 @@ const {
   saveCandidate,
   sha256Canonical,
   withManagedReleaseForwardedFlags,
+  withReleaseClientSessionArgs,
 } = require('./application-environments');
 const { startDeveloperCenter } = require('./developer-center');
 const {
@@ -1471,6 +1473,7 @@ function changeIdFromStep(step) {
 async function publishWorkspaceRelease(config, target, flags = {}) {
   const changeId = readStringFlag(flags, 'change');
   const deploymentId = readStringFlag(flags, 'deployment-id') || null;
+  const clientSessionId = readStringFlag(flags, 'client-session-id');
   if (!changeId) {
     fail('用法: openxiangda release publish --change <id> --profile <name>');
   }
@@ -1613,6 +1616,10 @@ async function publishWorkspaceRelease(config, target, flags = {}) {
         id: 'lease-and-capture',
         command: `openxiangda release begin --change ${changeId} --profile ${target.profileName}${
           target.targetName ? ` --environment ${target.targetName}` : ''
+        }${
+          clientSessionId
+            ? ` --client-session-id ${clientSessionId}`
+            : ''
         } --freeze-app-capture`,
         status: 'pending',
       },
@@ -1658,21 +1665,24 @@ async function publishWorkspaceRelease(config, target, flags = {}) {
   const runnable = [
     {
       id: 'lease-and-capture',
-      args: [
-        'release',
-        'begin',
-        '--change',
-        changeId,
-        '--profile',
-        target.profileName,
-        ...(target.targetName
-          ? ['--environment', target.targetName]
-          : []),
-        ...(deploymentId
-          ? ['--deployment-id', deploymentId]
-          : []),
-        '--freeze-app-capture',
-      ],
+      args: withReleaseClientSessionArgs(
+        [
+          'release',
+          'begin',
+          '--change',
+          changeId,
+          '--profile',
+          target.profileName,
+          ...(target.targetName
+            ? ['--environment', target.targetName]
+            : []),
+          ...(deploymentId
+            ? ['--deployment-id', deploymentId]
+            : []),
+          '--freeze-app-capture',
+        ],
+        flags
+      ),
     },
     ...steps,
     {
@@ -4921,7 +4931,6 @@ async function ensureChangeBaseline(
     return stored;
   }
   const activeLease = getUsableStoredPublishLease(target);
-  const sourceBase = resolveChangeSourceBase(changeId, flags);
   const releaseSourceRevision = normalizeManagedReleaseSourceRevision(
     target,
     prepareReleaseSourceRevision({
@@ -4929,6 +4938,11 @@ async function ensureChangeBaseline(
     }),
     { errorCode: 'RELEASE_SOURCE_REPOSITORY_MISMATCH' }
   );
+  const sourceBase = normalizeManagedChangeSourceBase(
+    target,
+    resolveChangeSourceBase(changeId, flags),
+    releaseSourceRevision
+  );
 
   const data = await requestWithAuth(
     config,

package/package.json

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