openxiangda 1.0.190 → 1.0.192

package/lib/application-environments.js

@@ -401,10 +401,34 @@ function withReleaseClientSessionArgs(args = [], flags = {}) {
     : [...args];
 }
 
+function isRecoverablePostActivationDeploymentError(error, deployment) {
+  if (
+    deployment?.status !== 'deployed' ||
+    !String(deployment?.targetAppReleaseId || '').trim()
+  ) {
+    return false;
+  }
+  const detail = [
+    error?.code,
+    error?.message,
+    error?.publishLeaseCleanupError?.code,
+    error?.publishLeaseCleanupError?.message,
+  ]
+    .filter(Boolean)
+    .join(' ');
+  return (
+    /(publish[\s_-]*lease|publishLease|发布租约)/i.test(detail) &&
+    /(concurr|conflict|cleanup|release[\s_-]*end|并发冲突|清理|释放)/i.test(
+      detail
+    )
+  );
+}
+
 module.exports = {
   bindEnvironmentTarget,
   buildCandidateBundle,
   canonicalJson,
+  isRecoverablePostActivationDeploymentError,
   normalizeEnvironmentKind,
   normalizeManagedChangeSourceBase,
   normalizeManagedReleaseSourceRevision,

package/lib/cli.js

@@ -130,6 +130,7 @@ const { buildDesignReview, renderDesignReview } = require('./design-review');
 const {
   bindEnvironmentTarget,
   buildCandidateBundle,
+  isRecoverablePostActivationDeploymentError,
   normalizeEnvironmentKind,
   normalizeManagedChangeSourceBase,
   normalizeManagedReleaseSourceRevision,
@@ -1300,9 +1301,9 @@ async function waitForPublishLeaseAvailability(config, target, flags = {}) {
   }
 }
 
-function readReleaseRecoveryContext(target, changeId) {
+function readReleaseRecoveryContext(target, changeId, deploymentId) {
   if (!changeId) return null;
-  const execution = readReleaseExecution(changeId);
+  const execution = readReleaseExecution(changeId, deploymentId);
   const context = execution?.releaseContext;
   if (!context || typeof context !== 'object' || Array.isArray(context)) {
     return null;
@@ -2142,14 +2143,120 @@ function buildEnvironmentStatusDiff(status) {
   };
 }
 
-function readStudioGit(args) {
+function readStudioGit(args, cwd = process.cwd()) {
   const result = spawnSync('git', args, {
-    cwd: process.cwd(),
+    cwd,
     encoding: 'utf8',
+    timeout: 5000,
   });
   return result.status === 0 ? String(result.stdout || '').trim() : '';
 }
 
+function studioGitSnapshot() {
+  const porcelain = readStudioGit([
+    'status',
+    '--porcelain',
+    '--untracked-files=all',
+  ]);
+  const branch = readStudioGit(['branch', '--show-current']);
+  const commit = readStudioGit(['rev-parse', 'HEAD']);
+  const upstream = readStudioGit([
+    'rev-parse',
+    '--abbrev-ref',
+    '--symbolic-full-name',
+    '@{upstream}',
+  ]);
+  const upstreamCommit = upstream
+    ? readStudioGit(['rev-parse', upstream])
+    : '';
+  const upstreamParts = upstream.split('/');
+  const remoteName = upstreamParts.length > 1 ? upstreamParts[0] : '';
+  const upstreamBranch = upstreamParts.slice(1).join('/');
+  const remoteHeadCommit =
+    remoteName && upstreamBranch
+      ? readStudioGit([
+          'ls-remote',
+          '--heads',
+          remoteName,
+          `refs/heads/${upstreamBranch}`,
+        ]).split(/\s+/)[0] || ''
+      : '';
+  const aheadBehind = upstream
+    ? readStudioGit([
+        'rev-list',
+        '--left-right',
+        '--count',
+        `${upstream}...HEAD`,
+      ])
+        .split(/\s+/)
+        .map(value => Number(value))
+    : [];
+  const worktreePaths = readStudioGit(['worktree', 'list', '--porcelain'])
+    .split(/\r?\n/)
+    .filter(line => line.startsWith('worktree '))
+    .map(line => line.slice('worktree '.length))
+    .filter(Boolean);
+  const dirtyWorktrees = worktreePaths
+    .filter(worktreePath => path.resolve(worktreePath) !== process.cwd())
+    .filter(worktreePath =>
+      Boolean(
+        readStudioGit(
+          ['status', '--porcelain', '--untracked-files=all'],
+          worktreePath
+        )
+      )
+    );
+  const ahead = Number.isFinite(aheadBehind[1]) ? aheadBehind[1] : null;
+  const behind = Number.isFinite(aheadBehind[0]) ? aheadBehind[0] : null;
+  const authoritativeBranch = ['main', 'master'].includes(branch);
+  const upstreamMainline = /\/(?:main|master)$/.test(upstream);
+  const clean = !porcelain;
+  const mainlineAligned =
+    clean &&
+    authoritativeBranch &&
+    upstreamMainline &&
+    commit === upstreamCommit &&
+    commit === remoteHeadCommit &&
+    ahead === 0 &&
+    behind === 0 &&
+    dirtyWorktrees.length === 0;
+  return {
+    branch,
+    commit,
+    upstream: upstream || null,
+    upstreamCommit: upstreamCommit || null,
+    remoteHeadCommit: remoteHeadCommit || null,
+    ahead,
+    behind,
+    clean,
+    mainlineAligned,
+    dirtyWorktrees,
+    worktreeCount: worktreePaths.length,
+    changes: porcelain ? porcelain.split(/\r?\n/).slice(0, 50) : [],
+  };
+}
+
+function isProductionCommissioning(environment) {
+  const policy = environment?.sideEffectPolicy || {};
+  return (
+    policy.payments === 'deny' &&
+    policy.notifications === 'tester_allowlist' &&
+    policy.externalWrites === 'deny' &&
+    policy.publicIndexing === 'deny' &&
+    policy.organizationWrites === 'deny' &&
+    policy.scheduledAutomations === 'disabled' &&
+    policy.environmentBanner === true
+  );
+}
+
+function isDeploymentEvidenceValid(deployment, now = Date.now()) {
+  if (!deployment?.evidenceHash) return false;
+  const evidence = deployment.evidenceSummary;
+  if (!evidence || evidence.outcome !== 'passed') return false;
+  const validUntil = Date.parse(evidence.validUntil || '');
+  return Number.isFinite(validUntil) && validUntil > now;
+}
+
 async function studio(args) {
   const { flags } = parseArgs(args);
   const config = loadConfig();
@@ -2165,26 +2272,69 @@ async function studio(args) {
       state,
       state.currentTarget || 'preproduction'
     );
-    const remote = await requestWithAuth(
+    const remoteStatus = await requestWithAuth(
       config,
       selected.binding.profile,
       environmentSetApiPath(state.logicalApp.code, '/status')
     );
-    const porcelain = readStudioGit([
-      'status',
-      '--porcelain',
-      '--untracked-files=all',
-    ]);
+    const environments = await Promise.all(
+      (remoteStatus?.environments || []).map(async environment => {
+        const deploymentId = environment?.latestDeployment?.id;
+        if (!deploymentId) return environment;
+        try {
+          const latestDeployment = await requestWithAuth(
+            config,
+            selected.binding.profile,
+            applicationDeploymentApiPath(
+              state.logicalApp.code,
+              deploymentId
+            )
+          );
+          return { ...environment, latestDeployment };
+        } catch {
+          return environment;
+        }
+      })
+    );
+    const remote = { ...remoteStatus, environments };
+    const git = studioGitSnapshot();
+    const preproduction = environments.find(
+      environment => environment.kind === 'preproduction'
+    );
+    const production = environments.find(
+      environment => environment.kind === 'production'
+    );
+    const drift = buildEnvironmentStatusDiff(remote).drift;
+    const evidenceValid = isDeploymentEvidenceValid(
+      preproduction?.latestDeployment
+    );
+    const productionCommissioning =
+      isProductionCommissioning(production);
+    const candidateReady = git.mainlineAligned;
+    const testRegistrationReady = Boolean(
+      preproduction?.latestDeployment?.id &&
+        preproduction.latestDeployment.status !== 'failed'
+    );
+    const promotionReady =
+      candidateReady &&
+      productionCommissioning &&
+      evidenceValid &&
+      preproduction?.latestDeployment?.status === 'succeeded' &&
+      Boolean(preproduction.latestDeployment.candidateId);
     return {
       workspace: process.cwd(),
       logicalApp: state.logicalApp,
       currentTarget: state.currentTarget,
       targets: state.targets,
-      git: {
-        branch: readStudioGit(['branch', '--show-current']),
-        commit: readStudioGit(['rev-parse', 'HEAD']),
-        clean: !porcelain,
-        changes: porcelain ? porcelain.split(/\r?\n/).slice(0, 50) : [],
+      git,
+      drift,
+      deliveryGates: {
+        candidateReady,
+        evidenceValid,
+        productionCommissioning,
+        promotionReady,
+        rollbackReady: Boolean(production?.heads?.appReleaseId),
+        testRegistrationReady,
       },
       openxiangdaVersion: CURRENT_VERSION,
       remote,
@@ -2493,6 +2643,33 @@ async function deployApplicationCandidate(
     rememberTargetDeployment(target, detail);
     return { deployment: detail, published };
   } catch (error) {
+    let activatedDeployment = null;
+    try {
+      activatedDeployment = await requestWithAuth(
+        config,
+        target.profileName,
+        applicationDeploymentApiPath(logicalApp.code, deployment.id)
+      );
+    } catch {
+      // Preserve the primary deployment error when the read-only check fails.
+    }
+    if (
+      isRecoverablePostActivationDeploymentError(error, activatedDeployment)
+    ) {
+      rememberTargetDeployment(target, activatedDeployment);
+      warn(
+        `AppRelease 已激活，发布租约清理发生并发冲突；部署 ${deployment.id} 保持 deployed，请执行 release status/end 完成只读回合清理。`
+      );
+      return {
+        deployment: activatedDeployment,
+        published: null,
+        recoveredAfterActivation: true,
+        postActivationError: {
+          code: error?.code || 'PUBLISH_LEASE_CLEANUP_CONFLICT',
+          message: maskText(error?.message || String(error)),
+        },
+      };
+    }
     await markApplicationDeploymentFailed(
       config,
       target,
@@ -2549,6 +2726,35 @@ async function runApplicationEnvironmentReleaseCommand(
     );
   }
 
+  if (subcommand === 'reconcile') {
+    const deploymentId =
+      readStringFlag(flags, 'deployment') ||
+      readStringFlag(flags, 'deployment-id') ||
+      positional[0] ||
+      target.bound.lastDeploymentId;
+    const reason = readStringFlag(flags, 'reason');
+    if (!deploymentId || reason.length < 8) {
+      fail(
+        'release reconcile 必须提供 --deployment <id> 和至少 8 个字符的 --reason'
+      );
+    }
+    const reconciled = await requestWithAuth(
+      config,
+      target.profileName,
+      applicationDeploymentApiPath(
+        logicalApp.code,
+        deploymentId,
+        'reconcile'
+      ),
+      {
+        method: 'POST',
+        body: { reason },
+      }
+    );
+    rememberTargetDeployment(target, reconciled);
+    return { deployment: reconciled, reconciled: true };
+  }
+
   const candidateId =
     readStringFlag(flags, 'candidate') ||
     readStringFlag(flags, 'candidate-id') ||
@@ -2682,7 +2888,7 @@ async function release(args) {
   if (wantsSubcommandHelp(subcommand, flags)) {
     print([
       '用法: openxiangda release publish|begin|status|explain|integration-status|renew|end [--change id] [--profile name] [--json]',
-      '      openxiangda release candidate|deploy|test|promote|rollback [--candidate id] [--environment target] [--confirm-production] [--json]',
+      '      openxiangda release candidate|deploy|reconcile|test|promote|rollback [--candidate id] [--environment target] [--confirm-production] [--json]',
       '      openxiangda release backend-head|backend-list|backend-detail|backend-diff|backend-rollback|backend-abort|backend-retry [releaseId] [--profile name] [--json]',
       '      openxiangda release app-capture|app-head|app-list|app-detail|app-diff|app-post-commit|app-retry|app-prepare|app-verify|app-activate|app-finalize|app-rollback|app-abort [releaseId] [--staged-resources-json <JSON|file>] [--activate-staged-children] [--profile name] [--json]',
       '常用流程:',
@@ -2720,7 +2926,7 @@ async function release(args) {
     flags
   );
   if (
-    ['candidate', 'deploy', 'test', 'promote', 'rollback'].includes(
+    ['candidate', 'deploy', 'reconcile', 'test', 'promote', 'rollback'].includes(
       subcommand
     )
   ) {
@@ -2853,7 +3059,11 @@ async function release(args) {
       access: 'reconciliation-read',
     });
     const changeId = positional[0] || readStringFlag(flags, 'change');
-    const recovered = readReleaseRecoveryContext(target, changeId);
+    const recovered = readReleaseRecoveryContext(
+      target,
+      changeId,
+      readStringFlag(flags, 'deployment-id')
+    );
     const sourceRevision =
       baseline?.releaseSourceRevision ||
       recovered?.context?.releaseSourceRevision;

package/lib/developer-center.js

@@ -60,7 +60,7 @@ function studioHtml(sessionToken) {
     .pre{--accent:var(--pre)}.prod{--accent:var(--prod)}.card-head{display:flex;justify-content:space-between;align-items:center;margin-bottom:22px}
     h2{font-size:19px;margin:0}.badge{border:1px solid color-mix(in srgb,var(--accent) 45%,var(--line));color:var(--accent);padding:5px 9px;border-radius:999px;font-size:11px;letter-spacing:.08em}
     dl{display:grid;grid-template-columns:130px 1fr;gap:11px;margin:0;font-size:13px}dt{color:var(--muted)}dd{margin:0;font-family:ui-monospace,SFMono-Regular,monospace;overflow-wrap:anywhere}
-    .wide{grid-column:1/-1}.toolbar{display:flex;flex-wrap:wrap;gap:10px;margin-top:20px}button{appearance:none;border:1px solid #3a3d36;background:#22241f;color:#f4f4ef;padding:10px 14px;border-radius:10px;font-weight:600;cursor:pointer}
+    .wide{grid-column:1/-1}.toolbar{display:flex;flex-wrap:wrap;gap:10px;margin-top:20px}.gate-ok{color:var(--prod)}.gate-bad{color:var(--bad)}button{appearance:none;border:1px solid #3a3d36;background:#22241f;color:#f4f4ef;padding:10px 14px;border-radius:10px;font-weight:600;cursor:pointer}
     button:hover{border-color:#777c70}button.primary{background:#e9efe9;color:#111;border-color:#e9efe9}button.danger{color:#ffaaa3;border-color:#70423e}
     button:disabled{opacity:.4;cursor:not-allowed}.status{display:flex;gap:8px;align-items:center;color:var(--muted);font-size:13px}.dot{width:8px;height:8px;border-radius:50%;background:var(--prod);box-shadow:0 0 14px var(--prod)}
     pre{white-space:pre-wrap;word-break:break-word;background:#10110f;border:1px solid #252722;border-radius:12px;padding:16px;color:#c7cbc2;max-height:300px;overflow:auto;font:12px/1.55 ui-monospace,SFMono-Regular,monospace}
@@ -76,6 +76,7 @@ function studioHtml(sessionToken) {
   <section class="grid">
     <article class="card env pre"><div class="card-head"><h2>预发环境</h2><span class="badge">PREPRODUCTION</span></div><dl id="pre"></dl></article>
     <article class="card env prod"><div class="card-head"><h2>正式环境</h2><span class="badge">PRODUCTION</span></div><dl id="prod"></dl></article>
+    <article class="card wide"><div class="card-head"><h2>交付门禁与环境差异</h2><span class="badge" id="gate-badge">CHECKING</span></div><dl id="gates"></dl></article>
     <article class="card wide"><div class="card-head"><h2>交付状态</h2><div class="status"><span class="dot"></span><span id="health">连接中</span></div></div><div class="toolbar">
       <button data-action="candidate">生成候选</button><button data-action="deploy">部署预发</button><button data-action="test">登记测试证据</button><button class="primary" data-action="promote">晋级正式</button><button class="danger" data-action="rollback">准备回退</button><button data-action="refresh">刷新</button>
     </div><pre id="output">Developer Center 只监听 127.0.0.1；所有动作复用 OpenXiangda CLI 门禁。</pre></article>
@@ -87,9 +88,11 @@ const token=${token}; history.replaceState(null,"",location.pathname);
 const out=document.querySelector("#output"), dialog=document.querySelector("#dialog");
 let status=null, pending=null;
 const esc=v=>String(v??"-").replace(/[&<>"']/g,c=>({"&":"&amp;","<":"&lt;",">":"&gt;","\\"":"&quot;","'":"&#39;"}[c]));
-const rows=e=>[["appType",e?.appType],["公开地址",e?.publicOrigin],["AppRelease",e?.heads?.appReleaseId],["候选版本",e?.latestDeployment?.candidateId],["部署状态",e?.latestDeployment?.status],["副作用策略",JSON.stringify(e?.sideEffectPolicy||{})]].map(([k,v])=>\`<dt>\${esc(k)}</dt><dd>\${esc(v)}</dd>\`).join("");
+const rows=e=>[["appType",e?.appType],["环境修订",e?.revision],["公开地址",e?.publicOrigin],["AppRelease",e?.heads?.appReleaseId],["RuntimeRelease",e?.heads?.runtimeReleaseId],["BackendRelease",e?.heads?.backendReleaseId],["PageRelease",e?.heads?.pageReleaseId],["WorkflowRelease",e?.heads?.workflowReleaseId],["候选版本",e?.latestDeployment?.candidateId],["Deployment",e?.latestDeployment?.id],["部署状态",e?.latestDeployment?.status],["测试证据",e?.latestDeployment?.evidenceHash],["证据有效期",e?.latestDeployment?.evidenceSummary?.validUntil],["副作用策略",JSON.stringify(e?.sideEffectPolicy||{})]].map(([k,v])=>\`<dt>\${esc(k)}</dt><dd>\${esc(v)}</dd>\`).join("");
+const bool=v=>\`<span class="\${v?"gate-ok":"gate-bad"}">\${v?"通过":"阻断"}</span>\`;
+const gateRows=s=>[["权威主线",s?.git?.upstream||"-"],["远端主线提交",s?.git?.remoteHeadCommit],["ahead / behind",\`\${s?.git?.ahead??"-"} / \${s?.git?.behind??"-"}\`],["工作区干净",bool(Boolean(s?.git?.clean))],["其他脏 worktree",s?.git?.dirtyWorktrees?.length?s.git.dirtyWorktrees.join(", "):bool(true)],["Candidate 门禁",bool(Boolean(s?.deliveryGates?.candidateReady))],["预发测试证据",bool(Boolean(s?.deliveryGates?.evidenceValid))],["正式 commissioning",bool(Boolean(s?.deliveryGates?.productionCommissioning))],["同一 AppRelease",bool(Boolean(s?.drift?.sameAppRelease))],["资源差异",s?.drift?.sameAppRelease?"无":"存在（预发/正式 Release Head 不同）"],["OpenXiangda",s?.openxiangdaVersion]].map(([k,v])=>\`<dt>\${esc(k)}</dt><dd>\${typeof v==="string"&&v.startsWith("<span")?v:esc(v)}</dd>\`).join("");
 async function api(path,options={}){const r=await fetch(path,{...options,headers:{"content-type":"application/json","x-openxiangda-studio-token":token,...options.headers}});const j=await r.json();if(!r.ok)throw new Error(j.message||"request failed");return j}
-async function refresh(){try{status=await api("/api/status");document.querySelector("#repo").textContent=\`\${status.git?.branch||"-"} @ \${(status.git?.commit||"-").slice(0,12)} · \${status.git?.clean?"clean":"dirty"}\`;document.querySelector("#pre").innerHTML=rows(status.remote?.environments?.find(e=>e.kind==="preproduction"));document.querySelector("#prod").innerHTML=rows(status.remote?.environments?.find(e=>e.kind==="production"));document.querySelector("#health").textContent="状态已同步";}catch(e){document.querySelector("#health").textContent="读取失败";out.textContent=e.message}}
+async function refresh(){try{status=await api("/api/status");document.querySelector("#repo").textContent=\`\${status.git?.branch||"-"} @ \${(status.git?.commit||"-").slice(0,12)} · \${status.git?.mainlineAligned?"mainline ready":status.git?.clean?"clean / not aligned":"dirty"}\`;document.querySelector("#pre").innerHTML=rows(status.remote?.environments?.find(e=>e.kind==="preproduction"));document.querySelector("#prod").innerHTML=rows(status.remote?.environments?.find(e=>e.kind==="production"));document.querySelector("#gates").innerHTML=gateRows(status);const ready=Boolean(status.deliveryGates?.candidateReady);const badge=document.querySelector("#gate-badge");badge.textContent=ready?"READY":"BLOCKED";badge.className=\`badge \${ready?"gate-ok":"gate-bad"}\`;document.querySelector('[data-action="candidate"]').disabled=!ready;document.querySelector('[data-action="deploy"]').disabled=!ready;document.querySelector('[data-action="test"]').disabled=!status.deliveryGates?.testRegistrationReady;document.querySelector('[data-action="promote"]').disabled=!status.deliveryGates?.promotionReady;document.querySelector('[data-action="rollback"]').disabled=!status.deliveryGates?.rollbackReady;document.querySelector("#health").textContent="状态已同步";}catch(e){document.querySelector("#health").textContent="读取失败";out.textContent=e.message}}
 document.querySelectorAll("[data-action]").forEach(b=>b.onclick=()=>{pending=b.dataset.action;if(pending==="refresh")return refresh();document.querySelector("#dialog-title").textContent=b.textContent;document.querySelector("#value").value="";document.querySelector("#details").value=pending==="test"?JSON.stringify({outcome:"passed",requiredGates:["static","schema","appFunctions","roles","browser","lifecycle","cleanup"],results:{static:{status:"passed"},schema:{status:"passed"},appFunctions:{status:"passed"},roles:{status:"passed"},browser:{status:"passed"},lifecycle:{status:"passed"},cleanup:{status:"passed"}},cleanup:{passed:true,residueCount:0}},null,2):"";dialog.showModal()});
 document.querySelector("#confirm").onclick=async e=>{e.preventDefault();const action=pending;dialog.close();out.textContent="执行中…";try{const result=await api("/api/action",{method:"POST",body:JSON.stringify({action,value:document.querySelector("#value").value,details:document.querySelector("#details").value,confirmProduction:["promote","rollback"].includes(action)})});out.textContent=JSON.stringify(result,null,2);await refresh()}catch(error){out.textContent=error.message}};
 refresh();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.190",
+  "version": "1.0.192",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {
@@ -111,6 +111,7 @@
     "test:page-release-cli": "node scripts/page-release-cli-smoke.mjs",
     "test:app-release-cli": "node scripts/app-release-cli-smoke.mjs",
     "test:application-environments": "node scripts/application-environments-smoke.mjs",
+    "test:developer-center": "node scripts/developer-center-smoke.mjs",
     "test:form-release-cas": "node scripts/form-release-cas-smoke.mjs",
     "test:source-dependencies": "node scripts/source-dependencies-smoke.mjs",
     "test:form-field-contract": "node scripts/form-field-contract-smoke.mjs",