openxiangda 1.0.230 → 1.0.232

package/lib/cli.js

@@ -166,6 +166,7 @@ const {
   withReleaseClientSessionArgs,
 } = require('./application-environments');
 const { startDeveloperCenter } = require('./developer-center');
+const { createDeliveryV2Cli } = require('./delivery-v2-cli');
 const {
   describeOpenApiOperation,
   listOpenApiOperations,
@@ -219,6 +220,8 @@ let readOnlyHttpGuardLabel = null;
 let activePublishRequestContext = null;
 let activePublishLeaseHeartbeat = null;
 let activeCommandScopedPublishLease = null;
+let activeDeliveryV2Context = null;
+let deliveryV2Cli = null;
 const genericGitBasePlanCache = new Map();
 
 async function main(argv) {
@@ -270,6 +273,9 @@ async function mainImpl(argv) {
   if (command === 'design') return design(rest);
   if (command === 'sdd') return sdd(rest);
   if (command === 'environment') return environment(rest);
+  if (['check', 'deploy', 'status', 'retry', 'rollback'].includes(command)) {
+    return getDeliveryV2Cli().run(command, rest);
+  }
   if (command === 'release') return release(rest);
   if (command === 'studio') return studio(rest);
   if (command === 'task') return task(rest);
@@ -321,6 +327,11 @@ Usage:
   openxiangda design gates|template|review [--topic code] [--json]
   openxiangda sdd init|migrate|propose|quick|bundle|approve|status|context|verify|sync|archive [change] [--change id] [--json]
   openxiangda environment init|attach|bind|swap|policy update|list|status|diff|use [preproduction|production] [--logical-app code] [--environment target] [--json]
+  openxiangda check [--environment preproduction|production] [--json]
+  openxiangda deploy <preproduction|production> [--package <sha256>] [--profile name] [--json]
+  openxiangda status <runId> [--environment preproduction|production] [--json]
+  openxiangda retry <runId> [--environment preproduction|production] [--json]
+  openxiangda rollback <preproduction|production> --to <appReleaseId> [--json]
   openxiangda release publish|begin|status|integration-status|renew|end [--change id] [--profile name] [--watch] [--json]
   openxiangda release ship|candidate|deploy|test|promote|rollback [--candidate id] [--environment target] [--replace-manifest --reason text] [--adopt-online-baseline --adoption-reason text] [--json]
   openxiangda task status --change <id> [--profile name] [--watch] [--json]
@@ -1451,6 +1462,120 @@ async function runOpenXiangdaInProcess(args, options = {}) {
   }
 }
 
+function getDeliveryV2Cli() {
+  if (deliveryV2Cli) return deliveryV2Cli;
+  deliveryV2Cli = createDeliveryV2Cli({
+    clearDeliveryContext: clearDeliveryV2Context,
+    downloadWithAuth,
+    getWorkspaceTarget,
+    installDeliveryContext: installDeliveryV2Context,
+    loadConfig,
+    requestFormWithAuth,
+    requestWithAuth,
+    runOpenXiangdaInProcess,
+  });
+  return deliveryV2Cli;
+}
+
+function deliveryV2SourceRevision(packageDigest) {
+  return {
+    repo: `sha256:${packageDigest}`,
+    repositoryId: `sha256:${packageDigest}`,
+    repoAliases: [`sha256:${packageDigest}`],
+    baseCommit: packageDigest,
+    treeHash: packageDigest,
+    branch: 'delivery-v2',
+    mainBranch: null,
+    remoteName: null,
+    remoteUrlHash: null,
+  };
+}
+
+function installDeliveryV2Context(target, run, targets = {}) {
+  const control = run?.control || {};
+  const publishLeaseId = String(control.publishLeaseId || '').trim();
+  const baselineId = String(control.baselineId || '').trim();
+  const changeId = String(control.changeId || '').trim();
+  const clientSessionId = String(control.clientSessionId || '').trim();
+  const packageDigest = String(run?.packageDigest || '').trim();
+  if (
+    !publishLeaseId ||
+    !baselineId ||
+    !changeId ||
+    !clientSessionId ||
+    !/^[a-f0-9]{64}$/.test(packageDigest)
+  ) {
+    fail(
+      'DELIVERY_CONTROL_INVALID: ReleaseRun 缺少 publishLease/baseline/change/session/package 控制信息'
+    );
+  }
+  const sourceRevision = deliveryV2SourceRevision(packageDigest);
+  saveChangeBaseline(target, {
+    baselineId,
+    appType: target.appType,
+    profile: target.profileName,
+    changeId,
+    clientSessionId,
+    sourceBase: {
+      repo: sourceRevision.repo,
+      baseCommit: packageDigest,
+      treeHash: packageDigest,
+    },
+    releaseSourceRevision: sourceRevision,
+    resourceHeads: {},
+    lifecycleState: 'active',
+  });
+  savePublishLease(target, {
+    leaseId: publishLeaseId,
+    expiresAt:
+      control.leaseExpiresAt ||
+      new Date(Date.now() + 60 * 60 * 1000).toISOString(),
+    appType: target.appType,
+    profile: target.profileName,
+    changeId,
+    clientSessionId,
+    baseRevision: packageDigest,
+    holder: 'self',
+    workspace: {
+      branch: 'delivery-v2',
+      commit: packageDigest,
+      treeHash: packageDigest,
+    },
+  });
+  activeDeliveryV2Context = {
+    runId: run.id,
+    appType: target.appType,
+    profileName: target.profileName,
+    packageDigest,
+    publishLeaseId,
+    baselineId,
+    changeId,
+    clientSessionId,
+    leaseExpiresAt: control.leaseExpiresAt,
+    sourceRevision,
+    targets,
+  };
+  activePublishRequestContext = normalizePublishContext({
+    appType: target.appType,
+    profileName: target.profileName,
+    publishLeaseId,
+    changeBaselineId: baselineId,
+    changeId,
+    clientSessionId,
+  });
+  return activeDeliveryV2Context;
+}
+
+function clearDeliveryV2Context(target, run) {
+  const context = activeDeliveryV2Context;
+  if (!context) return;
+  if (run?.id && context.runId !== run.id) return;
+  clearPublishLease(target, context.publishLeaseId);
+  clearChangeBaseline(target, context.baselineId);
+  activePublishRequestContext = null;
+  activeDeliveryV2Context = null;
+}
+
 function normalizeReleaseWaitSeconds(flags) {
   const raw =
     readStringFlag(flags, 'wait-seconds') ||
@@ -6478,22 +6603,35 @@ function assertStagedAppReleaseScope(target, flags, resources) {
   }
   const stagedContext = assertStagedResourcesContext(target, changeId);
   let scope;
-  try {
-    scope = getSddChangeScope({
-      cwd: process.cwd(),
-      configText: readWorkspaceConfigText(),
+  if (activeDeliveryV2Context?.changeId === changeId) {
+    scope = {
       changeId,
-    });
-  } catch (error) {
-    if (/SDD 未初始化|change 不存在|ENOENT/i.test(String(error?.message || ''))) {
-      return {
+      targets: activeDeliveryV2Context.targets || {},
+      changedFiles: [],
+      deliveryRunId: activeDeliveryV2Context.runId,
+    };
+  } else {
+    try {
+      scope = getSddChangeScope({
+        cwd: process.cwd(),
+        configText: readWorkspaceConfigText(),
         changeId,
-        scope: null,
-        resources: normalizeStagedAppReleaseResources(resources),
-        compatibility: 'unmanaged_sdd_scope',
-      };
+      });
+    } catch (error) {
+      if (
+        /SDD 未初始化|change 不存在|ENOENT/i.test(
+          String(error?.message || '')
+        )
+      ) {
+        return {
+          changeId,
+          scope: null,
+          resources: normalizeStagedAppReleaseResources(resources),
+          compatibility: 'unmanaged_sdd_scope',
+        };
+      }
+      throw error;
     }
-    throw error;
   }
   const runtimeMode = getWorkspaceRuntimeModeFromConfig(
     readWorkspaceConfigText()
@@ -6799,6 +6937,7 @@ function appReleaseEnvironmentControl(flags = {}) {
     environmentId: readStringFlag(flags, 'environment-id') || undefined,
     candidateId: readStringFlag(flags, 'candidate-id') || undefined,
     deploymentId: readStringFlag(flags, 'deployment-id') || undefined,
+    deliveryRunId: readStringFlag(flags, 'delivery-run-id') || undefined,
   });
 }
 
@@ -7528,6 +7667,30 @@ async function renewPublishLease(config, target, lease, flags = {}) {
 }
 
 async function resolvePublishLeaseForWrite(config, target, flags = {}) {
+  if (
+    activeDeliveryV2Context?.appType === target.appType &&
+    activeDeliveryV2Context?.profileName === target.profileName
+  ) {
+    activePublishRequestContext = normalizePublishContext({
+      appType: target.appType,
+      profileName: target.profileName,
+      publishLeaseId: activeDeliveryV2Context.publishLeaseId,
+      changeBaselineId: activeDeliveryV2Context.baselineId,
+      changeId: activeDeliveryV2Context.changeId,
+      clientSessionId: activeDeliveryV2Context.clientSessionId,
+    });
+    return {
+      leaseId: activeDeliveryV2Context.publishLeaseId,
+      expiresAt: activeDeliveryV2Context.leaseExpiresAt,
+      appType: target.appType,
+      profile: target.profileName,
+      changeId: activeDeliveryV2Context.changeId,
+      clientSessionId: activeDeliveryV2Context.clientSessionId,
+      baseRevision: activeDeliveryV2Context.packageDigest,
+      holder: 'self',
+      explicit: true,
+    };
+  }
   const explicitLeaseId = readStringFlag(flags, 'publish-lease-id');
   const changeId = readStringFlag(flags, 'change');
   const storedLease = getStoredPublishLease(target);
@@ -14807,7 +14970,9 @@ async function runtime(args) {
     // Preserve Runtime's dedicated dirty-source contract before the generic
     // frozen-release revision check runs inside lease resolution. The release
     // freeze and clean-HEAD gates still run immediately afterwards.
-    assertRuntimeSourceClean(process.cwd());
+    if (!activeDeliveryV2Context) {
+      assertRuntimeSourceClean(process.cwd());
+    }
     // Keep build after lease acquisition. In direct-storage modes the build
     // embeds the provider-specific assetBaseUrl returned by the protected
     // upload plan; substituting the gateway URL would change chunk/publicPath
@@ -14819,13 +14984,26 @@ async function runtime(args) {
     const runtimeHead = await telemetry.runPhase('head', async () =>
       loadRuntimeHeadApp(config, target)
     );
-    const runtimeLineage = prepareRuntimeDeployLineage({
-      cwd: process.cwd(),
-      app: runtimeHead,
-      activate: !flags['no-activate'],
-      allowRollback: flags['allow-runtime-rollback'],
-      reason: readStringFlag(flags, 'reason'),
-    });
+    const runtimeLineage = activeDeliveryV2Context
+      ? {
+          sourceRevision: activeDeliveryV2Context.sourceRevision,
+          parentReleaseId: runtimeHead?.activeRuntimeReleaseId || null,
+          parentSourceRevision:
+            runtimeHead?.activeRuntimeSourceRevision || null,
+          lineageBypassReason: null,
+          lineageStatus: 'delivery-v2-package',
+          legacyBootstrap: Boolean(
+            runtimeHead?.activeRuntimeReleaseId &&
+              !runtimeHead?.activeRuntimeSourceRevision
+          ),
+        }
+      : prepareRuntimeDeployLineage({
+          cwd: process.cwd(),
+          app: runtimeHead,
+          activate: !flags['no-activate'],
+          allowRollback: flags['allow-runtime-rollback'],
+          reason: readStringFlag(flags, 'reason'),
+        });
     if (runtimeLineage.lineageStatus === 'rollback-bypass') {
       warn(
         `[RUNTIME_LINEAGE_BYPASS] 已允许审计式 Runtime 源码回退: reason=${runtimeLineage.lineageBypassReason}`
@@ -14904,13 +15082,15 @@ async function runtime(args) {
           jsonOutput: Boolean(flags.json),
         })
       );
-      const postBuildLineage = prepareRuntimeDeployLineage({
-        cwd: process.cwd(),
-        app: runtimeHead,
-        activate: !flags['no-activate'],
-        allowRollback: flags['allow-runtime-rollback'],
-        reason: readStringFlag(flags, 'reason'),
-      });
+      const postBuildLineage = activeDeliveryV2Context
+        ? runtimeLineage
+        : prepareRuntimeDeployLineage({
+            cwd: process.cwd(),
+            app: runtimeHead,
+            activate: !flags['no-activate'],
+            allowRollback: flags['allow-runtime-rollback'],
+            reason: readStringFlag(flags, 'reason'),
+          });
       assertRuntimeSourceRevisionStable(
         runtimeLineage.sourceRevision,
         postBuildLineage.sourceRevision
@@ -16309,7 +16489,12 @@ function removeDirectStateResource(target, resourceType, code) {
 function normalizeMenuDirectBody(bound, menuItem) {
   const formUuid = resolveManifestFormUuid(bound, menuItem);
   const pageId = resolveManifestPageId(bound, menuItem);
-  const parentId = resolveManifestMenuId(bound, menuItem.parentCode) || menuItem.parentId || null;
+  const parentId = requireResolvedMenuParentId(
+    bound,
+    menuItem,
+    new Map(),
+    'direct menu mutation'
+  );
   return stripUndefinedValues({
     resourceCode: menuItem.code || menuItem.resourceCode,
     name: menuItem.name || menuItem.code,
@@ -19087,7 +19272,19 @@ async function buildResourcePlan(
   ]);
   const actions = [];
   addPlanActions(actions, 'role', manifest.roles, existing.roles, roleEquals);
-  addPlanActions(actions, 'menu', manifest.menus, existing.menus, (item, current) => menuEquals(target.bound, item, current));
+  const orderedMenus = orderMenuResourcesForPublish(
+    manifest.menus,
+    target.bound,
+    existing.menus
+  );
+  addPlanActions(
+    actions,
+    'menu',
+    orderedMenus,
+    existing.menus,
+    (item, current) =>
+      menuEquals(target.bound, item, current, existing.menus)
+  );
   addPlanActions(actions, 'connector', manifest.connectors, existing.connectors, connectorEquals);
   addNotificationPlanActions(target, actions, manifest.notifications || [], existing);
   await addWorkflowPlanActions(config, target, actions, manifest.workflows, existing.workflows);
@@ -21410,6 +21607,14 @@ async function runResourceChangeBaselinePreflight(
   flags = {},
   publishLease = null
 ) {
+  if (activeDeliveryV2Context) {
+    return {
+      ok: true,
+      baselineId: activeDeliveryV2Context.baselineId,
+      checkedTargets: [],
+      skipped: 'trusted-delivery-v2-package',
+    };
+  }
   const onlineBaselineAdoption = resolveOnlineBaselineAdoption(
     flags,
     planActions,
@@ -22594,21 +22799,61 @@ async function publishFormSettingsResources(
 }
 
 async function publishMenuResources(config, target, menus, result, options = {}) {
-  for (const menuItem of menus) {
-    if (shouldSkipNoopResource(options, 'menu', menuItem.code)) {
-      recordNoopResource(result, 'menu', menuItem.code, options);
+  if (menus.length === 0) return;
+  const existingMenus = await fetchExistingMenusByCode(config, target);
+  const orderedMenus = orderMenuResourcesForPublish(
+    menus,
+    target.bound,
+    existingMenus
+  );
+  for (const menuItem of orderedMenus) {
+    const code = menuResourceCode(menuItem);
+    const plannedAction = getPlannedResourceAction(options, 'menu', code);
+    const existing = existingMenus.get(code);
+    if (existing && !menuPlatformId(existing)) {
+      const error = new Error(
+        `MENU_ONLINE_ID_REQUIRED: 在线 menu ${code} 缺少 menuId，禁止执行恢复发布`
+      );
+      error.code = 'MENU_ONLINE_ID_REQUIRED';
+      throw error;
+    }
+    if (
+      ['noop', 'update'].includes(plannedAction?.action) &&
+      !menuPlatformId(existing)
+    ) {
+      const error = new Error(
+        `MENU_PLAN_TARGET_MISSING: menu ${code} 的冻结计划为 ${plannedAction.action}，但写入前在线菜单已不存在`
+      );
+      error.code = 'MENU_PLAN_TARGET_MISSING';
+      throw error;
+    }
+  }
+  for (const menuItem of orderedMenus) {
+    const code = menuResourceCode(menuItem);
+    const existing = existingMenus.get(code);
+    if (shouldSkipNoopResource(options, 'menu', code)) {
+      const existingId = menuPlatformId(existing);
+      saveMenuResource(target, code, existingId, {
+        formUuid: existing.formUuid,
+        pageId: existing.pageId,
+        parentId: existing.parentId,
+        routeCode: existing.routeCode,
+        path: existing.path,
+      });
+      recordNoopResource(result, 'menu', code, options);
       continue;
     }
-    const existing = await findExistingMenu(config, target, menuItem.code);
     const formUuid = resolveManifestFormUuid(target.bound, menuItem);
     const pageId = resolveManifestPageId(target.bound, menuItem);
-    const parentId =
-      resolveManifestMenuId(target.bound, menuItem.parentCode) ||
-      menuItem.parentId ||
-      null;
+    const parentId = requireResolvedMenuParentId(
+      target.bound,
+      menuItem,
+      existingMenus,
+      `resource publish menu ${code}`
+    );
     const body = {
-      resourceCode: menuItem.code,
-      name: menuItem.name || menuItem.code,
+      resourceCode: code,
+      name: menuItem.name || code,
       type: menuItem.type || 'nav',
       formUuid,
       pageId,
@@ -22619,11 +22864,12 @@ async function publishMenuResources(config, target, menus, result, options = {})
       routeCode: menuItem.routeCode || null,
       path: menuItem.path || null,
     };
+    const existingId = menuPlatformId(existing);
     let data = existing
       ? await requestWithAuth(
           config,
           target.profileName,
-          `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/menus/${encodeURIComponent(existing.id)}`,
+          `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/menus/${encodeURIComponent(existingId)}`,
           { method: 'POST', body }
         )
       : await requestWithAuth(
@@ -22632,37 +22878,54 @@ async function publishMenuResources(config, target, menus, result, options = {})
           `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/menus`,
           { method: 'POST', body }
         );
-    if (data?.id) {
-      saveMenuResource(target, menuItem.code, data.id, {
-        resourceCode: menuItem.code,
-        name: data.name,
-        type: data.type,
-        ...(formUuid ? { formUuid } : {}),
-        ...(pageId ? { pageId } : {}),
-        ...(menuItem.pageCode ? { pageCode: menuItem.pageCode } : {}),
-        ...(menuItem.routeCode || data.routeCode
-          ? { routeCode: data.routeCode || menuItem.routeCode }
-          : {}),
-        ...(menuItem.path || data.path ? { path: data.path || menuItem.path } : {}),
-      });
+    if (!data?.id) {
+      const error = new Error(
+        `MENU_WRITE_ID_REQUIRED: menu ${code} 写入成功响应缺少 menuId，禁止继续发布子菜单`
+      );
+      error.code = 'MENU_WRITE_ID_REQUIRED';
+      throw error;
     }
-    result.published.push({ kind: 'menu', code: menuItem.code, action: existing ? 'update' : 'create', id: data?.id });
+    saveMenuResource(target, code, data.id, {
+      resourceCode: code,
+      name: data.name,
+      type: data.type,
+      ...(formUuid ? { formUuid } : {}),
+      ...(pageId ? { pageId } : {}),
+      ...(menuItem.pageCode ? { pageCode: menuItem.pageCode } : {}),
+      ...(menuItem.routeCode || data.routeCode
+        ? { routeCode: data.routeCode || menuItem.routeCode }
+        : {}),
+      ...(menuItem.path || data.path ? { path: data.path || menuItem.path } : {}),
+      parentId: data.parentId || parentId,
+    });
+    existingMenus.set(code, {
+      ...(existing || {}),
+      ...body,
+      ...data,
+      id: data.id,
+    });
+    result.published.push({
+      kind: 'menu',
+      code,
+      action: existing ? 'update' : 'create',
+      id: data?.id,
+    });
   }
 }
 
-async function findExistingMenu(config, target, code) {
+async function fetchExistingMenusByCode(config, target) {
   const data = await requestWithAuth(
     config,
     target.profileName,
     `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/menus`
   );
-  const items = flattenItems(normalizeItems(data));
-  const stateId = target.bound.resources?.menus?.[code]?.menuId;
-  if (stateId) {
-    const byState = items.find(item => item.id === stateId);
-    if (byState) return byState;
-  }
-  return items.find(item => item.resourceCode === code);
+  const menus = new Map();
+  indexByCode(
+    menus,
+    flattenItems(normalizeItems(data)),
+    item => item.resourceCode
+  );
+  return menus;
 }
 
 async function publishConnectorResources(config, target, connectors, result, options = {}) {
@@ -26026,7 +26289,123 @@ function resolveManifestPageId(bound, item) {
 
 function resolveManifestMenuId(bound, menuCode) {
   if (!menuCode) return undefined;
-  return bound.resources?.menus?.[menuCode]?.menuId || menuCode;
+  return bound.resources?.menus?.[menuCode]?.menuId;
+}
+
+function menuResourceCode(menuItem) {
+  return String(menuItem?.code || menuItem?.resourceCode || '').trim();
+}
+
+function menuPlatformId(menuItem) {
+  const value = menuItem?.id || menuItem?.menuId;
+  return value ? String(value) : undefined;
+}
+
+function resolveMenuParentId(bound, menuItem, existingMenus = new Map()) {
+  const parentCode = String(menuItem?.parentCode || '').trim();
+  if (!parentCode) return menuItem?.parentId || null;
+  const boundId = resolveManifestMenuId(bound, parentCode);
+  const onlineId = menuPlatformId(existingMenus.get(parentCode));
+  return onlineId || boundId || menuItem?.parentId;
+}
+
+function menuParentResolutionError(code, parentCode, label) {
+  const error = new Error(
+    `MENU_PARENT_UNRESOLVED: ${label || `menu ${code}`} 无法将 parentCode ${parentCode} 解析为在线 menuId`
+  );
+  error.code = 'MENU_PARENT_UNRESOLVED';
+  return error;
+}
+
+function requireResolvedMenuParentId(
+  bound,
+  menuItem,
+  existingMenus = new Map(),
+  label
+) {
+  const parentId = resolveMenuParentId(bound, menuItem, existingMenus);
+  if (menuItem?.parentCode && !parentId) {
+    throw menuParentResolutionError(
+      menuResourceCode(menuItem),
+      menuItem.parentCode,
+      label
+    );
+  }
+  return parentId || null;
+}
+
+function orderMenuResourcesForPublish(
+  menus = [],
+  bound = {},
+  existingMenus = new Map()
+) {
+  const items = Array.isArray(menus) ? menus : [];
+  const byCode = new Map();
+  const sourceIndex = new Map();
+  for (const [index, menuItem] of items.entries()) {
+    const code = menuResourceCode(menuItem);
+    if (!code) {
+      const error = new Error('MENU_CODE_REQUIRED: menu resource 缺少 code');
+      error.code = 'MENU_CODE_REQUIRED';
+      throw error;
+    }
+    if (byCode.has(code)) {
+      const error = new Error(`MENU_CODE_DUPLICATE: menu code ${code} 重复`);
+      error.code = 'MENU_CODE_DUPLICATE';
+      throw error;
+    }
+    byCode.set(code, menuItem);
+    sourceIndex.set(code, index);
+  }
+
+  const children = new Map();
+  const indegree = new Map([...byCode.keys()].map(code => [code, 0]));
+  for (const [code, menuItem] of byCode) {
+    const parentCode = String(menuItem.parentCode || '').trim();
+    if (!parentCode) continue;
+    if (!byCode.has(parentCode)) {
+      if (!resolveMenuParentId(bound, menuItem, existingMenus)) {
+        throw menuParentResolutionError(code, parentCode, `menu ${code}`);
+      }
+      continue;
+    }
+    indegree.set(code, indegree.get(code) + 1);
+    const siblings = children.get(parentCode) || [];
+    siblings.push(code);
+    children.set(parentCode, siblings);
+  }
+
+  const bySourceOrder = (left, right) =>
+    sourceIndex.get(left) - sourceIndex.get(right);
+  const ready = [...indegree.entries()]
+    .filter(([, count]) => count === 0)
+    .map(([code]) => code)
+    .sort(bySourceOrder);
+  const ordered = [];
+  while (ready.length > 0) {
+    const code = ready.shift();
+    ordered.push(byCode.get(code));
+    for (const childCode of (children.get(code) || []).sort(bySourceOrder)) {
+      const next = indegree.get(childCode) - 1;
+      indegree.set(childCode, next);
+      if (next === 0) {
+        ready.push(childCode);
+        ready.sort(bySourceOrder);
+      }
+    }
+  }
+  if (ordered.length !== items.length) {
+    const cycleCodes = [...indegree.entries()]
+      .filter(([, count]) => count > 0)
+      .map(([code]) => code)
+      .sort(bySourceOrder);
+    const error = new Error(
+      `MENU_PARENT_CYCLE: menu parentCode 存在循环依赖: ${cycleCodes.join(' -> ')}`
+    );
+    error.code = 'MENU_PARENT_CYCLE';
+    throw error;
+  }
+  return ordered;
 }
 
 function resolveAutomationManifestPayload(target, automationItem) {
@@ -26178,12 +26557,16 @@ function unwrapFormSettingPlanValue(value, key) {
   return value;
 }
 
-function menuEquals(bound, desired, existing) {
+function menuEquals(bound, desired, existing, existingMenus = new Map()) {
   if (!existing) return false;
   const desiredFormUuid = resolveManifestFormUuid(bound, desired);
   const desiredPageId = resolveManifestPageId(bound, desired);
-  const desiredParentId =
-    resolveManifestMenuId(bound, desired.parentCode) || desired.parentId || null;
+  const desiredParentId = resolveMenuParentId(
+    bound,
+    desired,
+    existingMenus
+  );
+  if (desired.parentCode && !desiredParentId) return false;
   return (
     String(existing.name || '') === String(desired.name || desired.code || '') &&
     String(existing.type || '') === String(desired.type || 'nav') &&
@@ -28495,6 +28878,7 @@ function buildExplicitSddReleasePlan(targets, options = {}) {
 }
 
 function assertSddReleaseGate(plan, flags, command) {
+  if (activeDeliveryV2Context) return;
   if (!plan?.sdd || plan.sdd.errors.length === 0) return;
   const nonBypassable = new Set([
     'sdd-release-direct-form-schema-forbidden',
@@ -28785,7 +29169,8 @@ function isPublishMutationRequest(apiPath, options = {}) {
   if (
     normalizedPath.includes('/publish-lease/') ||
     normalizedPath.endsWith('/publish-lease/acquire') ||
-    normalizedPath.includes('/change-baselines')
+    normalizedPath.includes('/change-baselines') ||
+    normalizedPath.includes('/delivery/')
   ) {
     return false;
   }