openxiangda 1.0.241 → 1.0.242

package/lib/cli.js

@@ -3698,6 +3698,29 @@ function deploymentQueueDetails(error) {
   return value;
 }
 
+function deploymentQueueWaitDecision(statusInput) {
+  const status = String(statusInput || '').trim().toLowerCase();
+  return {
+    status,
+    wait: status === 'running',
+    evidencePending: status === 'deployed',
+  };
+}
+
+function deploymentEvidencePendingError(deployment = {}) {
+  const deploymentId = String(deployment.deploymentId || deployment.id || '').trim();
+  const error = new Error(
+    `APP_DEPLOYMENT_EVIDENCE_PENDING: 目标环境部署 ${deploymentId || '-'} 已完成激活，当前为 deployed，待提交测试证据；请先执行 openxiangda release test --deployment ${deploymentId || '<id>'} --evidence-json <JSON|file>`
+  );
+  error.code = 'APP_DEPLOYMENT_EVIDENCE_PENDING';
+  error.data = {
+    deploymentId: deploymentId || null,
+    status: 'deployed',
+    nextAction: 'release test',
+  };
+  return error;
+}
+
 async function createApplicationDeploymentWhenAvailable(
   config,
   target,
@@ -3718,9 +3741,17 @@ async function createApplicationDeploymentWhenAvailable(
       );
     } catch (error) {
       const queue = deploymentQueueDetails(error);
-      if (!queue || Date.now() >= deadline || waitSeconds === 0) throw error;
+      if (!queue) throw error;
       const deploymentId = String(queue.deploymentId || '').trim();
       if (!deploymentId) throw error;
+      const queuedState = deploymentQueueWaitDecision(queue.status);
+      if (queuedState.evidencePending) {
+        throw deploymentEvidencePendingError({
+          ...queue,
+          deploymentId,
+        });
+      }
+      if (Date.now() >= deadline || waitSeconds === 0) throw error;
       const delaySeconds = Math.min(
         Math.max(Number(queue.retryAfterSeconds || 5), 1),
         30
@@ -3742,7 +3773,14 @@ async function createApplicationDeploymentWhenAvailable(
         } catch {
           break;
         }
-        if (!['running', 'deployed'].includes(active?.status)) break;
+        const activeState = deploymentQueueWaitDecision(active?.status);
+        if (activeState.evidencePending) {
+          throw deploymentEvidencePendingError({
+            ...active,
+            deploymentId,
+          });
+        }
+        if (!activeState.wait) break;
       }
       if (Date.now() >= deadline) {
         fail(
@@ -4004,11 +4042,40 @@ async function completeManagedDeployment(
       evidence: deployment.evidenceSummary || evidenceInput || null,
     };
   }
-  if (deployment.status !== 'deployed') {
+  if (!['deployed', 'failed'].includes(deployment.status)) {
     fail(
       `DEPLOYMENT_NOT_READY_FOR_COMPLETION: deployment ${deployment.id} 当前状态为 ${deployment.status}`
     );
   }
+  const reconciled = await requestWithAuth(
+    config,
+    target.profileName,
+    applicationDeploymentApiPath(
+      logicalAppCode,
+      deployment.id,
+      'reconcile'
+    ),
+    {
+      method: 'POST',
+      body: {
+        reason: 'bind final active AppRelease lineage before test evidence',
+      },
+    }
+  );
+  if (reconciled.status === 'succeeded') {
+    rememberTargetDeployment(target, reconciled);
+    return {
+      deployment: reconciled,
+      evidence: reconciled.evidenceSummary || evidenceInput || null,
+    };
+  }
+  if (reconciled.status !== 'deployed') {
+    fail(
+      `DEPLOYMENT_RECONCILIATION_NOT_CONFIRMED: deployment ${deployment.id} 恢复后状态为 ${reconciled.status}`
+    );
+  }
+  deployment = reconciled;
+  rememberTargetDeployment(target, deployment);
   const evidence = buildBoundDeploymentEvidence(
     evidenceInput,
     target,
@@ -4627,26 +4694,14 @@ async function runApplicationEnvironmentReleaseCommand(
     const candidate = deployment.candidateId
       ? readCandidate(deployment.candidateId)
       : null;
-    const evidence = buildBoundDeploymentEvidence(
-      readJsonInput(flags['evidence-json'], 'evidence-json'),
+    return await completeManagedDeployment(
+      config,
       target,
+      logicalApp.code,
       deployment,
-      candidate
-    );
-    const completed = await requestWithAuth(
-      config,
-      target.profileName,
-      applicationDeploymentApiPath(logicalApp.code, deploymentId, 'complete'),
-      {
-        method: 'POST',
-        body: {
-          evidenceSummary: evidence,
-          evidenceHash: sha256Canonical(evidence),
-        },
-      }
+      candidate,
+      readJsonInput(flags['evidence-json'], 'evidence-json')
     );
-    rememberTargetDeployment(target, completed);
-    return { deployment: completed, evidence };
   }
 
   if (subcommand === 'rollback') {
@@ -30089,6 +30144,8 @@ function buildWorkspacePublishEnv(
 module.exports = {
   buildResourceManifestSddTargets,
   buildScopeGrantSourceSyncDecision,
+  deploymentEvidencePendingError,
+  deploymentQueueWaitDecision,
   main,
   resolveReleaseCommandScopedFiles,
   resolveDeliveryV2BackendManifestReplacementIntent,

package/package.json

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