kld-sdd 2.7.3 → 2.7.8-2

package/skywalk-sdd/ontology/runtime.cjs

@@ -417,8 +417,10 @@ function createArchiveSnapshot(projectRoot, changeName, archiveDir, inputState)
   }
   const snapshotId = `SNAP-${sha256(`${changeName}:${state.revision}`).slice(0, 16).toUpperCase()}`;
   const targetPath = path.join(targetDir, 'archive-ontology.json');
-  const previous = fs.existsSync(targetPath)
-    ? JSON.parse(fs.readFileSync(targetPath, 'utf8'))
+  const cachePath = path.join(statePaths(projectRoot, changeName).dir, 'snapshots', `${state.revision}.json`);
+  const previousPath = fs.existsSync(cachePath) ? cachePath : targetPath;
+  const previous = fs.existsSync(previousPath)
+    ? JSON.parse(fs.readFileSync(previousPath, 'utf8'))
     : null;
   const previousEntity = previous && previous.source_revision === state.revision
     ? (previous.entities || []).find((entity) => entity.type === 'OntologySnapshot')
@@ -458,12 +460,14 @@ function createArchiveSnapshot(projectRoot, changeName, archiveDir, inputState)
     snapshot_id: snapshotId,
     snapshot_entity_id: snapshotEntity.entity_id,
     source_revision: state.revision,
-    confirmed_at: new Date().toISOString(),
+    confirmed_at: previous && previous.source_revision === state.revision
+      ? previous.confirmed_at : new Date().toISOString(),
     entities: [
       ...(state.entities || []).filter((entity) => entity.type !== 'OntologySnapshot'),
       snapshotEntity,
     ],
   };
+  atomicWriteIfChanged(cachePath, snapshot);
   atomicWriteIfChanged(targetPath, snapshot);
   return snapshot;
 }

package/skywalk-sdd/ontology/schema.cjs

@@ -114,6 +114,8 @@ const DIAGNOSTIC_CODES = Object.freeze({
   NUMBERING_WAIVER_ACTIVE: 'NUMBERING_WAIVER_ACTIVE',
   CONTINUITY_DECISION_REQUIRED: 'CONTINUITY_DECISION_REQUIRED',
   CONTINUITY_IDENTITY_MISMATCH: 'CONTINUITY_IDENTITY_MISMATCH',
+  TASK_DEPENDENCY_LAYER_GAP: 'SEM_TASK_DEPENDENCY_LAYER_GAP',
+  TASK_DEPENDENCY_MISSING_EDGE: 'SEM_TASK_DEPENDENCY_MISSING_EDGE',
 });
 
 function normalizeProfile(profile, inferredProfile = 'simple') {

package/skywalk-sdd/ontology/traceability-validator.cjs

@@ -113,7 +113,7 @@ function validateIdentitySemantics(facts, diagnostics, identityHistory) {
     }
 
     const entityOwner = currentByEntityId.get(entity.entity_id);
-    if (entityOwner && (entityOwner.id !== entity.id || entityOwner.type !== entity.type)) {
+    if (entityOwner && (entityOwner.type !== entity.type)) {
       diagnostics.push(diagnostic(
         DIAGNOSTIC_CODES.ENTITY_IDENTITY_CONFLICT,
         'error',
@@ -165,7 +165,7 @@ function validateIdentitySemantics(facts, diagnostics, identityHistory) {
     const priorAnchors = historyByAnchor.get(entity.anchor_id || entity.id) || [];
     const priorVersion = historyByVersionId.get(entity.version_id);
 
-    if (priorEntities.some((record) => record.anchor_id !== entity.id || record.type !== entity.type)
+    if (priorEntities.some((record) => record.type !== entity.type)
       || priorAnchors.some((record) => record.entity_id !== entity.entity_id)) {
       diagnostics.push(diagnostic(
         DIAGNOSTIC_CODES.ENTITY_IDENTITY_CONFLICT,
@@ -220,8 +220,8 @@ function validateIdentitySemantics(facts, diagnostics, identityHistory) {
       if (knownSuccessor) {
         diagnostics.push(diagnostic(
           DIAGNOSTIC_CODES.VERSION_LINEAGE_CONFLICT,
-          'error',
-          `同一 predecessor 已存在后继版本，禁止并行或陈旧分支: ${entity.id}`,
+          knownSuccessor.scope === 'active' ? 'warning' : 'error',
+          `同一 predecessor 存在其他后继；草稿可并行，发布前必须解决基线冲突: ${entity.id}`,
           { ...context, suggestion: `以 ${knownSuccessor.change} 的版本为直接前序；不要再次继承已消费的 predecessor` },
         ));
       }
@@ -922,6 +922,8 @@ function validateTraceability(facts, options = {}) {
     ));
   }
 
+  validateTaskLayerSemantics(graphEntities, graphRelations, diagnostics);
+
   diagnostics.sort((left, right) => (
     String(left.code).localeCompare(String(right.code))
     || String(left.file || '').localeCompare(String(right.file || ''))
@@ -943,10 +945,78 @@ function validateTraceability(facts, options = {}) {
   };
 }
 
+function inferTaskLayer(task) {
+  const attrs = task.attributes || {};
+  if (typeof attrs.layer === 'number') return attrs.layer;
+
+  const id = String(task.id || '').toUpperCase();
+  const desc = String(task.description || task.title || '').toUpperCase();
+  const text = `${id} ${desc}`;
+
+  const patterns = [
+    { layer: 0, keywords: ['DEPS', 'DEPEND', 'CONFIG', 'POM', 'GRADLE', 'CONST'] },
+    { layer: 1, keywords: ['ENTITY', 'DTO', 'ENUM', 'VO', 'MODEL'] },
+    { layer: 2, keywords: ['MAPPER', 'REPO', 'REPOSITORY', 'DAO'] },
+    { layer: 3, keywords: ['SERVICE-IF', 'SERVICE_IF', 'INTERFACE'] },
+    { layer: 4, keywords: ['IMPL', 'SERVICE', 'HANDLER', 'PROCESSOR'] },
+    { layer: 5, keywords: ['CONTROLLER', 'API', 'RESOURCE', 'ENDPOINT'] },
+    { layer: 6, keywords: ['TEST', 'VERIFY', 'VALIDATE', 'SPEC'] },
+  ];
+
+  for (const { layer, keywords } of patterns) {
+    if (keywords.some((kw) => text.includes(kw))) return layer;
+  }
+  return null;
+}
+
+function validateTaskLayerSemantics(graphEntities, graphRelations, diagnostics) {
+  const tasks = graphEntities.filter((entity) => entity.type === 'Task' && entity.delta_state !== 'removed');
+  if (tasks.length === 0) return;
+
+  const taskById = new Map();
+  for (const task of tasks) taskById.set(task.id, task);
+
+  const dependsOnMap = new Map();
+  for (const relation of graphRelations) {
+    if (relation.type !== 'dependsOn') continue;
+    if (!dependsOnMap.has(relation.from)) dependsOnMap.set(relation.from, new Set());
+    dependsOnMap.get(relation.from).add(relation.to);
+  }
+
+  const layerByTask = new Map();
+  for (const task of tasks) {
+    const layer = inferTaskLayer(task);
+    if (layer !== null) layerByTask.set(task.id, layer);
+  }
+
+  for (const [taskId, layer] of layerByTask.entries()) {
+    if (layer <= 0) continue;
+    const deps = dependsOnMap.get(taskId) || new Set();
+
+    for (const [otherId, otherLayer] of layerByTask.entries()) {
+      if (otherId === taskId) continue;
+      if (otherLayer >= layer) continue;
+      if (!deps.has(otherId)) {
+        diagnostics.push(diagnostic(
+          DIAGNOSTIC_CODES.TASK_DEPENDENCY_LAYER_GAP,
+          'warning',
+          `Task ${taskId} (Layer ${layer}) 可能缺少对 Layer ${otherLayer} 任务 ${otherId} 的依赖`,
+          {
+            entity_id: taskId,
+            suggestion: `若 ${taskId} 引用或依赖 ${otherId} 的定义，建议添加 dependsOn: ${otherId}`,
+          },
+        ));
+      }
+    }
+  }
+}
+
 module.exports = {
   diagnostic,
   findTaskCycles,
   validateIdentitySemantics,
   validateInheritedReferences,
   validateTraceability,
+  validateTaskLayerSemantics,
+  inferTaskLayer,
 };

package/skywalk-sdd/ontology/workspace-layout.cjs

@@ -26,11 +26,17 @@ function isGitRepo(dir) {
 
 function looksLikeSpecRepo(dir) {
   const name = path.basename(dir).toLowerCase();
+  // 命名约定：*-sdd-specs 目录名直接命中
   if (/-sdd-specs$/.test(name) || name.endsWith('sdd-specs')) return true;
-  if (fs.existsSync(path.join(dir, 'modules.yaml'))) return true;
-  if (fs.existsSync(path.join(dir, 'openspec', 'changes'))) return true;
-  if (fs.existsSync(path.join(dir, 'openspec', 'specs', 'overview.md'))) return true;
-  return false;
+  // 结构判据（四项同时满足）：
+  // modules.yaml（模块登记）+ sdd.config.yaml（活动变更登记）
+  // + openspec/changes（变更结构）+ openspec/specs/overview.md（全局契约）
+  return (
+    fs.existsSync(path.join(dir, 'modules.yaml'))
+    && fs.existsSync(path.join(dir, 'sdd.config.yaml'))
+    && fs.existsSync(path.join(dir, 'openspec', 'changes'))
+    && fs.existsSync(path.join(dir, 'openspec', 'specs', 'overview.md'))
+  );
 }
 
 function listChildGitRepos(workspaceRoot) {
@@ -231,7 +237,10 @@ function findNestedSpecPackage(parentDir) {
 function ensureSpecPackage(parentDir, options = {}) {
   const { execFileSync } = require('child_process');
   const root = path.resolve(parentDir);
-  const existing = findNestedSpecPackage(root);
+  // 显式指定目录名（--spec-path）时，以该路径为准，不再回退到"探测到的其它 spec 包"，
+  // 避免用户想指定 erp-sdd-specs 却被同级已存在的 *-sdd-specs 抢占。
+  const explicit = Boolean(options.name);
+  const existing = explicit ? null : findNestedSpecPackage(root);
   if (existing) {
     return {
       name: existing.name,
@@ -243,6 +252,17 @@ function ensureSpecPackage(parentDir, options = {}) {
 
   const name = options.name || deriveSpecPackageName(root);
   const abs = path.join(root, name);
+
+  // 显式路径且该目录本身已存在并具备 spec 包特征 → 直接复用（幂等）
+  if (explicit && fs.existsSync(abs) && looksLikeSpecRepo(abs)) {
+    return {
+      name,
+      abs,
+      created: false,
+      isGit: isGitRepo(abs),
+    };
+  }
+
   const existed = fs.existsSync(abs);
   fs.mkdirSync(abs, { recursive: true });
 

package/skywalk-sdd/reporting/change-report-model.cjs

@@ -273,7 +273,8 @@ function normalizeEvidenceSummary(report) {
     })),
   ];
   const issueByKey = new Map();
-  history.map(normalizeIssue).forEach((issue) => {
+  // 显式只传元素，避免 map 的 index/array 参数透传（S6544 类）
+  history.map(issue => normalizeIssue(issue)).forEach((issue) => {
     const stableKey = issue.issue_id
       || `${issue.code}:${issue.task_id || issue.pair_id || issue.subject || 'change'}`;
     const previous = issueByKey.get(stableKey);
@@ -369,8 +370,8 @@ function normalizeChangedFiles(changedFiles = {}) {
     ?? null;
   const taskSet = new Set(taskEventFiles || []);
   const finalSet = new Set(finalOutputFiles || []);
-  const onlyInTaskEvents = [...taskSet].filter(file => !finalSet.has(file)).sort();
-  const onlyInFinalOutput = [...finalSet].filter(file => !taskSet.has(file)).sort();
+  const onlyInTaskEvents = [...taskSet].filter(file => !finalSet.has(file)).sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
+  const onlyInFinalOutput = [...finalSet].filter(file => !taskSet.has(file)).sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
   const countsDiffer = taskCount != null && finalCount != null && taskCount !== finalCount;
   const listsDiffer = taskEventFiles != null
     && finalOutputFiles != null

package/templates/git-hooks/commit-msg

@@ -4,36 +4,49 @@
 # 删除某行 = 禁用该插件
 # marker: KLD SDD quality gate
 
-# 从 hook 所在目录推算 git 根目录
-hook_dir="$(cd "$(dirname "$0")" && pwd)"
-git_dir="$(dirname "$hook_dir")"
-git_root="$(dirname "$git_dir")"
-
+# Git supplies the working tree context; this also supports worktrees and core.hooksPath.
+git_root=$(git rev-parse --show-toplevel 2>/dev/null) || {
+  echo "[SDD] 无法定位当前 Git 工作区"
+  exit 1
+}
 hooks_dir=""
-
-# 方法1: git config sdd.specPath（多仓布局：spec 是独立 clone）
-spec_path=$(git config --local sdd.specPath 2>/dev/null)
-if [ -n "$spec_path" ] && [ -d "$spec_path/skywalk-sdd/git-hooks" ]; then
-  hooks_dir="$spec_path/skywalk-sdd/git-hooks"
+# 统一反斜杠为正斜杠，保证 Windows 盘符路径（P:\a\b → P:/a/b）能被 case 判定为绝对路径
+normalize_path() {
+  printf '%s' "$1" | tr '\\' '/'
+}
+# 绝对路径（/ 开头或盘符 X: 开头）直接使用；相对路径基于 git 根拼接
+resolve_spec_dir() {
+  raw=$(normalize_path "$1")
+  case "$raw" in
+    /*|[A-Za-z]:*) printf '%s' "$raw" ;;
+    *) printf '%s' "$git_root/$raw" ;;
+  esac
+}
+spec_path=$(git -C "$git_root" config --local sdd.specPath 2>/dev/null)
+if [ -n "$spec_path" ]; then
+  hooks_dir="$(resolve_spec_dir "$spec_path")/skywalk-sdd/git-hooks"
+elif [ -f "$git_root/.sdd-spec-root" ]; then
+  spec_rel=$(head -1 "$git_root/.sdd-spec-root" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+  hooks_dir="$(resolve_spec_dir "$spec_rel")/skywalk-sdd/git-hooks"
 fi
-
-# 方法2: .sdd-spec-root（单仓 mono 布局：skywalk-sdd 在 spec 包裹包子目录内）
-if [ -z "$hooks_dir" ] && [ -f "$git_root/.sdd-spec-root" ]; then
-  spec_rel=$(cat "$git_root/.sdd-spec-root" | head -1 | tr -d '[:space:]')
-  if [ -n "$spec_rel" ] && [ -d "$git_root/$spec_rel/skywalk-sdd/git-hooks" ]; then
-    hooks_dir="$git_root/$spec_rel/skywalk-sdd/git-hooks"
-  fi
+if [ -n "$hooks_dir" ] && [ ! -d "$hooks_dir" ]; then
+  echo "[SDD] 已配置的 Spec 路径失效：$hooks_dir"
+  echo "[SDD] 请恢复 Spec 仓，或修正 sdd.specPath / .sdd-spec-root 后重试"
+  exit 1
 fi
 
 # 方法3: 从 git 根向上搜索 skywalk-sdd/git-hooks（spec 仓本身或父级）
 if [ -z "$hooks_dir" ]; then
   search_dir="$git_root"
-  while [ "$search_dir" != "/" ] && [ "$search_dir" != "" ]; do
+  while [ -n "$search_dir" ] && [ "$search_dir" != "/" ]; do
     if [ -d "$search_dir/skywalk-sdd/git-hooks" ]; then
       hooks_dir="$search_dir/skywalk-sdd/git-hooks"
       break
     fi
-    search_dir="$(dirname "$search_dir")"
+    # Windows 盘符根（P:/）dirname 后不变，需显式收敛，避免死循环
+    parent_dir="$(dirname "$search_dir")"
+    [ "$parent_dir" = "$search_dir" ] && break
+    search_dir="$parent_dir"
   done
 fi
 
@@ -51,8 +64,9 @@ else
   # 读取 [commit-msg] 段落的配置
   in_section=0
   SCRIPTS=""
+  CR=$(printf '\r')
   while IFS= read -r line; do
-    line=$(printf '%s' "$line" | tr -d '\r')
+    line=${line%"$CR"}
     case "$line" in
       "[commit-msg]") in_section=1 ;;
       "["*) in_section=0 ;;
@@ -71,7 +85,8 @@ failed=0
 for script_name in $SCRIPTS; do
   script="$hooks_dir/$script_name"
   if [ ! -f "$script" ]; then
-    echo "[SDD] ⚠️  插件不存在：$script_name"
+    echo "[SDD] ❌ 已配置的插件不存在：$script_name"
+    failed=$((failed + 1))
     continue
   fi
   executed=$((executed + 1))
@@ -79,11 +94,11 @@ for script_name in $SCRIPTS; do
   node "$script" "$1" --project="$git_root" || failed=$((failed + 1))
 done
 
-if [ "$executed" -eq 0 ]; then
-  echo "[SDD] 无 commit-msg 插件，跳过"
-elif [ "$failed" -gt 0 ]; then
+if [ "$failed" -gt 0 ]; then
   echo "[SDD] ❌ 共执行 $executed 个 commit-msg 插件，$failed 个失败"
   exit 1
+elif [ "$executed" -eq 0 ]; then
+  echo "[SDD] 配置已禁用 commit-msg 插件"
 else
   echo "[SDD] ✅ 共执行 $executed 个 commit-msg 插件，全部通过"
 fi