kld-sdd 2.6.21 → 2.7.3

package/templates/git-hooks/pre-commit

@@ -1,7 +1,7 @@
 #!/bin/sh
 # KLD SDD Pre-Commit Hook
-# 远程引用 spec 仓 skywalk-sdd/git-hooks/ 下的 .cjs 脚本
-# 兼容单仓库/多仓库/单仓mono布局
+# 在下方 SCRIPTS 列表中声明要加载的 .cjs 脚本
+# 删除某行 = 禁用该插件
 # marker: KLD SDD quality gate
 
 # 从 hook 所在目录推算 git 根目录
@@ -38,20 +38,54 @@ if [ -z "$hooks_dir" ]; then
 fi
 
 if [ -z "$hooks_dir" ]; then
-  echo "[SDD] 未找到 spec 仓的 skywalk-sdd/git-hooks 目录，跳过 pre-commit 检查"
+  echo "[SDD] 未找到 spec 仓的 skywalk-sdd/git-hooks 目录，跳过 pre-commit"
   exit 0
 fi
 
 echo "[SDD] 执行提交前检查..."
 
-# 1. tasks.md 完成度检查
-if [ -f "$hooks_dir/pre-commit-sdd-check.cjs" ]; then
-  node "$hooks_dir/pre-commit-sdd-check.cjs" --project="$git_root" "$@" || exit 1
+# 从配置文件读取插件列表
+config_file="$hooks_dir/hooks.config"
+if [ ! -f "$config_file" ]; then
+  echo "[SDD] ️  配置文件不存在：hooks.config，使用默认插件"
+  SCRIPTS="pre-commit-sdd-check.cjs pre-commit-consistency-check.cjs"
+else
+  # 读取 [pre-commit] 段落的配置
+  in_section=0
+  SCRIPTS=""
+  while IFS= read -r line; do
+    line=$(printf '%s' "$line" | tr -d '\r')
+    case "$line" in
+      "[pre-commit]") in_section=1 ;;
+      "["*) in_section=0 ;;
+      "#"*|"") ;;
+      *)
+        if [ "$in_section" -eq 1 ]; then
+          SCRIPTS="$SCRIPTS $line"
+        fi
+        ;;
+    esac
+  done < "$config_file"
 fi
 
-# 2. 代码-spec 一致性检查
-if [ -f "$hooks_dir/pre-commit-consistency-check.cjs" ]; then
-  node "$hooks_dir/pre-commit-consistency-check.cjs" --project="$git_root" "$@" || exit 1
-fi
+executed=0
+failed=0
+for script_name in $SCRIPTS; do
+  script="$hooks_dir/$script_name"
+  if [ ! -f "$script" ]; then
+    echo "[SDD] ⚠️  插件不存在：$script_name"
+    continue
+  fi
+  executed=$((executed + 1))
+  echo "[SDD] 执行 pre-commit 插件：$script_name"
+  node "$script" --project="$git_root" "$@" || failed=$((failed + 1))
+done
 
-echo "[SDD] ✅ 所有 pre-commit 检查通过"
+if [ "$executed" -eq 0 ]; then
+  echo "[SDD] 无 pre-commit 插件，跳过"
+elif [ "$failed" -gt 0 ]; then
+  echo "[SDD] ❌ 共执行 $executed 个 pre-commit 插件，$failed 个失败"
+  exit 1
+else
+  echo "[SDD] ✅ 共执行 $executed 个 pre-commit 插件，全部通过"
+fi

package/templates/git-hooks/pre-push

@@ -1,7 +1,7 @@
 #!/bin/sh
 # KLD SDD Pre-Push Hook
-# 远程引用 spec 仓 skywalk-sdd/git-hooks/ 下的 .cjs 脚本
-# 兼容单仓库/多仓库/单仓mono布局
+# 在下方 SCRIPTS 列表中声明要加载的 .cjs 脚本
+# 删除某行 = 禁用该插件
 # marker: KLD SDD quality gate
 
 # 从 hook 所在目录推算 git 根目录
@@ -38,20 +38,62 @@ if [ -z "$hooks_dir" ]; then
 fi
 
 if [ -z "$hooks_dir" ]; then
-  echo "[SDD] 未找到 spec 仓的 skywalk-sdd/git-hooks 目录，跳过 pre-push 检查"
+  echo "[SDD] 未找到 spec 仓的 skywalk-sdd/git-hooks 目录，跳过 pre-push"
   exit 0
 fi
 
 echo "[SDD] 执行推送前检查..."
 
-# 1. doctor 质量门禁检查
-if [ -f "$hooks_dir/pre-push-sdd-check.cjs" ]; then
-  node "$hooks_dir/pre-push-sdd-check.cjs" --project="$git_root" "$@" || exit 1
-fi
+# 保存 pre-push stdin（Git 标准输入：local_ref local_sha remote_ref remote_sha）
+# 供下游 .cjs 读取本次 push 的 commit 范围
+SDD_PRE_PUSH_REFS=""
+while IFS= read -r line; do
+  SDD_PRE_PUSH_REFS="${SDD_PRE_PUSH_REFS}${line}\n"
+done
+export SDD_PRE_PUSH_REFS
 
-# 2. 代码-spec 一致性检查（推送前更严格）
-if [ -f "$hooks_dir/pre-push-consistency-check.cjs" ]; then
-  node "$hooks_dir/pre-push-consistency-check.cjs" --project="$git_root" "$@" || exit 1
+# 从配置文件读取插件列表
+config_file="$hooks_dir/hooks.config"
+if [ ! -f "$config_file" ]; then
+  echo "[SDD] ⚠️  配置文件不存在：hooks.config，使用默认插件"
+  SCRIPTS="pre-push-sdd-check.cjs pre-push-consistency-check.cjs"
+else
+  # 读取 [pre-push] 段落的配置
+  in_section=0
+  SCRIPTS=""
+  while IFS= read -r line; do
+    line=$(printf '%s' "$line" | tr -d '\r')
+    case "$line" in
+      "[pre-push]") in_section=1 ;;
+      "["*) in_section=0 ;;
+      "#"*|"") ;;
+      *)
+        if [ "$in_section" -eq 1 ]; then
+          SCRIPTS="$SCRIPTS $line"
+        fi
+        ;;
+    esac
+  done < "$config_file"
 fi
 
-echo "[SDD] ✅ 所有 pre-push 检查通过"
+executed=0
+failed=0
+for script_name in $SCRIPTS; do
+  script="$hooks_dir/$script_name"
+  if [ ! -f "$script" ]; then
+    echo "[SDD] ⚠️  插件不存在：$script_name"
+    continue
+  fi
+  executed=$((executed + 1))
+  echo "[SDD] 执行 pre-push 插件：$script_name"
+  node "$script" --project="$git_root" "$@" || failed=$((failed + 1))
+done
+
+if [ "$executed" -eq 0 ]; then
+  echo "[SDD] 无 pre-push 插件，跳过"
+elif [ "$failed" -gt 0 ]; then
+  echo "[SDD] ❌ 共执行 $executed 个 pre-push 插件，$failed 个失败"
+  exit 1
+else
+  echo "[SDD] ✅ 共执行 $executed 个 pre-push 插件，全部通过"
+fi

package/templates/git-hooks/pre-push-consistency-check.cjs

@@ -39,6 +39,101 @@ function discoverActiveChanges(specRoot) {
   });
 }
 
+// --- Push 范围收敛 ---
+
+/**
+ * 读取 pre-push 引用范围。
+ * 优先从 shell hook 通过环境变量 SDD_PRE_PUSH_REFS 传入（shell hook 已消费 stdin），
+ * 降级时尝试直接读 stdin。
+ */
+function readPushRefLines() {
+  const envRefs = process.env.SDD_PRE_PUSH_REFS;
+  if (envRefs) {
+    // shell hook 用 \n 字面量拼接，也可能含真实换行符
+    return envRefs.split(/\\n|\n/).filter(Boolean);
+  }
+
+  try {
+    if (process.stdin.isTTY) return [];
+    const buffer = fs.readFileSync(0, 'utf8'); // fd 0 = stdin
+    return buffer.split(/\r?\n/).filter(Boolean);
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * 从 pre-push stdin 行解析 commit 范围，获取本次 push 实际变更的文件列表
+ */
+function getPushRangeFiles(projectRoot) {
+  const lines = readPushRefLines();
+  if (lines.length === 0) return null;
+
+  const files = new Set();
+  for (const line of lines) {
+    const parts = line.split(/\s+/);
+    if (parts.length < 4) continue;
+    const localSha = parts[1];
+    const remoteSha = parts[3];
+
+    // 删除分支：localSha 为全 0
+    if (localSha === '0000000000000000000000000000000000000000') continue;
+
+    try {
+      let diffFiles;
+      if (remoteSha === '0000000000000000000000000000000000000000') {
+        // 新建分支：用 git show 获取该 commit 引入的文件
+        diffFiles = execFileSync('git', ['show', '--name-only', '--pretty=format:', localSha], {
+          cwd: projectRoot, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'],
+        }).split(/\r?\n/).filter(Boolean);
+      } else {
+        // 已有分支：用 git diff 获取范围变更
+        diffFiles = execFileSync('git', ['diff', `${remoteSha}..${localSha}`, '--name-only'], {
+          cwd: projectRoot, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'],
+        }).split(/\r?\n/).filter(Boolean);
+      }
+      for (const f of diffFiles) files.add(f.replace(/\\/g, '/'));
+    } catch {
+      // 单个 ref 失败不阻断，继续处理其他 ref
+    }
+  }
+
+  return files.size > 0 ? Array.from(files) : null;
+}
+
+function normalizePath(filePath) {
+  return filePath.replace(/\\/g, '/');
+}
+
+function getChangeNameFromPath(filePath) {
+  const normalized = normalizePath(filePath);
+  const match = normalized.match(/^openspec\/changes\/([^/]+)\//);
+  return match ? match[1] : '';
+}
+
+/**
+ * 从 push 的变更文件列表中提取涉及的 change name
+ */
+function discoverChangesFromPushFiles(projectRoot, specRoot) {
+  const pushFiles = getPushRangeFiles(projectRoot);
+  if (!pushFiles) return null; // 降级信号
+
+  const changes = new Set();
+  for (const file of pushFiles) {
+    const changeName = getChangeNameFromPath(file);
+    if (changeName) changes.add(changeName);
+  }
+
+  if (changes.size === 0) {
+    console.log('[SDD push-consistency-check] 本次 push 不涉及 openspec 变更，跳过');
+    process.exit(0);
+  }
+
+  // 过滤掉已归档的 change
+  const activeChanges = new Set(discoverActiveChanges(specRoot));
+  return Array.from(changes).filter(cn => activeChanges.has(cn));
+}
+
 // --- 报告查找与解析 ---
 
 function findReport(specRoot, changeName, type) {
@@ -259,13 +354,28 @@ function main() {
 
   const specRoot = resolveSpecRoot();
 
-  const changes = discoverActiveChanges(specRoot);
+  // 优先尝试按本次 push 范围收敛变更
+  let changes = discoverChangesFromPushFiles(projectRoot, specRoot);
+  let modifiedFiles = null;
+
+  if (changes === null) {
+    // 降级：stdin 读取失败，回退到现有行为
+    console.log('[SDD push-consistency-check] 无法读取 push 范围，降级为全量检查');
+    changes = discoverActiveChanges(specRoot);
+    modifiedFiles = getModifiedFiles(projectRoot);
+  } else if (changes.length === 0) {
+    console.log('[SDD push-consistency-check] 无相关活跃变更，跳过');
+    process.exit(0);
+  } else {
+    // 收敛成功：用 push 范围文件做过期判定
+    modifiedFiles = getPushRangeFiles(projectRoot) || [];
+  }
+
   if (!changes.length) {
     console.log('[SDD push-consistency-check] 无活跃变更，跳过');
     process.exit(0);
   }
 
-  const modifiedFiles = getModifiedFiles(projectRoot);
   const missing = [];
   const stale = [];
   const needsConfirmation = [];

package/lib/device-auth-cli.js

@@ -1,130 +0,0 @@
-// kld-T03 — auth 子命令 CLI 薄层
-// 仅做参数解析、交互提示与退出码；业务逻辑在 lib/device-auth.js + skywalk-sdd/lib/user-config.cjs
-'use strict';
-
-const readline = require('node:readline');
-
-const {
-  resolveServer,
-  runDeviceFlow,
-  DEFAULT_SERVER_URL,
-} = require('./device-auth.js');
-const {
-  readUserConfig,
-  clearUserToken,
-  redactToken,
-  USER_CONFIG_VERSION,
-} = require('../skywalk-sdd/lib/user-config.cjs');
-const { normalizeServerUrl } = require('../skywalk-sdd/lib/usage-contract.cjs');
-
-async function ask(rl, question) {
-  return new Promise((resolve) => rl.question(question, (answer) => resolve(answer.trim())));
-}
-
-async function cmdStatus() {
-  const cfg = readUserConfig();
-  if (!cfg || !cfg.token) {
-    console.log('未绑定平台账号。');
-    console.log('使用 `kld-sdd auth login` 完成 Device Flow 绑定。');
-    return 0;
-  }
-  console.log('已绑定平台账号：');
-  console.log(`  server:   ${cfg.server || '(未设置)'}`);
-  console.log(`  userName: ${cfg.userName || '(未知)'}`);
-  console.log(`  boundAt:  ${cfg.boundAt || '(未知)'}`);
-  console.log(`  token:    ${redactToken(cfg.token)}`);
-  return 0;
-}
-
-async function cmdLogout() {
-  const removed = clearUserToken();
-  if (removed) {
-    console.log('✅ 已清除本地绑定（其他配置保留）。');
-  } else {
-    console.log('未检测到已绑定 token。');
-  }
-  return 0;
-}
-
-async function cmdLogin(args) {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  try {
-    // 解析 server：已有绑定 → env → 交互输入
-    let server = resolveServer();
-    const forceArg = args.find((a) => a.startsWith('--server='));
-    if (forceArg) {
-      const normalized = normalizeServerUrl(forceArg.slice('--server='.length));
-      if (!normalized) {
-        console.error('❌ --server 必须是 http/https URL');
-        return 1;
-      }
-      server = normalized;
-    }
-    if (!server) {
-      const answer = await ask(rl, `请输入平台地址（http/https，回车默认 ${DEFAULT_SERVER_URL}）：`);
-      const normalized = normalizeServerUrl(answer || DEFAULT_SERVER_URL);
-      if (!normalized) {
-        console.error('❌ 非法地址，必须 http/https');
-        return 1;
-      }
-      server = normalized;
-    }
-
-    const existing = readUserConfig();
-    if (existing && existing.token && existing.server === server) {
-      const answer = await ask(rl, `已绑定 ${server}（userName=${existing.userName || '未知'}），是否更新绑定？[y/N] `);
-      if (!/^[yY]/.test(answer)) {
-        console.log('保留原有绑定。');
-        return 0;
-      }
-    }
-
-    const pkg = require('../package.json');
-    console.log(`正在通过 Device Flow 绑定到 ${server} ...`);
-    const ac = new AbortController();
-    const sigint = () => { ac.abort(); };
-    process.on('SIGINT', sigint);
-    try {
-      const result = await runDeviceFlow({
-        server,
-        clientName: 'kld-sdd',
-        clientVersion: pkg && pkg.version ? String(pkg.version) : 'unknown',
-        onPrint: (msg) => console.log(msg),
-        signal: ac.signal,
-      });
-      if (result.status === 'bound') {
-        console.log('✅ 绑定成功。');
-        return 0;
-      }
-      if (result.status === 'aborted') {
-        console.log('已取消。');
-        return 130;
-      }
-      if (result.status === 'expired') {
-        console.log('⏱ 授权已过期，请重试。');
-        return 1;
-      }
-      if (result.status === 'denied') {
-        console.log('已拒绝授权。');
-        return 1;
-      }
-      console.error(`❌ 绑定失败：${result.reason || 'unknown'}`);
-      return 1;
-    } finally {
-      process.removeListener('SIGINT', sigint);
-    }
-  } finally {
-    rl.close();
-  }
-}
-
-async function runAuthCommand(sub, args) {
-  if (sub === 'status') return cmdStatus(args);
-  if (sub === 'login') return cmdLogin(args);
-  if (sub === 'logout') return cmdLogout(args);
-  console.error(`未知 auth 子命令：${sub}`);
-  console.error('用法: kld-sdd auth [status|login|logout] [--server=<url>]');
-  return 2;
-}
-
-module.exports = { runAuthCommand };