openxiangda 1.0.191 → 1.0.192

package/lib/application-environments.js

@@ -401,10 +401,34 @@ function withReleaseClientSessionArgs(args = [], flags = {}) {
     : [...args];
 }
 
+function isRecoverablePostActivationDeploymentError(error, deployment) {
+  if (
+    deployment?.status !== 'deployed' ||
+    !String(deployment?.targetAppReleaseId || '').trim()
+  ) {
+    return false;
+  }
+  const detail = [
+    error?.code,
+    error?.message,
+    error?.publishLeaseCleanupError?.code,
+    error?.publishLeaseCleanupError?.message,
+  ]
+    .filter(Boolean)
+    .join(' ');
+  return (
+    /(publish[\s_-]*lease|publishLease|发布租约)/i.test(detail) &&
+    /(concurr|conflict|cleanup|release[\s_-]*end|并发冲突|清理|释放)/i.test(
+      detail
+    )
+  );
+}
+
 module.exports = {
   bindEnvironmentTarget,
   buildCandidateBundle,
   canonicalJson,
+  isRecoverablePostActivationDeploymentError,
   normalizeEnvironmentKind,
   normalizeManagedChangeSourceBase,
   normalizeManagedReleaseSourceRevision,

package/lib/cli.js

@@ -130,6 +130,7 @@ const { buildDesignReview, renderDesignReview } = require('./design-review');
 const {
   bindEnvironmentTarget,
   buildCandidateBundle,
+  isRecoverablePostActivationDeploymentError,
   normalizeEnvironmentKind,
   normalizeManagedChangeSourceBase,
   normalizeManagedReleaseSourceRevision,
@@ -1300,9 +1301,9 @@ async function waitForPublishLeaseAvailability(config, target, flags = {}) {
   }
 }
 
-function readReleaseRecoveryContext(target, changeId) {
+function readReleaseRecoveryContext(target, changeId, deploymentId) {
   if (!changeId) return null;
-  const execution = readReleaseExecution(changeId);
+  const execution = readReleaseExecution(changeId, deploymentId);
   const context = execution?.releaseContext;
   if (!context || typeof context !== 'object' || Array.isArray(context)) {
     return null;
@@ -2642,6 +2643,33 @@ async function deployApplicationCandidate(
     rememberTargetDeployment(target, detail);
     return { deployment: detail, published };
   } catch (error) {
+    let activatedDeployment = null;
+    try {
+      activatedDeployment = await requestWithAuth(
+        config,
+        target.profileName,
+        applicationDeploymentApiPath(logicalApp.code, deployment.id)
+      );
+    } catch {
+      // Preserve the primary deployment error when the read-only check fails.
+    }
+    if (
+      isRecoverablePostActivationDeploymentError(error, activatedDeployment)
+    ) {
+      rememberTargetDeployment(target, activatedDeployment);
+      warn(
+        `AppRelease 已激活，发布租约清理发生并发冲突；部署 ${deployment.id} 保持 deployed，请执行 release status/end 完成只读回合清理。`
+      );
+      return {
+        deployment: activatedDeployment,
+        published: null,
+        recoveredAfterActivation: true,
+        postActivationError: {
+          code: error?.code || 'PUBLISH_LEASE_CLEANUP_CONFLICT',
+          message: maskText(error?.message || String(error)),
+        },
+      };
+    }
     await markApplicationDeploymentFailed(
       config,
       target,
@@ -2698,6 +2726,35 @@ async function runApplicationEnvironmentReleaseCommand(
     );
   }
 
+  if (subcommand === 'reconcile') {
+    const deploymentId =
+      readStringFlag(flags, 'deployment') ||
+      readStringFlag(flags, 'deployment-id') ||
+      positional[0] ||
+      target.bound.lastDeploymentId;
+    const reason = readStringFlag(flags, 'reason');
+    if (!deploymentId || reason.length < 8) {
+      fail(
+        'release reconcile 必须提供 --deployment <id> 和至少 8 个字符的 --reason'
+      );
+    }
+    const reconciled = await requestWithAuth(
+      config,
+      target.profileName,
+      applicationDeploymentApiPath(
+        logicalApp.code,
+        deploymentId,
+        'reconcile'
+      ),
+      {
+        method: 'POST',
+        body: { reason },
+      }
+    );
+    rememberTargetDeployment(target, reconciled);
+    return { deployment: reconciled, reconciled: true };
+  }
+
   const candidateId =
     readStringFlag(flags, 'candidate') ||
     readStringFlag(flags, 'candidate-id') ||
@@ -2831,7 +2888,7 @@ async function release(args) {
   if (wantsSubcommandHelp(subcommand, flags)) {
     print([
       '用法: openxiangda release publish|begin|status|explain|integration-status|renew|end [--change id] [--profile name] [--json]',
-      '      openxiangda release candidate|deploy|test|promote|rollback [--candidate id] [--environment target] [--confirm-production] [--json]',
+      '      openxiangda release candidate|deploy|reconcile|test|promote|rollback [--candidate id] [--environment target] [--confirm-production] [--json]',
       '      openxiangda release backend-head|backend-list|backend-detail|backend-diff|backend-rollback|backend-abort|backend-retry [releaseId] [--profile name] [--json]',
       '      openxiangda release app-capture|app-head|app-list|app-detail|app-diff|app-post-commit|app-retry|app-prepare|app-verify|app-activate|app-finalize|app-rollback|app-abort [releaseId] [--staged-resources-json <JSON|file>] [--activate-staged-children] [--profile name] [--json]',
       '常用流程:',
@@ -2869,7 +2926,7 @@ async function release(args) {
     flags
   );
   if (
-    ['candidate', 'deploy', 'test', 'promote', 'rollback'].includes(
+    ['candidate', 'deploy', 'reconcile', 'test', 'promote', 'rollback'].includes(
       subcommand
     )
   ) {
@@ -3002,7 +3059,11 @@ async function release(args) {
       access: 'reconciliation-read',
     });
     const changeId = positional[0] || readStringFlag(flags, 'change');
-    const recovered = readReleaseRecoveryContext(target, changeId);
+    const recovered = readReleaseRecoveryContext(
+      target,
+      changeId,
+      readStringFlag(flags, 'deployment-id')
+    );
     const sourceRevision =
       baseline?.releaseSourceRevision ||
       recovered?.context?.releaseSourceRevision;

package/package.json

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