openxiangda 1.0.231 → 1.0.232

package/README.md

@@ -1,4 +1,4 @@
-<!-- OpenXiangda-Policy-Version: 4 -->
+<!-- OpenXiangda-Policy-Version: 5 -->
 # OpenXiangda
 
 OpenXiangda is a lightweight CLI and skill package for private low-code platforms.
@@ -7,6 +7,30 @@ Normal OpenXiangda app development uses platform-user login tokens through `/ope
 
 Private platform routing is fixed: backend APIs are under `/service`, platform management is under `/platform`, and app runtime access is under `/view`. Passing a root domain such as `https://yida.wisejob.cn/` to the CLI is supported; OpenXiangda stores the API base as `https://yida.wisejob.cn/service`.
 
+## Delivery V2
+
+New workspaces declare `deliveryVersion: 2`. The release flow is intentionally
+small and deterministic:
+
+```bash
+openxiangda check --environment preproduction
+openxiangda deploy preproduction --json
+openxiangda deploy production --package <packageDigest> --json
+openxiangda status <runId> --json
+openxiangda retry <runId> --json
+openxiangda rollback production --to <appReleaseId> --json
+```
+
+The preproduction deploy compiles one content-addressed App Package containing
+source, form, configuration, backend, workflow, and Runtime layers. Production
+downloads that exact package and does not rebuild it. ReleaseRun state and
+checkpoints live on the platform, so a CLI/AI interruption does not discard
+completed work. V2 does not require SDD, a clean/pushed Git mainline,
+`--change`, `--only`, or candidate/ship orchestration.
+
+The lower-level commands later in this README remain available for V1
+compatibility and diagnostics; do not use them to assemble a normal V2 release.
+
 ```bash
 npm install -g openxiangda@latest --registry=https://registry.npmjs.org
 openxiangda update check
@@ -22,7 +46,8 @@ openxiangda env
 openxiangda workspace init ./my-app-workspace --profile dev --app-name "示例应用"
 cd ./my-app-workspace
 pnpm install
-openxiangda workspace publish --profile dev
+openxiangda check --environment preproduction
+openxiangda deploy preproduction --json
 openxiangda menu list --profile dev
 openxiangda workflow list --profile dev
 openxiangda automation list --profile dev

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
@@ -21427,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,
@@ -28690,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',
@@ -28980,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;
   }

package/lib/delivery-v2-cli.js

@@ -0,0 +1,216 @@
+const crypto = require('crypto');
+const { createDeliveryV2Executor } = require('./delivery-v2-executor');
+const { parseArgs, print, warn, writeJson } = require('./utils');
+
+function createDeliveryV2Cli(dependencies) {
+  const deps = assertDependencies(dependencies);
+  const executor = createDeliveryV2Executor(deps);
+
+  async function run(command, argv = []) {
+    const { flags, positional } = parseArgs(argv);
+    if (flags.help || flags.h) {
+      printHelp(command);
+      return;
+    }
+    const config = deps.loadConfig();
+    if (command === 'check') {
+      const target = resolveTarget(config, flags, positional, false);
+      const inspected = await executor.inspect({
+        config,
+        target,
+        workspaceRoot: process.cwd(),
+        skipBuild: flags.build !== true,
+        buildCommand: stringFlag(flags, 'build-command'),
+        distDir: stringFlag(flags, 'dist'),
+        onBuildOutput: buildOutput(flags),
+      });
+      return output(
+        flags,
+        {
+          ok: true,
+          appType: target.appType,
+          environment: target.targetName || target.environmentKind || null,
+          packageDigest: inspected.compiled.packageDigest,
+          summary: inspected.compiled.summary,
+          targets: inspected.targets,
+          previousPackageDigest: inspected.previous?.packageDigest || null,
+        },
+        `Delivery V2 检查通过: ${inspected.compiled.packageDigest}`
+      );
+    }
+    if (command === 'deploy') {
+      const target = resolveTarget(config, flags, positional, true);
+      const packageDigest = stringFlag(flags, 'package');
+      const result = await executor.deploy({
+        config,
+        target,
+        workspaceRoot: process.cwd(),
+        packageDigest,
+        buildCommand: stringFlag(flags, 'build-command'),
+        distDir: stringFlag(flags, 'dist'),
+        clientSessionId: createClientSessionId(),
+        onBuildOutput: buildOutput(flags),
+      });
+      return output(
+        flags,
+        result,
+        `Delivery V2 发布成功: run=${result.run.id} package=${result.packageDigest}`
+      );
+    }
+    if (command === 'status') {
+      const runId = positional[0] || stringFlag(flags, 'run');
+      if (!runId) {
+        throw usageError('用法: openxiangda status <runId> [--json]');
+      }
+      const target = resolveTarget(config, flags, [], false);
+      const result = await executor.status({ config, target, runId });
+      return output(
+        flags,
+        result,
+        `Delivery V2: run=${result.id} status=${result.status} stage=${result.stage}`
+      );
+    }
+    if (command === 'retry') {
+      const runId = positional[0] || stringFlag(flags, 'run');
+      if (!runId) {
+        throw usageError('用法: openxiangda retry <runId> [--json]');
+      }
+      const target = resolveTarget(config, flags, [], false);
+      const result = await executor.retry({
+        config,
+        target,
+        runId,
+        workspaceRoot: process.cwd(),
+      });
+      return output(
+        flags,
+        result,
+        `Delivery V2 重试成功: run=${result.run.id} status=${result.run.status}`
+      );
+    }
+    if (command === 'rollback') {
+      const target = resolveTarget(config, flags, positional, true);
+      const releaseId = stringFlag(flags, 'to');
+      if (!releaseId) {
+        throw usageError(
+          '用法: openxiangda rollback <environment> --to <appReleaseId>'
+        );
+      }
+      const result = await executor.rollback({
+        config,
+        target,
+        releaseId,
+        workspaceRoot: process.cwd(),
+        clientSessionId: createClientSessionId(),
+      });
+      return output(
+        flags,
+        result,
+        `Delivery V2 回滚成功: run=${result.run.id} package=${result.packageDigest}`
+      );
+    }
+    throw usageError(`未知 Delivery V2 命令: ${command}`);
+  }
+
+  function resolveTarget(config, flags, positional, environmentRequired) {
+    const environment =
+      positional[0] ||
+      stringFlag(flags, 'environment') ||
+      stringFlag(flags, 'target');
+    if (environmentRequired && !environment) {
+      throw usageError(
+        '必须指定环境，例如 openxiangda deploy preproduction'
+      );
+    }
+    return deps.getWorkspaceTarget(
+      config,
+      stringFlag(flags, 'profile') || config.currentProfile,
+      {
+        ...flags,
+        ...(environment ? { environment } : {}),
+      }
+    );
+  }
+
+  return { run };
+}
+
+function output(flags, value, message) {
+  if (flags.json) return writeJson(value);
+  print(message);
+  if (value?.run?.failure?.code) {
+    warn(
+      `${value.run.failure.code}: ${value.run.failure.message || '发布失败'}`
+    );
+  }
+  return value;
+}
+
+function buildOutput(flags) {
+  if (flags.json || flags.quiet) return undefined;
+  return (stream, text) => {
+    if (stream === 'stderr') warn(text.trimEnd());
+    else print(text.trimEnd());
+  };
+}
+
+function stringFlag(flags, name) {
+  const value = flags?.[name];
+  if (value === undefined || value === null || value === false) return '';
+  return String(value).trim();
+}
+
+function createClientSessionId() {
+  return `delivery-v2-${process.pid}-${crypto
+    .randomBytes(10)
+    .toString('hex')}`;
+}
+
+function usageError(message) {
+  const error = new Error(message);
+  error.code = 'DELIVERY_USAGE_ERROR';
+  error.retryable = false;
+  return error;
+}
+
+function printHelp(command) {
+  const lines = {
+    check: [
+      '用法: openxiangda check [--environment <name>] [--build] [--json]',
+      '编译并校验 App Package V2；默认复用现有 dist，不执行 Runtime 构建。',
+    ],
+    deploy: [
+      '用法: openxiangda deploy <environment> [--package <sha256>] [--json]',
+      '不带 --package 时从当前工作区构建；带 --package 时直接部署已封存制品。',
+    ],
+    status: ['用法: openxiangda status <runId> [--json]'],
+    retry: ['用法: openxiangda retry <runId> [--json]'],
+    rollback: [
+      '用法: openxiangda rollback <environment> --to <appReleaseId> [--json]',
+    ],
+  };
+  print((lines[command] || ['Delivery V2']).join('\n'));
+}
+
+function assertDependencies(value) {
+  const required = [
+    'clearDeliveryContext',
+    'downloadWithAuth',
+    'getWorkspaceTarget',
+    'installDeliveryContext',
+    'loadConfig',
+    'requestFormWithAuth',
+    'requestWithAuth',
+    'runOpenXiangdaInProcess',
+  ];
+  for (const key of required) {
+    if (typeof value?.[key] !== 'function') {
+      throw new Error(`Delivery V2 CLI dependency 缺失: ${key}`);
+    }
+  }
+  return value;
+}
+
+module.exports = {
+  createDeliveryV2Cli,
+};