openxiangda 1.0.176 → 1.0.178

package/lib/form-field-contract.js

@@ -0,0 +1,79 @@
+const FORM_QUERY_SYSTEM_FIELDS = new Set([
+  'approvalResult',
+  'createTime',
+  'currentApprovalNodeName',
+  'modifiedTime',
+  'originator',
+  'originatorCorp',
+  'originatorName',
+  'processInstanceId',
+  'processInstanceStatus',
+  'processInstanceTitle',
+]);
+
+function collectFormSnapshotFieldIds(snapshot) {
+  const fields = new Set();
+  const formFields = snapshot?.form?.formFields || {};
+  for (const [key, value] of Object.entries(formFields)) {
+    if (key) fields.add(String(key));
+    for (const candidate of [value?.fieldId, value?.field_id]) {
+      if (candidate) fields.add(String(candidate));
+    }
+  }
+  const visit = value => {
+    if (!value || typeof value !== 'object') return;
+    if (Array.isArray(value)) {
+      value.forEach(visit);
+      return;
+    }
+    const fieldId = value.fieldId || value.props?.fieldId;
+    if (fieldId) fields.add(String(fieldId));
+    Object.values(value).forEach(visit);
+  };
+  visit(snapshot?.form?.schema);
+  return fields;
+}
+
+function validateFormFieldContracts(targets, snapshots) {
+  const references = Array.isArray(targets) ? targets : [];
+  const snapshotFields =
+    snapshots instanceof Map ? snapshots : new Map(Object.entries(snapshots || {}));
+  const errors = [];
+  for (const item of references) {
+    const { code: resourceCode, ...detail } = item;
+    if (!item.formUuid) {
+      errors.push({
+        code: 'FORM_FIELD_CONTRACT_BINDING_MISSING',
+        resourceCode,
+        ...detail,
+        message: `${item.kind}:${resourceCode} ${item.file}:${item.line} 查询 ${item.formCode}.${item.field}，但无法解析该表单的 profile 绑定`,
+      });
+      continue;
+    }
+    if (
+      FORM_QUERY_SYSTEM_FIELDS.has(item.field) ||
+      snapshotFields.get(item.formUuid)?.has(item.field)
+    ) {
+      continue;
+    }
+    errors.push({
+      code: 'FORM_FIELD_CONTRACT_FIELD_MISSING',
+      resourceCode,
+      ...detail,
+      message: `${item.kind}:${resourceCode} ${item.file}:${item.line} 通过 ${item.api} 查询 ${item.formCode}.${item.field}，但线上 Form ${item.formUuid} 不存在该字段`,
+    });
+  }
+  return {
+    contractVersion: 'form_field_contract_v1',
+    valid: errors.length === 0,
+    checkedForms: new Set(references.map(item => item.formUuid).filter(Boolean)).size,
+    checkedReferences: references.length,
+    errors,
+  };
+}
+
+module.exports = {
+  FORM_QUERY_SYSTEM_FIELDS,
+  collectFormSnapshotFieldIds,
+  validateFormFieldContracts,
+};

package/lib/integration-bundle.js

@@ -2,7 +2,8 @@ const fs = require('fs');
 const path = require('path');
 const { spawnSync } = require('child_process');
 
-const TASK_RESULT_SCHEMA_VERSION = 'openxiangda_task_result_v1';
+const TASK_RESULT_SCHEMA_VERSION = 'openxiangda_task_result_v2';
+const LEGACY_TASK_RESULT_SCHEMA_VERSION = 'openxiangda_task_result_v1';
 const INTEGRATION_BUNDLE_SCHEMA_VERSION = 'openxiangda_integration_bundle_v1';
 
 function runGit(cwd, args, options = {}) {
@@ -77,6 +78,16 @@ function recordIntegrationTaskResult(options = {}) {
     commit,
     treeHash,
     branch,
+    ...(options.sourceBase?.baseCommit && options.sourceBase?.treeHash
+      ? {
+          sourceBase: {
+            repo: options.sourceBase.repo,
+            baseCommit: options.sourceBase.baseCommit,
+            treeHash: options.sourceBase.treeHash,
+          },
+          baseRevision: options.sourceBase.baseCommit,
+        }
+      : {}),
     targets: options.targets || {},
     changedFiles: Array.from(
       new Set((options.changedFiles || []).map(String).filter(Boolean))
@@ -96,7 +107,10 @@ function readIntegrationTaskResult(cwd, changeId) {
   if (!fs.existsSync(file)) return null;
   try {
     const value = JSON.parse(fs.readFileSync(file, 'utf8'));
-    return value?.schemaVersion === TASK_RESULT_SCHEMA_VERSION
+    return [
+      TASK_RESULT_SCHEMA_VERSION,
+      LEGACY_TASK_RESULT_SCHEMA_VERSION,
+    ].includes(value?.schemaVersion)
       ? { ...value, file }
       : null;
   } catch {
@@ -146,6 +160,13 @@ function collectIntegrationTaskResults(options = {}) {
       commit: result.commit,
       treeHash: result.treeHash,
       sourceBranch: result.branch,
+      ...(result.sourceBase?.baseCommit && result.sourceBase?.treeHash
+        ? {
+            sourceBase: result.sourceBase,
+            baseRevision:
+              result.baseRevision || result.sourceBase.baseCommit,
+          }
+        : {}),
     })),
     verifiedAgainst: runGit(cwd, ['rev-parse', 'HEAD']).stdout,
     createdAt: new Date().toISOString(),

package/lib/publish-lease-heartbeat.js

@@ -1,5 +1,5 @@
 const DEFAULT_HEARTBEAT_INTERVAL_MS = 30_000;
-const DEFAULT_RENEW_WINDOW_MS = 180_000;
+const DEFAULT_RENEW_WINDOW_MS = 60_000;
 
 class PublishLeaseLostError extends Error {
   constructor(message, cause) {

package/lib/publish-lease.js

@@ -4,8 +4,8 @@ const path = require('path');
 
 const { saveProjectState } = require('./config');
 
-const DEFAULT_CLI_PUBLISH_LEASE_TTL_SECONDS = 1800;
-const PUBLISH_LEASE_RENEW_WINDOW_SECONDS = 180;
+const DEFAULT_CLI_PUBLISH_LEASE_TTL_SECONDS = 120;
+const PUBLISH_LEASE_RENEW_WINDOW_SECONDS = 60;
 
 function getStoredPublishLease(target) {
   const lease = target?.bound?.promotion?.publishLease;

package/lib/release-error-classification.js

@@ -0,0 +1,41 @@
+const DEFINITELY_PRE_WRITE_CODES = new Set([
+  'APP_RELEASE_STAGED_SCOPE_MISMATCH',
+  'APP_RELEASE_STAGED_SCOPE_REQUIRED',
+  'BASELINE_SCOPE_MISSING',
+  'FORM_FIELD_CONTRACT_INVALID',
+  'PUBLISH_CONTEXT_REQUIRED',
+  'RELEASE_GIT_AUTH_REQUIRED',
+  'RELEASE_MAIN_BRANCH_UNRESOLVED',
+  'RELEASE_MAIN_REF_UNVERIFIED',
+  'RELEASE_PUBLISH_REVISION_CHANGED',
+  'RELEASE_SOURCE_BEHIND_MAIN',
+  'RELEASE_SOURCE_BRANCH_REQUIRED',
+  'RELEASE_SOURCE_DIRTY',
+  'RELEASE_SOURCE_MAINLINE_NOT_PUSHED',
+  'RELEASE_SOURCE_MAINLINE_REQUIRED',
+  'RESOURCE_FIELD_CONFLICT',
+  'SDD_PREPUBLISH_FAILED',
+  'SOURCE_BASE_DIVERGED',
+]);
+
+function isDefinitelyPreWriteReleaseError(error) {
+  const code = String(error?.code || '').trim();
+  if (DEFINITELY_PRE_WRITE_CODES.has(code)) return true;
+  return /^(?:SDD_|RELEASE_(?:SOURCE|GIT|MAINLINE|MAIN_BRANCH|MAIN_REF)|RUNTIME_(?:SOURCE|BUILD|PACKAGE|DEPENDENCY))/.test(
+    code
+  );
+}
+
+function classifyReleaseExecutionFailure({
+  stagedWriteOccurred = false,
+  writeAttempted = false,
+} = {}) {
+  if (stagedWriteOccurred) return 'staged-resumable';
+  if (writeAttempted) return 'write-review-required';
+  return 'failed';
+}
+
+module.exports = {
+  classifyReleaseExecutionFailure,
+  isDefinitelyPreWriteReleaseError,
+};

package/lib/sdd.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { spawnSync } = require('child_process');
 const { readGitSourceBase } = require('./change-baseline');
 const { assertReleaseSourceIntegrated } = require('./release-mainline');
 const {
@@ -604,6 +605,7 @@ function createChangeMetadata(changeId, options = {}) {
         baseCommit: sourceBase.baseCommit,
         treeHash: sourceBase.treeHash,
       };
+      metadata.baseRevision = sourceBase.baseCommit;
     }
   } catch {
     // SDD can still be used before a workspace is initialized as a Git repo.
@@ -1013,6 +1015,30 @@ function createMainlineSddBundle(options = {}) {
   if (nested) {
     throw new Error(`mainline bundle 不允许嵌套: ${nested.changeId}`);
   }
+  const bundleSourceBase = resolveMainlineBundleSourceBase(
+    sourceChanges,
+    options
+  );
+  const integratedChanges = sourceChanges.map(item => {
+    const sourceBase =
+      normalizeSddSourceBase(item.meta.sourceBase) || bundleSourceBase;
+    const task = options.integration?.requiredCommits?.find(
+      candidate => candidate.changeId === item.changeId
+    );
+    return {
+      changeId: item.changeId,
+      sourceBase,
+      baseRevision:
+        item.meta.baseRevision || sourceBase.baseCommit,
+      ...(task
+        ? {
+            commit: task.commit,
+            treeHash: task.treeHash,
+            sourceBranch: task.sourceBranch,
+          }
+        : {}),
+    };
+  });
 
   const affected = mergeAffectedScopes(
     ...sourceChanges.flatMap(item => [
@@ -1041,16 +1067,19 @@ function createMainlineSddBundle(options = {}) {
   const createdAt = nowIso();
   const meta = {
     ...createChangeMetadata(changeId, {
+      cwd: options.cwd,
       title: options.title || `Mainline release: ${sourceIds.join(', ')}`,
       affected,
       changeMode: 'mainline-bundle',
       riskLevel: 'medium',
+      sourceBase: bundleSourceBase,
     }),
     status: 'approved',
     approvedAt: createdAt,
     approvedBy: 'mainline-release-coordinator',
     approvalSummary: `Aggregate approved changes on authoritative mainline: ${sourceIds.join(', ')}`,
     bundledChanges: sourceIds,
+    integratedChanges,
     createdAt,
     updatedAt: createdAt,
   };
@@ -1083,6 +1112,9 @@ function createMainlineSddBundle(options = {}) {
     changeId,
     mainlinePolicy: 'publish-from-main-v1',
     bundledChanges: sourceIds,
+    sourceBase: bundleSourceBase,
+    baseRevision: bundleSourceBase.baseCommit,
+    integratedChanges,
     ...(options.integration ? { integration: options.integration } : {}),
     targets: normalizedTargets.activationTargets,
     logicalTargets: normalizedTargets.logicalTargets,
@@ -1092,6 +1124,8 @@ function createMainlineSddBundle(options = {}) {
       `openxiangda release publish --change ${changeId} --profile ${profile}`,
     planHash: releasePlanHash({
       changeId,
+      baseRevision: bundleSourceBase.baseCommit,
+      integratedChanges,
       runtimeMode,
       targets: normalizedTargets.activationTargets,
       commands,
@@ -1137,6 +1171,103 @@ function createMainlineSddBundle(options = {}) {
   };
 }
 
+function normalizeSddSourceBase(value) {
+  if (!value?.baseCommit || !value?.treeHash) return null;
+  return {
+    repo: value.repo,
+    baseCommit: String(value.baseCommit),
+    treeHash: String(value.treeHash),
+  };
+}
+
+function runSddGit(cwd, args, options = {}) {
+  const result = spawnSync('git', args, {
+    cwd: cwd || process.cwd(),
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+  if (result.status !== 0 && !options.allowFailure) {
+    const error = new Error(
+      String(result.stderr || result.stdout || `git ${args.join(' ')} failed`).trim()
+    );
+    error.code = 'SDD_SOURCE_BASE_GIT_FAILED';
+    throw error;
+  }
+  return {
+    ok: result.status === 0,
+    stdout: String(result.stdout || '').trim(),
+  };
+}
+
+function resolveMainlineBundleSourceBase(sourceChanges, options = {}) {
+  const cwd = options.cwd || process.cwd();
+  if (options.sourceBaseRef) {
+    return readGitSourceBase(cwd, options.sourceBaseRef);
+  }
+  const missing = sourceChanges.filter(
+    item => !normalizeSddSourceBase(item.meta.sourceBase)
+  );
+  if (missing.length > 0) {
+    const error = new Error(
+      `SDD_SOURCE_BASE_REQUIRED: ${missing
+        .map(item => item.changeId)
+        .join(', ')} 缺少创建变更时冻结的 sourceBase；请用 --source-base-ref <commit> 明确指定共同基线`
+    );
+    error.code = 'SDD_SOURCE_BASE_REQUIRED';
+    error.changes = missing.map(item => item.changeId);
+    throw error;
+  }
+  const sourceBases = sourceChanges.map(item =>
+    normalizeSddSourceBase(item.meta.sourceBase)
+  );
+  const repos = Array.from(
+    new Set(sourceBases.map(item => item.repo).filter(Boolean))
+  );
+  if (repos.length > 1) {
+    const error = new Error(
+      'SDD_SOURCE_BASE_REPOSITORY_MISMATCH: mainline bundle 的来源变更不属于同一 Git 仓库'
+    );
+    error.code = 'SDD_SOURCE_BASE_REPOSITORY_MISMATCH';
+    throw error;
+  }
+  for (const item of sourceChanges) {
+    const task = options.integration?.requiredCommits?.find(
+      candidate => candidate.changeId === item.changeId
+    );
+    if (
+      task?.commit &&
+      !runSddGit(cwd, [
+        'merge-base',
+        '--is-ancestor',
+        item.meta.sourceBase.baseCommit,
+        task.commit,
+      ], { allowFailure: true }).ok
+    ) {
+      const error = new Error(
+        `SDD_SOURCE_BASE_NOT_ANCESTOR: ${item.changeId} 的 sourceBase 不是任务提交 ${String(task.commit).slice(0, 12)} 的祖先`
+      );
+      error.code = 'SDD_SOURCE_BASE_NOT_ANCESTOR';
+      error.changeId = item.changeId;
+      throw error;
+    }
+  }
+  const commits = Array.from(
+    new Set(sourceBases.map(item => item.baseCommit))
+  );
+  const commonCommit =
+    commits.length === 1
+      ? commits[0]
+      : runSddGit(cwd, ['merge-base', '--octopus', ...commits]).stdout;
+  if (!commonCommit) {
+    const error = new Error(
+      'SDD_SOURCE_BASE_COMMON_ANCESTOR_REQUIRED: 来源变更没有可验证的共同 Git 基线'
+    );
+    error.code = 'SDD_SOURCE_BASE_COMMON_ANCESTOR_REQUIRED';
+    throw error;
+  }
+  return readGitSourceBase(cwd, commonCommit);
+}
+
 function loadSddChange(options = {}) {
   const governance = getSddGovernanceConfig(options);
   const changeId = normalizeChangeId(options.changeId);

package/lib/source-dependencies.js

@@ -245,6 +245,122 @@ function readStaticObjectProperty(expression, propertyNames, bindings) {
   return null;
 }
 
+function resolveStaticExpression(expression, bindings, seen = new Set()) {
+  const value = unwrapExpression(expression);
+  if (!value || !ts.isIdentifier(value)) return value;
+  if (seen.has(value.text)) return value;
+  const initializer = bindings.get(value.text);
+  if (!initializer) return value;
+  const nextSeen = new Set(seen);
+  nextSeen.add(value.text);
+  return resolveStaticExpression(initializer, bindings, nextSeen);
+}
+
+function readStaticObjectPropertyExpression(
+  expression,
+  propertyNames,
+  bindings
+) {
+  const value = resolveStaticExpression(expression, bindings);
+  if (!value || !ts.isObjectLiteralExpression(value)) return null;
+  for (const property of value.properties) {
+    if (!ts.isPropertyAssignment(property)) continue;
+    if (!propertyNames.includes(propertyNameText(property.name))) continue;
+    return property.initializer;
+  }
+  return null;
+}
+
+function collectStaticQueryFieldNodes(
+  expression,
+  bindings,
+  result,
+  fieldPropertyNames,
+  seen = new Set()
+) {
+  const value = resolveStaticExpression(expression, bindings, seen);
+  if (!value || seen.has(value)) return;
+  seen.add(value);
+  if (ts.isArrayLiteralExpression(value)) {
+    for (const element of value.elements) {
+      collectStaticQueryFieldNodes(
+        element,
+        bindings,
+        result,
+        fieldPropertyNames,
+        seen
+      );
+    }
+    return;
+  }
+  if (!ts.isObjectLiteralExpression(value)) return;
+  for (const property of value.properties) {
+    if (ts.isSpreadAssignment(property)) {
+      collectStaticQueryFieldNodes(
+        property.expression,
+        bindings,
+        result,
+        fieldPropertyNames,
+        seen
+      );
+      continue;
+    }
+    if (!ts.isPropertyAssignment(property)) continue;
+    const name = propertyNameText(property.name);
+    if (fieldPropertyNames.has(name)) {
+      const field = readStaticString(property.initializer, bindings);
+      if (field) result.push({ field, node: property.initializer });
+    }
+    collectStaticQueryFieldNodes(
+      property.initializer,
+      bindings,
+      result,
+      fieldPropertyNames,
+      seen
+    );
+  }
+}
+
+function addFormFieldReferences(
+  formFieldReferences,
+  sourceFile,
+  workspaceRoot,
+  bindings,
+  formCode,
+  inputExpression,
+  api
+) {
+  if (!formCode || !inputExpression) return;
+  const fields = [];
+  for (const propertyName of ['filters', 'order']) {
+    const expression = readStaticObjectPropertyExpression(
+      inputExpression,
+      [propertyName],
+      bindings
+    );
+    if (expression) {
+      collectStaticQueryFieldNodes(
+        expression,
+        bindings,
+        fields,
+        new Set(
+          propertyName === 'order'
+            ? ['id', 'key', 'field', 'fieldId']
+            : ['key', 'field', 'fieldId']
+        )
+      );
+    }
+  }
+  for (const item of fields) {
+    formFieldReferences.push({
+      formCode,
+      field: item.field,
+      api,
+      ...sourceLocation(sourceFile, item.node, workspaceRoot),
+    });
+  }
+}
+
 function sourceLocation(sourceFile, node, workspaceRoot) {
   const start = sourceFile.getLineAndCharacterOfPosition(node.getStart(sourceFile));
   return {
@@ -274,10 +390,46 @@ function addDynamicReferenceWarning(warnings, sourceFile, node, workspaceRoot, a
   });
 }
 
-function inspectResourceCall(node, sourceFile, workspaceRoot, bindings, references, warnings) {
+function inspectResourceCall(
+  node,
+  sourceFile,
+  workspaceRoot,
+  bindings,
+  references,
+  formFieldReferences,
+  warnings
+) {
   if (!ts.isCallExpression(node)) return;
   const callee = getPropertyPath(node.expression, bindings);
-  if (!callee || callee[0] !== 'ctx' || callee.length < 3) return;
+  if (!callee) return;
+  if (
+    callee.length === 1 &&
+    callee[0] === 'queryAdvancedFormPage'
+  ) {
+    const formCode = readStaticString(node.arguments[1], bindings);
+    if (formCode) {
+      addReference(
+        references,
+        sourceFile,
+        node,
+        workspaceRoot,
+        'forms',
+        formCode,
+        'queryAdvancedFormPage'
+      );
+      addFormFieldReferences(
+        formFieldReferences,
+        sourceFile,
+        workspaceRoot,
+        bindings,
+        formCode,
+        node.arguments[2],
+        'queryAdvancedFormPage'
+      );
+    }
+    return;
+  }
+  if (callee[0] !== 'ctx' || callee.length < 3) return;
   const namespace = callee[1];
   const method = callee[2];
   const api = callee.join('.');
@@ -304,7 +456,22 @@ function inspectResourceCall(node, sourceFile, workspaceRoot, bindings, referenc
   if (namespace === 'form') {
     const code = readStaticObjectProperty(firstArgument, ['formCode', 'code'], bindings) ||
       readStaticString(firstArgument, bindings);
-    if (code) addReference(references, sourceFile, node, workspaceRoot, 'forms', code, api);
+    if (code) {
+      addReference(references, sourceFile, node, workspaceRoot, 'forms', code, api);
+      addFormFieldReferences(
+        formFieldReferences,
+        sourceFile,
+        workspaceRoot,
+        bindings,
+        code,
+        ts.isObjectLiteralExpression(
+          resolveStaticExpression(firstArgument, bindings)
+        )
+          ? firstArgument
+          : node.arguments[1],
+        api
+      );
+    }
     else if (firstArgument) addDynamicReferenceWarning(warnings, sourceFile, node, workspaceRoot, api, 'forms');
     return;
   }
@@ -396,6 +563,7 @@ function analyzeTypeScriptEntry(options = {}) {
   const visited = new Set();
   const sourceDependencies = new Set();
   const references = [];
+  const formFieldReferences = [];
   const warnings = [];
 
   while (queue.length > 0) {
@@ -439,7 +607,15 @@ function analyzeTypeScriptEntry(options = {}) {
 
     const bindings = collectConstInitializers(sourceFile);
     const inspect = node => {
-      inspectResourceCall(node, sourceFile, workspaceRoot, bindings, references, warnings);
+      inspectResourceCall(
+        node,
+        sourceFile,
+        workspaceRoot,
+        bindings,
+        references,
+        formFieldReferences,
+        warnings
+      );
       ts.forEachChild(node, inspect);
     };
     inspect(sourceFile);
@@ -486,6 +662,10 @@ function analyzeTypeScriptEntry(options = {}) {
     sourceDependencies: Array.from(sourceDependencies).sort(),
     resourceReferences,
     resourceReferenceDetails,
+    formFieldReferences: dedupeDetails(
+      formFieldReferences,
+      ['formCode', 'field', 'file', 'line', 'column', 'api']
+    ),
     warnings: dedupeDetails(warnings, ['code', 'file', 'line', 'column', 'api', 'message']),
   };
 }
@@ -610,11 +790,16 @@ function mergeAnalyses(workspaceRoot, entries) {
       ).sort(),
     ])
   );
+  const formFieldReferences = dedupeDetails(
+    analyses.flatMap(analysis => analysis.formFieldReferences || []),
+    ['formCode', 'field', 'file', 'line', 'column', 'api']
+  );
   return {
     entryFiles: entries.map(entry => workspaceRelativePath(workspaceRoot, entry)).sort(),
     sourceDependencies,
     resourceReferences,
     resourceReferenceDetails,
+    formFieldReferences,
     warnings: dedupeDetails(
       analyses.flatMap(analysis => analysis.warnings),
       ['code', 'file', 'line', 'column', 'api', 'message']
@@ -712,6 +897,7 @@ function validateManifestSourceBindings(options = {}) {
       entryFiles: target.entryFiles,
       sourceDependencies: target.sourceDependencies,
       resourceReferences: target.resourceReferences,
+      formFieldReferences: target.formFieldReferences,
     })),
   };
 }