release-skill 0.6.3 → 0.7.0

package/bin/rules.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "kind": "skill-family.contracts.rules",
-  "contractsVersion": "1.5.0",
+  "contractsVersion": "1.7.0",
   "budget": {
     "firstVersionMax": 20,
     "absoluteMax": 30,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-skill",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "description": "Safe preparation and frozen GitHub/npm production publishing with full happy end verification",
   "author": {
     "name": "广州市风荷科技有限公司"
@@ -78,8 +78,9 @@
     "ajv-formats": "3.0.1",
     "libnpmpublish": "11.1.0",
     "npm-registry-fetch": "18.0.2",
-    "skill-family-contracts": "0.5.0",
-    "skill-family-harness-node": "0.5.0",
+    "skill-family-contracts": "0.8.0",
+    "skill-family-engineering-kit": "0.8.0",
+    "skill-family-harness-node": "0.8.0",
     "yaml": "2.9.0"
   },
   "devDependencies": {
@@ -87,7 +88,7 @@
     "node-gyp": "12.3.0"
   },
   "engines": {
-    "node": ">=22.0.0"
+    "node": ">=22.22.2 <23"
   },
   "keywords": [
     "release",

package/platform-manifest.json

@@ -2,11 +2,11 @@
   "schemaVersion": "1.0.0",
   "platformId": "release-skill",
   "platformName": "release-skill Plugin Platform",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "logicalRoot": "skills-src/",
   "logicalRootDigest": "3767fc36f42ca561f5e839cea7b7e5bc16d08c47867b5bd6086f25efd0cb0f06",
   "projectionDigest": "419f7f9601015459956e10aae74f42240ab2ac248238ff7494f3e761643d1749",
-  "projectionId": "release-skill:platform:0.6.3",
+  "projectionId": "release-skill:platform:0.7.0",
   "manifestRequired": true,
   "projectionSources": {
     "skills-src-root": {

package/references/02-project-config.md

@@ -103,7 +103,7 @@ postPublish:                # 可选；发布后分发配置（W2 closure）
         email: <string>         # RFC 5322 valid
       payloadDir: <string>      # 相对路径
       dryRun?: boolean          # 可选；只本地执行
-      materialize?: {          # 可选；分发前钩子
+      materialize?: {          # 可选；缺省时载荷由冻结 publicFiles 经 Foundation 托管投影物化
         command: <string>       # 可执行文件
         args: [<string>]        # 参数数组，禁止 shell 字符串
         outputMarker?: <string> # 输出标记，用于验证

package/references/06-adapter-contract.md

@@ -170,12 +170,14 @@ marketplace install action 的安装侧载荷校验以 action 参数 `payloadCon
 1. 发布计划已冻结且 schema 验证通过。
 2. 发布计划摘要与批准记录中的摘要匹配。
 3. 批准记录存在且未超过 24 小时有效期。
-4. Git tree hash 与批准记录中的匹配。
+4. 工作区基线按 `planVersion` 分叉校验（与 `01-state-machine.md` §4.4 及根 `AGENTS.md` 的 Release Authorization 语义一致）：
+   - **planVersion 1（旧版）计划**：继续绑定基线——Git tree hash（及 workspace digest）必须与批准记录中的匹配；批准后基线变化即使批准失效，硬失败（`BASELINE_CHANGED`）。
+   - **planVersion 2 计划**：digest 只绑定信任边界（冻结产物身份：git commit/tree、manifestDigest、npm tarball 摘要；外部动作列表；目标版本；配置摘要）。工作区基线（tree hash、workspace digest）是记录层审计数据：不参与 digest、不使批准失效；publish/reconcile 检测到基线漂移时记录 warning 级证据事件并继续执行，产物身份与完整性由外部写之前的冻结产物复验保证。
 5. 目标版本与批准记录中的匹配。
 6. 远端无冲突状态（preflight 通过）。
 7. `context.externalWritesAuthorized === true`。
 
-任一条件不满足时，execute 返回对应错误码（`AUTH_MISSING`、`BASELINE_CHANGED`、`REMOTE_CONFLICT` 等）并拒绝执行。
+任一条件不满足时，execute 返回对应错误码（`AUTH_MISSING`、`BASELINE_CHANGED`（仅 planVersion 1）、`REMOTE_CONFLICT` 等）并拒绝执行。
 
 ### 3.2 批准记录结构
 
@@ -195,6 +197,7 @@ marketplace install action 的安装侧载荷校验以 action 参数 `payloadCon
 
 - `approvedActions` 不得包含通配符。
 - `expiresAt` 不得晚于 `approvedAt` + 24 小时。
+- `baseline` 的约束力按 `planVersion` 分叉（见 §3.1 条件 4）：planVersion 1 计划中它是批准绑定字段；planVersion 2 计划中它只是记录层审计数据，不使批准失效。
 
 ---
 
@@ -234,7 +237,7 @@ marketplace install action 的安装侧载荷校验以 action 参数 `payloadCon
 1. 重新验证发布计划 schema。
 2. 重新验证发布计划摘要。
 3. 检查批准记录是否过期。
-4. 检查 Git tree hash 是否变化。
+4. 按 planVersion 分叉复验工作区基线：planVersion 1 计划基线变化即失败（`BASELINE_CHANGED`）；planVersion 2 计划基线漂移仅记录 warning 级证据事件并继续，产物身份由外部写之前的冻结产物复验保证。
 5. 执行远程 preflight。
 6. 按批准的操作列表顺序执行每个检查点。
 7. 每个检查点：preflight -> execute -> observe -> 记录。

package/schemas/.render-manifest.json

@@ -26,16 +26,16 @@
       "bytes": 1744
     },
     "release-plan.schema.json": {
-      "digest": "517ac9b1d92d2bf348497ee0e79c9e474a4c60e6ed8ba77830948716d143dfa2",
-      "bytes": 49369
+      "digest": "48b7755dfbeee88ccf78c3200000ab2f5dd06db42bc7b423aed0f81a91cc0418",
+      "bytes": 54672
     },
     "release-project.schema.json": {
-      "digest": "d38649d1dc9b1dbc643f4e2c98fd18d111090e9ce221c9c61fa50245f6c4c232",
-      "bytes": 45715
+      "digest": "cc2061799c3a0dd6daea940148e3497b7a4ae8cafb987bf51de7c34c1fed921d",
+      "bytes": 46932
     },
     "release-run.schema.json": {
-      "digest": "a605db801d6994d657049431ad453233974bd10610b7b447b196136bb0692866",
-      "bytes": 17847
+      "digest": "9755a8caa58dd02509ac8e6f869aec5e74d8ae3f7339a3f944977bfad7b729ad",
+      "bytes": 17897
     }
   }
 }

package/schemas/release-plan.schema.json

@@ -1304,9 +1304,8 @@
     },
     "planPostPublish": {
       "type": "object",
-      "description": "冻结的发布后分发块：声明本身 + tag/tagCommit/unitId/payloadSource 绑定。整体参与 plan digest（planVersion 2 记录层剥离不包含该块），任何配置变更都会改变 planDigest。tagCommit 仅在 prepare 能冻结 create-tag 预期 commit 时存在（production 资产）；缺省时 distribute fail-closed。",
+      "description": "冻结的发布后分发块：声明本身 + tag/tagCommit/unitId/payloadSource 绑定。整体参与 plan digest（planVersion 2 记录层剥离不包含该块），任何配置变更都会改变 planDigest。tagCommit 仅在 prepare 能冻结 create-tag 预期 commit 时存在（production 资产）；缺省时 distribute fail-closed。materialize 钩子自 T6 起可选：载荷物化要么由消费者 materialize 钩子完成，要么由冻结 executionBundle.publicFiles 经 Foundation Engineering Kit 托管投影完成（两者至少其一，见 anyOf）。",
       "required": [
-        "materialize",
         "commitIdentity",
         "tag",
         "unitId",
@@ -1376,8 +1375,141 @@
         "payloadSource": {
           "const": "tag-worktree",
           "description": "时序契约：载荷只能来自 tagCommit 处的 detached worktree，绝不读取工作区状态"
+        },
+        "executionBundle": {
+          "type": "object",
+          "description": "冻结的私有执行包（F-01/T1）：closure 直接采用 Foundation computeResourceClosure() 的返回（排序、去重、受收容读取与摘要均由 Foundation 完成），publicFiles 是从发布单元投影的公开映射。计划是该执行包的唯一事实源：随整个 plan digest 绑定，不维护平行 manifest，也不另造 bundle digest。字节写入计划权威 .release-skill 的 postpublish-bundles/<closure.digest>/<resource.path>；distribute/postVerify 在任何 hook/外部写之前经 Foundation 严格复验并重算闭包，任何不一致即失败。",
+          "required": [
+            "foundationMechanism",
+            "closure",
+            "publicFiles"
+          ],
+          "additionalProperties": false,
+          "properties": {
+            "foundationMechanism": {
+              "const": "foundation.harness.resource-closure"
+            },
+            "closure": {
+              "type": "object",
+              "description": "Foundation skill-family.resource-closure（schemaVersion 1）原样冻结",
+              "required": [
+                "schemaVersion",
+                "kind",
+                "digestAlgorithm",
+                "digest",
+                "resources"
+              ],
+              "additionalProperties": false,
+              "properties": {
+                "schemaVersion": {
+                  "const": 1
+                },
+                "kind": {
+                  "const": "skill-family.resource-closure"
+                },
+                "digestAlgorithm": {
+                  "const": "sha256"
+                },
+                "digest": {
+                  "type": "string",
+                  "pattern": "^[a-f0-9]{64}$"
+                },
+                "resources": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "required": [
+                      "path",
+                      "role",
+                      "exists",
+                      "sha256"
+                    ],
+                    "additionalProperties": false,
+                    "properties": {
+                      "path": {
+                        "type": "string",
+                        "minLength": 1,
+                        "pattern": "^(?!/)(?!.*(?:^|/)\\.\\.(?:/|$))(?!.*\\\\).+$"
+                      },
+                      "role": {
+                        "const": "input",
+                        "description": "私有执行输入只有 input 资源；output 角色不属于执行包"
+                      },
+                      "exists": {
+                        "const": true
+                      },
+                      "sha256": {
+                        "type": "string",
+                        "pattern": "^[a-f0-9]{64}$"
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "publicFiles": {
+              "type": "array",
+              "description": "从已通过 schema 与运行时校验的发布单元投影进冻结计划的公开映射（T6 托管投影输入）",
+              "items": {
+                "type": "object",
+                "required": [
+                  "from",
+                  "to",
+                  "mode"
+                ],
+                "additionalProperties": false,
+                "properties": {
+                  "sourceScope": {
+                    "type": "string",
+                    "enum": [
+                      "unit",
+                      "workspace"
+                    ]
+                  },
+                  "from": {
+                    "type": "string",
+                    "minLength": 1,
+                    "pattern": "^(?!/)(?!\\.\\/)(?!.*\\\\)(?!.*:)(?!\\.\\.(/|$))(?!\\.$)(?!.*\\/\\.\\.\\/)(?!.*\\/\\.\\.$)(?!.*\\/\\.\\/)(?!.*\\/\\/)(?!.*\\0)(?!.*\\/\\.$)(?!.*\\/$).*$"
+                  },
+                  "to": {
+                    "type": "string",
+                    "minLength": 1,
+                    "pattern": "^(?!/)(?!\\.\\/)(?!.*\\\\)(?!.*:)(?!\\.\\.(/|$))(?!\\.$)(?!.*\\/\\.\\.\\/)(?!.*\\/\\.\\.$)(?!.*\\/\\.\\/)(?!.*\\/\\/)(?!.*\\0)(?!.*\\/\\.$)(?!.*\\/$).*$"
+                  },
+                  "mode": {
+                    "type": "string",
+                    "enum": [
+                      "preserve"
+                    ]
+                  }
+                }
+              }
+            }
+          }
         }
-      }
+      },
+      "anyOf": [
+        {
+          "required": [
+            "materialize"
+          ]
+        },
+        {
+          "description": "无 materialize 钩子时，冻结的 executionBundle.publicFiles 必须非空：载荷由 Foundation 托管投影物化（F-06/T6）",
+          "required": [
+            "executionBundle"
+          ],
+          "properties": {
+            "executionBundle": {
+              "properties": {
+                "publicFiles": {
+                  "minItems": 1
+                }
+              }
+            }
+          }
+        }
+      ]
     },
     "planPostPublishHook": {
       "type": "object",
@@ -1552,7 +1684,7 @@
         },
         "remoteUrl": {
           "type": "string",
-          "pattern": "^(?:https?|file)://.+\\.git$"
+          "pattern": "^(?:https?|file)://[^@]+\\.git$"
         },
         "visibility": {
           "type": "string",

package/schemas/release-project.schema.json

@@ -886,9 +886,8 @@
     },
     "postPublish": {
       "type": "object",
-      "description": "发布后分发声明：materialize 钩子从冻结 tag 工作树物化载荷，targets 将载荷镜像或渲染市场索引推送到独立 git 远端。分发在 publish 之后由 distribute 命令执行，时序契约禁止读取工作区状态。",
+      "description": "发布后分发声明：载荷要么由 materialize 钩子从冻结 tag 工作树物化，要么（省略 materialize 时）由冻结的 publicFiles 映射经 Foundation Engineering Kit 托管投影物化（F-06/T6）；targets 将载荷镜像或渲染市场索引推送到独立 git 远端。分发在 publish 之后由 distribute 命令执行，时序契约禁止读取工作区状态。",
       "required": [
-        "materialize",
         "commitIdentity"
       ],
       "additionalProperties": false,
@@ -939,6 +938,16 @@
         "assertMainVersionAhead": {
           "type": "boolean",
           "description": "分发前校验主干版本源仍领先于目标版本，防止在已推进的主干上分发旧版本"
+        },
+        "executionFiles": {
+          "type": "array",
+          "description": "私有执行输入闭世界清单（F-01）：仅列出发布后命令需要、但冻结 tag 中不存在的父工作区领域文件；辅助文件（helper）必须显式列入，执行时不做任何临时发现。每个路径经 Foundation 路径分类与受收容读取；列表排序去重后随计划冻结为 executionBundle.closure，字节发布到计划权威 .release-skill 下的摘要寻址目录。tag 中已有的文件继续由 tagCommit 绑定，不得在此声明（执行包不得覆盖 tag 文件）。路径语法只由 schema 做第一层形状检查，最终以运行时 Foundation 分类为准。",
+          "items": {
+            "type": "string",
+            "minLength": 1,
+            "pattern": "^(?!/)(?!.*(?:^|/)\\.\\.(?:/|$))(?!.*\\\\).+$"
+          },
+          "uniqueItems": true
         }
       }
     },
@@ -1129,8 +1138,8 @@
         },
         "remoteUrl": {
           "type": "string",
-          "pattern": "^(?:https?|file)://.+\\.git$",
-          "description": "仅允许 http(s) 或 file（测试传输）且以 .git 结尾的远端 URL"
+          "pattern": "^(?:https?|file)://[^@]+\\.git$",
+          "description": "仅允许 http(s) 或 file（测试传输）且以 .git 结尾的远端 URL；禁止任何 userinfo（user:password@）形态——凭证只属于宿主 git credential helper。schema 只是第一道门，运行时 Git URL 策略（new URL 解析）是最终权威"
         },
         "visibility": {
           "type": "string",

package/src/adapters/distribute-git.mjs

@@ -50,6 +50,12 @@ import {
   createResult,
 } from './contract.mjs';
 import { ReleaseError, GATE_FAILED, REMOTE_CONFLICT, REMOTE_UNAVAILABLE } from '../core/errors.mjs';
+import {
+  checkGitRemoteUrl,
+  describeGitRemoteUrlFailure,
+  isAllowedGitRemoteUrl,
+  redactUrlCredentialsIfPresent,
+} from '../core/git-url-policy.mjs';
 
 const execFile = promisify(execFileCb);
 
@@ -59,8 +65,6 @@ const GIT_TIMEOUT_MS = 120_000;
 const TRANSFER_TIMEOUT_MS = 300_000;
 const TMP_PREFIX = 'release-skill-distribute-';
 
-/** Remote URL pattern: http(s) or file (test transport), .git-suffixed. */
-const SAFE_REMOTE_URL_RE = /^(?:https?|file):\/\/.+\.git$/;
 /** Branch pattern (leading alphanumeric blocks option-like names). */
 const SAFE_BRANCH_RE = /^[A-Za-z0-9][A-Za-z0-9._/-]*$/;
 /** Safe tag characters (belt + braces; prepare already rendered the tag). */
@@ -164,8 +168,8 @@ export function renderMarketplaceIndex(marketplace, params = {}) {
       ...(sha ? { sha } : {}),
     };
   } else {
-    if (typeof dependencyUrl !== 'string' || !SAFE_REMOTE_URL_RE.test(dependencyUrl)) {
-      fail('url form requires the payload-mirror dependency remoteUrl', { dependencyUrl });
+    if (typeof dependencyUrl !== 'string' || !isAllowedGitRemoteUrl(dependencyUrl)) {
+      fail('url form requires the payload-mirror dependency remoteUrl', {});
     }
     source = {
       source: 'url',
@@ -187,11 +191,12 @@ function hasControlChars(value) {
 }
 
 function assertSafeRemoteUrl(remoteUrl) {
-  if (typeof remoteUrl !== 'string' || !SAFE_REMOTE_URL_RE.test(remoteUrl) || hasControlChars(remoteUrl)) {
+  const verdict = checkGitRemoteUrl(remoteUrl);
+  if (!verdict.ok) {
     throw new ReleaseError(
       GATE_FAILED,
-      'distribute remoteUrl must be an http(s)/file URL ending in .git',
-      { remoteUrl },
+      `distribute remoteUrl ${describeGitRemoteUrlFailure(verdict.reason)}`,
+      { reason: verdict.reason },
     );
   }
 }
@@ -302,9 +307,10 @@ export function createDistributeGitAdapter(deps = {}) {
   function probeFailureResult(action, error) {
     const classification = classifyProbeFailure(stderrText(error));
     const code = classification === 'auth' ? REMOTE_CONFLICT : REMOTE_UNAVAILABLE;
+    const safeRemoteUrl = redactUrlCredentialsIfPresent(action.remoteUrl);
     const message = classification === 'auth'
-      ? `remote refused authentication for ${action.remoteUrl}; distribute reuses the host keychain credential and never prompts, reads, or retries credentials`
-      : `cannot reach ${action.remoteUrl} — start VPN / check network; distribute fails closed and never retries with credentials`;
+      ? `remote refused authentication for ${safeRemoteUrl}; distribute reuses the host keychain credential and never prompts, reads, or retries credentials`
+      : `cannot reach ${safeRemoteUrl} — start VPN / check network; distribute fails closed and never retries with credentials`;
     return createResult({
       actionType: action.actionType,
       status: ActionStatus.PREFLIGHT_FAILED,
@@ -312,7 +318,7 @@ export function createDistributeGitAdapter(deps = {}) {
       details: {
         code,
         classification,
-        remoteUrl: action.remoteUrl,
+        remoteUrl: safeRemoteUrl,
         stderrTail: stderrTail(error),
       },
     });
@@ -468,7 +474,7 @@ export function createDistributeGitAdapter(deps = {}) {
       if (existingTag) {
         throw new ReleaseError(
           REMOTE_CONFLICT,
-          `target ${action.remoteUrl} already carries tag ${action.tag} and the content differs; moving an existing tag would be force-equivalent — human decision required`,
+          `target ${redactUrlCredentialsIfPresent(action.remoteUrl)} already carries tag ${action.tag} and the content differs; moving an existing tag would be force-equivalent — human decision required`,
           { targetId: action.targetId, tag: action.tag },
         );
       }

package/src/commands/approve.mjs

@@ -30,7 +30,7 @@ import {
   validateApprovalRecordSchema,
   MAX_APPROVAL_MS,
 } from '../core/approval.mjs';
-import { validatePostPublishApproval } from '../core/postpublish-approval.mjs';
+import { validatePostPublishApproval, derivePostPublishApprovalAuthorityPath } from '../core/postpublish-approval.mjs';
 import { normalizePostPublishHook, effectiveHookRequiresApproval } from '../core/postpublish.mjs';
 import { WORKSPACE_DIGEST_ALGORITHM } from '../core/baseline.mjs';
 
@@ -406,18 +406,14 @@ export async function approvePostPublishHook(options) {
   validatePostPublishApproval(plan, approvalRecord, { clock: clockFn });
 
   // --- Write the digest-addressed authority ---
-  const planDir = dirname(resolve(planPath));
-  const releaseDir = basename(planDir) === 'plans' && basename(planPath) === `${actualDigest}.json`
-    ? dirname(planDir)
-    : planDir;
   const json = JSON.stringify(approvalRecord, null, 2);
   const approvalDigest = computeApprovalDigest(json);
-  const immutableApprovalPath = resolve(
-    releaseDir,
-    'approvals',
-    'postpublish',
+  // Single authority-layout source (core/postpublish-approval.mjs): the
+  // consumer-side assertion derives the exact same path fail-closed.
+  const { authorityPath: immutableApprovalPath } = derivePostPublishApprovalAuthorityPath(
+    planPath,
     actualDigest,
-    `${approvalDigest}.json`,
+    approvalDigest,
   );
   await prepareAuthorityDirectory(dirname(immutableApprovalPath));
   await assertAuthorityFileTarget(immutableApprovalPath);