openxiangda 1.0.185 → 1.0.187

package/lib/application-environments.js

@@ -376,6 +376,13 @@ 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,
@@ -393,5 +400,6 @@ module.exports = {
   saveCandidate,
   sha256Canonical,
   withManagedReleaseForwardedFlags,
+  withReleaseClientSessionArgs,
   writePrivateJsonAtomic,
 };

package/lib/change-baseline.js

@@ -806,7 +806,8 @@ function assertTargetIdentity(target) {
     );
   }
   const boundAppType = normalizeOptionalString(target.bound.appType);
-  const stateBound = target.state.profiles?.[profile];
+  const managedStateBound = resolveManagedStateBinding(target, appType);
+  const stateBound = managedStateBound || target.state.profiles?.[profile];
   const stateAppType = normalizeOptionalString(stateBound?.appType);
   if (
     (boundAppType && boundAppType !== appType) ||
@@ -820,6 +821,26 @@ function assertTargetIdentity(target) {
   return { appType, profile };
 }
 
+function resolveManagedStateBinding(target, appType) {
+  const targetName = normalizeOptionalString(target?.targetName);
+  if (!targetName) return null;
+  const binding = target.state?.targets?.[targetName];
+  const bindingAppType = normalizeOptionalString(binding?.appType);
+  const environmentId = normalizeOptionalString(target.environmentId);
+  const bindingEnvironmentId = normalizeOptionalString(binding?.environmentId);
+  if (
+    !binding ||
+    bindingAppType !== appType ||
+    (environmentId && bindingEnvironmentId !== environmentId)
+  ) {
+    throw changeBaselineError(
+      'CHANGE_BASELINE_TARGET_INVALID',
+      `change baseline managed target ${targetName} 与 state.targets binding 不一致`
+    );
+  }
+  return binding;
+}
+
 function assertInputIdentity(input, identity) {
   const appType = normalizeOptionalString(input.appType);
   const profile = normalizeOptionalString(input.profile);
@@ -839,7 +860,11 @@ function assertInputIdentity(input, identity) {
 
 function persistTargetState(target, options) {
   target.bound.updatedAt = normalizeNow(options.now);
-  if (target.state.profiles?.[target.profileName]) {
+  const targetName = normalizeOptionalString(target.targetName);
+  if (targetName) {
+    target.state.targets ||= {};
+    target.state.targets[targetName] = target.bound;
+  } else if (target.state.profiles?.[target.profileName]) {
     target.state.profiles[target.profileName] = target.bound;
   }
   (options.saveState || saveProjectState)(

package/lib/cli.js

@@ -141,6 +141,7 @@ const {
   saveCandidate,
   sha256Canonical,
   withManagedReleaseForwardedFlags,
+  withReleaseClientSessionArgs,
 } = require('./application-environments');
 const { startDeveloperCenter } = require('./developer-center');
 const {
@@ -1472,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>');
   }
@@ -1614,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',
       },
@@ -1659,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,
     {

package/lib/publish-lease.js

@@ -63,9 +63,7 @@ function savePublishLease(target, input, options = {}) {
     publishLease: lease,
   };
   target.bound.updatedAt = new Date().toISOString();
-  if (target.state.profiles?.[target.profileName]) {
-    target.state.profiles[target.profileName] = target.bound;
-  }
+  persistTargetBinding(target);
   (options.saveState || saveProjectState)(target.state, options.cwd || process.cwd());
   return lease;
 }
@@ -80,13 +78,21 @@ function clearPublishLease(target, leaseId, options = {}) {
     delete target.bound.promotion;
   }
   target.bound.updatedAt = new Date().toISOString();
-  if (target.state.profiles?.[target.profileName]) {
-    target.state.profiles[target.profileName] = target.bound;
-  }
+  persistTargetBinding(target);
   (options.saveState || saveProjectState)(target.state, options.cwd || process.cwd());
   return true;
 }
 
+function persistTargetBinding(target) {
+  const targetName = String(target?.targetName || '').trim();
+  if (targetName) {
+    target.state.targets ||= {};
+    target.state.targets[targetName] = target.bound;
+  } else if (target.state.profiles?.[target.profileName]) {
+    target.state.profiles[target.profileName] = target.bound;
+  }
+}
+
 function normalizePublishLease(input, target) {
   const leaseId = String(input?.leaseId || '').trim();
   const expiresAt = normalizeDate(input?.expiresAt, 'expiresAt');

package/package.json

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