kld-sdd 2.7.3 → 2.7.8

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,25 +4,24 @@
 # 删除某行 = 禁用该插件
 # 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
+spec_path=$(git -C "$git_root" config --local sdd.specPath 2>/dev/null)
+if [ -n "$spec_path" ]; then
+  case "$spec_path" in /*) ;; *) spec_path="$git_root/$spec_path" ;; esac
   hooks_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:]]*$//')
+  case "$spec_rel" in /*) hooks_dir="$spec_rel/skywalk-sdd/git-hooks" ;; *) hooks_dir="$git_root/$spec_rel/skywalk-sdd/git-hooks" ;; esac
 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 仓本身或父级）
@@ -51,8 +50,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 +71,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 +80,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