openxiangda 1.0.171 → 1.0.172

package/lib/cli.js

@@ -288,7 +288,7 @@ Usage:
 
 OpenXiangda 应用开发使用普通用户登录 token，不需要 AK/SK；外部后端集成使用 open-api skill 与 AK/SK。
 所有直接配置写入必须携带 --change <id>，或先执行 release begin --change <id>；dry-run、schema-plan、validate、query/invoke 等只读/数据面命令不会获取发布租约。
-正式发布会冻结 clean committed HEAD；上线后必须将该 SHA merge/fast-forward 并 push 到权威远端主分支，integration-status 通过后 normal release end 才会清理会话。
+正式发布只接受已经合并并 push、且与权威远端默认主分支完全一致的 clean HEAD；激活后直接运行 integration-status 与 release end，不再补做发布后合并。
 表单页、流程表单页和代码页的主链路是 sy-lowcode-app-workspace + openxiangda workspace publish。
 新 React SPA 公开访问使用 public-access 命令和 src/resources/public-access；settings public-access 仅用于旧表单公开设置兼容/修复。
 JS_CODE V2 使用 trusted_node；AI 源码必须写在 src/js-code-nodes/<scriptCode>/index.ts，代码自动化源码写在 src/automations/<resourceCode>/index.ts。definition-json 中的 sourceFile.localPath 会在 validate/create/publish 时先 TS 校验、再构建并上传为快照。`);
@@ -10217,7 +10217,7 @@ async function commands(args) {
       'Direct live mutation commands should use --dry-run first and --write-manifest when the repository should remain source of truth.',
       'App Function Secret values never belong in a manifest or workspace file. Use top-level function secretRefs, ctx.secrets.get(name), and secret create/rotate via hidden TTY or --value-stdin.',
       'OpenXiangda native SDD uses openspec/ records; high-risk publishes require an approved change with coverage.json/release.json verification unless --sdd-bypass --reason is used.',
-      'A formal release freezes the clean publish HEAD separately from the change base; after activation merge/fast-forward and push that exact SHA to the authoritative default branch, verify release integration-status, then run release end.',
+      'A formal release only starts from a clean local main/master that exactly equals the authoritative remote tip. Merge and push approved changes first; after activation verify release integration-status, then run release end without a post-release merge.',
     ],
   };
   if (flags.json) return writeJson(manifest);

package/lib/workspace-init.js

@@ -185,13 +185,23 @@ function buildNextSteps(targetDir, installedDependencies, bound, runtime) {
   steps.push(`openxiangda env --profile ${profileArg}`);
   steps.push('git switch -c codex/<change>');
   steps.push('openxiangda sdd propose <change>');
+  steps.push('完成开发、测试、approve 并提交 codex/<change>，不要从 feature worktree 发布');
+  steps.push(
+    'git switch <main-branch> && git merge --no-ff codex/<change> && git push origin <main-branch>'
+  );
+  steps.push(
+    'openxiangda sdd bundle <release-change> --changes <change-a,change-b>'
+  );
+  steps.push(
+    'git add openspec/changes/<release-change> && git commit -m "chore: prepare <release-change>" && git push origin <main-branch>'
+  );
   steps.push(
     runtime === 'react-spa'
-      ? `openxiangda runtime deploy --no-activate --change <change> --profile ${profileArg}`
-      : `openxiangda workspace publish --dry-run --only <exact-codes> --change <change> --profile ${profileArg}`
+      ? `openxiangda runtime deploy --no-activate --change <release-change> --profile ${profileArg}`
+      : `openxiangda workspace publish --dry-run --only <exact-codes> --change <release-change> --profile ${profileArg}`
   );
   steps.push(
-    `发布后将冻结提交 merge/fast-forward 并 push 到主分支，再运行 openxiangda release end --profile ${profileArg}`
+    `原子激活后运行 openxiangda release integration-status --profile ${profileArg}，再运行 openxiangda release end --profile ${profileArg}`
   );
   return steps;
 }

package/package.json

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

package/templates/sy-lowcode-app-workspace/scripts/guard-publish.mjs

@@ -16,7 +16,8 @@ if (!process.env.OPENXIANGDA_PROFILE) {
     '正确入口：',
     '  openxiangda workspace publish --change <change> --profile <name> --only pages/X,forms/Y --dry-run',
     '  openxiangda workspace publish --change <change> --profile <name> --only pages/X,forms/Y',
-    '  发布后 merge/fast-forward 并 push 冻结 SHA，再运行 release integration-status 与 release end',
+    '  先把 approved changes 合并并 push 到默认主分支，再从该 clean HEAD 一次发布',
+    '  激活后运行 release integration-status 与 release end，不再补做发布后合并',
     '',
     '更多说明详见工作区根目录的 AGENTS.md。',
     '',