openxiangda 1.0.240 → 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') {
@@ -14524,6 +14579,20 @@ async function resource(args) {
     const publishLease = await telemetry.runPhase('lease', async () =>
       resolvePublishLeaseForWrite(config, target, flags)
     );
+    const deliveryV2BackendManifestIntent =
+      resolveDeliveryV2BackendManifestReplacementIntent({
+        flags,
+        typeFilters,
+        codeFilters,
+        manifest,
+      });
+    const publishLeaseFlags = deliveryV2BackendManifestIntent
+      ? {
+          ...flags,
+          reason: deliveryV2BackendManifestIntent.reason,
+          'replace-reason': deliveryV2BackendManifestIntent.reason,
+        }
+      : flags;
     const changeBaselinePreflight = await telemetry.runPhase(
       'preflight',
       {
@@ -14553,10 +14622,12 @@ async function resource(args) {
           pruneCandidates,
           publishLeaseId: publishLease?.leaseId,
           publishLease,
-          publishLeaseFlags: flags,
+          publishLeaseFlags,
           scopedFiles,
           baseRef: flags.since || 'HEAD',
-          replaceManifest: Boolean(flags['replace-manifest']),
+          replaceManifest:
+            Boolean(flags['replace-manifest']) ||
+            Boolean(deliveryV2BackendManifestIntent),
           changeId:
             flags.change || getStoredChangeBaseline(target)?.changeId || null,
           stagedFormBindingOverlays,
@@ -14572,6 +14643,10 @@ async function resource(args) {
             Boolean(typeFilters?.has('workflows')),
         })
     );
+    if (deliveryV2BackendManifestIntent) {
+      result.deliveryV2BackendManifestReplacement =
+        deliveryV2BackendManifestIntent;
+    }
     if (changeBaselinePreflight) {
       result.changeBaselinePreflight = changeBaselinePreflight;
     }
@@ -28265,6 +28340,86 @@ function shouldReplaceResourceManifestItem(item, resourceKey, code, options = {}
   return options.replaceManifest === true;
 }
 
+function resolveDeliveryV2BackendManifestReplacementIntent({
+  flags = {},
+  typeFilters = null,
+  codeFilters = null,
+  manifest = {},
+  deliveryContext = activeDeliveryV2Context,
+} = {}) {
+  if (!deliveryContext || !flags['stage-only']) return null;
+  const selectedTypes = Array.from(typeFilters || []);
+  if (
+    selectedTypes.length === 0 ||
+    selectedTypes.some(
+      type => !['functions', 'automations'].includes(type)
+    )
+  ) {
+    return null;
+  }
+  if (!Array.isArray(codeFilters) || codeFilters.length === 0) {
+    const error = new Error(
+      'DELIVERY_BACKEND_SCOPE_MISMATCH: Delivery V2 Backend stage 缺少冻结的精确 selector'
+    );
+    error.code = 'DELIVERY_BACKEND_SCOPE_MISMATCH';
+    error.retryable = false;
+    throw error;
+  }
+  const expectedSelectors = unique([
+    ...(deliveryContext.targets?.functions || []).map(
+      code => `Function:${String(code)}`
+    ),
+    ...(deliveryContext.targets?.automations || []).map(
+      code => `Automation:${String(code)}`
+    ),
+  ]).sort();
+  const actualSelectors = unique([
+    ...(manifest.functions || []).map(
+      item => `Function:${getResourceItemCode(item)}`
+    ),
+    ...(manifest.automations || []).map(
+      item => `Automation:${getResourceItemCode(item)}`
+    ),
+  ])
+    .filter(selector => !selector.endsWith(':'))
+    .sort();
+  if (
+    expectedSelectors.length === 0 ||
+    JSON.stringify(actualSelectors) !== JSON.stringify(expectedSelectors)
+  ) {
+    const error = new Error(
+      `DELIVERY_BACKEND_SCOPE_MISMATCH: Delivery V2 Backend stage 与 ReleaseRun 冻结范围不一致；expected=[${expectedSelectors.join(
+        ','
+      )}] actual=[${actualSelectors.join(',')}]`
+    );
+    error.code = 'DELIVERY_BACKEND_SCOPE_MISMATCH';
+    error.retryable = false;
+    error.expectedSelectors = expectedSelectors;
+    error.actualSelectors = actualSelectors;
+    throw error;
+  }
+  const runId = String(deliveryContext.runId || '').trim();
+  const packageDigest = String(deliveryContext.packageDigest || '').trim();
+  if (!runId || !/^[a-f0-9]{64}$/.test(packageDigest)) {
+    const error = new Error(
+      'DELIVERY_CONTROL_INVALID: Delivery V2 Backend stage 缺少 ReleaseRun/packageDigest 权威上下文'
+    );
+    error.code = 'DELIVERY_CONTROL_INVALID';
+    error.retryable = false;
+    throw error;
+  }
+  return {
+    mode: 'manifest_replacement',
+    authority: 'delivery_v2_sealed_package',
+    runId,
+    packageDigest,
+    selectors: actualSelectors,
+    reason:
+      `Delivery V2 ReleaseRun ${runId} sealed package ${packageDigest} ` +
+      'authoritative backend manifest and binding contract replacement',
+  };
+}
+
 function buildAutomationSourcePatchSources(existingDefinition, desiredDefinition) {
   const existing = existingDefinition || {};
   const desired = desiredDefinition || {};
@@ -29989,8 +30144,11 @@ function buildWorkspacePublishEnv(
 module.exports = {
   buildResourceManifestSddTargets,
   buildScopeGrantSourceSyncDecision,
+  deploymentEvidencePendingError,
+  deploymentQueueWaitDecision,
   main,
   resolveReleaseCommandScopedFiles,
+  resolveDeliveryV2BackendManifestReplacementIntent,
   resolveDataViewSourceFormCodes,
   satisfiedFormCodesFromContext,
   stagedDataViewFormReleaseDependencies,

package/lib/delivery-v2-executor.js

@@ -882,6 +882,10 @@ function compactStepResult(stepId, result, context = {}) {
     if (bindingContracts) {
       compact.backendBindingContracts = bindingContracts;
     }
+    if (result.deliveryV2BackendManifestReplacement) {
+      compact.backendManifestReplacement =
+        result.deliveryV2BackendManifestReplacement;
+    }
   }
   return compact;
 }

package/package.json

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