kld-sdd 2.6.10 → 2.6.11

package/lib/init.js

@@ -862,7 +862,7 @@ function deployTelemetryDataDir(targetCwd = process.cwd()) {
   return true;
 }
 
-function installGitHookShim(cwd, hookName, scriptPath) {
+function installGitHookShim(cwd, hookName, scriptPath, options = {}) {
   const hooksDir = path.join(cwd, '.git', 'hooks');
   if (!fs.existsSync(hooksDir)) {
     return;
@@ -870,11 +870,20 @@ function installGitHookShim(cwd, hookName, scriptPath) {
 
   const hookPath = path.join(hooksDir, hookName);
   const marker = 'KLD SDD quality gate';
+  // Git 把 commit-msg 文件路径放在 $1；--project 等额外参数必须跟在 "$@" 后面，
+  // 否则 trailer 脚本会把 --project=… 误当成 message 文件（argv[2]）。
+  const extraArgs = options.extraArgs || '';
+  const nodeLine = extraArgs
+    ? `  node "${scriptPath}" "$@" ${extraArgs}`
+    : `  node "${scriptPath}" "$@"`;
   const shim = [
     '#!/bin/sh',
     `# ${marker}`,
     `if [ -f "${scriptPath}" ]; then`,
-    `  node "${scriptPath}" "$@"`,
+    nodeLine,
+    'else',
+    `  echo "[kld-sdd] Hook 脚本不存在: ${scriptPath}" >&2`,
+    '  exit 1',
     'fi',
     '',
   ].join('\n');
@@ -882,10 +891,21 @@ function installGitHookShim(cwd, hookName, scriptPath) {
   if (fs.existsSync(hookPath)) {
     const existing = fs.readFileSync(hookPath, 'utf8');
     if (existing.includes(marker)) {
-      console.log(`   ✓ .git/hooks/${hookName} 已包含 SDD 质量门禁`);
-    } else {
-      console.log(`   ℹ️  .git/hooks/${hookName} 已存在，已保留不覆盖；可手动调用 ${scriptPath}`);
+      // 已是 SDD shim：若指向路径变化（如改为引用 spec 仓），允许覆盖升级
+      if (existing.includes(scriptPath) && (!extraArgs || existing.includes(extraArgs.trim()))) {
+        console.log(`   ✓ .git/hooks/${hookName} 已包含 SDD 质量门禁`);
+        return;
+      }
+      fs.writeFileSync(hookPath, shim, 'utf8');
+      try {
+        fs.chmodSync(hookPath, 0o755);
+      } catch {
+        // ignore
+      }
+      console.log(`   ✓ 更新 .git/hooks/${hookName} SDD 质量门禁`);
+      return;
     }
+    console.log(`   ℹ️  .git/hooks/${hookName} 已存在，已保留不覆盖；可手动调用 ${scriptPath}`);
     return;
   }
 
@@ -898,14 +918,52 @@ function installGitHookShim(cwd, hookName, scriptPath) {
   console.log(`   ✓ 安装 .git/hooks/${hookName} SDD 质量门禁`);
 }
 
+/**
+ * 确保 spec 包裹包内有 commit-msg 脚本（供代码仓 Hook 远程引用）。
+ */
+function ensureSpecCommitMsgScript(specRepoRoot, pkgPath = getPackagePath()) {
+  const specRoot = path.resolve(specRepoRoot);
+  const scriptPath = path.join(specRoot, 'skywalk-sdd', 'git-hooks', 'commit-msg-sdd-trailer.cjs');
+  if (fs.existsSync(scriptPath)) return { ok: true, scriptPath };
+
+  const src = path.join(pkgPath, 'templates', 'git-hooks', 'commit-msg-sdd-trailer.cjs');
+  if (!fs.existsSync(src)) {
+    return { ok: false, message: `commit-msg 模板缺失: ${src}` };
+  }
+  const ontologySrc = path.join(pkgPath, 'skywalk-sdd', 'ontology');
+  const ontologyDst = path.join(specRoot, 'skywalk-sdd', 'ontology');
+  if (fs.existsSync(ontologySrc) && !fs.existsSync(path.join(ontologyDst, 'change-key.cjs'))) {
+    copyDir(ontologySrc, ontologyDst);
+  }
+  fs.mkdirSync(path.dirname(scriptPath), { recursive: true });
+  fs.copyFileSync(src, scriptPath);
+  return { ok: true, scriptPath, deployed: true };
+}
+
+/**
+ * 代码仓 commit-msg：只写 .git/hooks，脚本与 ontology 一律用 spec 仓那一份。
+ */
+function installCodeRepoCommitMsgHook(codeRepoRoot, specRepoRoot, options = {}) {
+  const cwd = path.resolve(codeRepoRoot);
+  const ensured = ensureSpecCommitMsgScript(specRepoRoot, options.pkgPath || getPackagePath());
+  if (!ensured.ok) {
+    console.log(`   ⚠️  ${ensured.message}`);
+    return false;
+  }
+  installGitHookShim(cwd, 'commit-msg', ensured.scriptPath, {
+    extraArgs: `--project=${cwd}`,
+  });
+  return true;
+}
+
 /**
  * 部署 Git hooks / CI 兜底模板
  * 这些脚本只做质量门禁和 CI 补充记录，不替代 OPSX 主采集链路。
  *
  * @param {string} [targetCwd]
  * @param {{ mode?: 'full'|'commit-msg-only' }} [options]
- *   full: spec 仓（pre-commit/pre-push/commit-msg + CI）
- *   commit-msg-only: 代码仓（只装 Trailer Hook，不装 skills、不装文档门禁）
+ *   full: spec 包裹包（pre-commit/pre-push/commit-msg + CI）
+ *   commit-msg-only: 单仓 Git 根（本仓落 skywalk-sdd/git-hooks；多仓代码仓请用 installCodeRepoCommitMsgHook）
  */
 function deployQualityGateTemplates(targetCwd = process.cwd(), options = {}) {
   const pkgPath = getPackagePath();
@@ -946,12 +1004,12 @@ function deployQualityGateTemplates(targetCwd = process.cwd(), options = {}) {
 }
 
 /**
- * 代码仓轻量接入：只部署 Hook 运行所需 ontology + commit-msg，不部署 skills。
+ * 代码仓轻量接入：只写 .sdd.yaml + sdd.specPath + .git/hooks/commit-msg。
+ * 不在代码仓落 skywalk-sdd/——Hook 脚本与 ontology 引用 spec 包裹包那一份。
  */
 function attachCodeRepoLite(codeRepoRoot, specRepoRoot, options = {}) {
   const cwd = path.resolve(codeRepoRoot);
   const specRoot = path.resolve(specRepoRoot);
-  const pkgPath = options.pkgPath || getPackagePath();
   const label = path.basename(cwd);
 
   if (!workspaceLayout.isGitRepo(cwd)) {
@@ -961,16 +1019,7 @@ function attachCodeRepoLite(codeRepoRoot, specRepoRoot, options = {}) {
     return { ok: false, repo: label, message: `spec 路径不是 Git 仓库: ${specRoot}` };
   }
 
-  console.log(`🔗 轻量接入代码仓（无 skills）: ${label}`);
-
-  // Hook 依赖 ontology + git-hooks；不部署完整 telemetry/skills
-  const dataDir = path.join(cwd, 'skywalk-sdd');
-  const ontologySrc = path.join(pkgPath, 'skywalk-sdd', 'ontology');
-  const ontologyDst = path.join(dataDir, 'ontology');
-  if (fs.existsSync(ontologySrc)) {
-    copyDir(ontologySrc, ontologyDst);
-  }
-  deployQualityGateTemplates(cwd, { mode: 'commit-msg-only' });
+  console.log(`🔗 轻量接入代码仓（无 skywalk-sdd/、无 skills）: ${label}`);
 
   const remote = sddConfig.gitRemoteUrl(specRoot) || 'git@gitlab.example.com:biz/xxx-sdd-specs.git';
   const sddYamlPath = path.join(cwd, '.sdd.yaml');
@@ -996,6 +1045,9 @@ function attachCodeRepoLite(codeRepoRoot, specRepoRoot, options = {}) {
   }
   console.log(`   ✓ sdd.specPath = ${linked.path}`);
 
+  installCodeRepoCommitMsgHook(cwd, specRoot, options);
+  console.log('   ✓ commit-msg → spec 仓 skywalk-sdd/git-hooks/（代码仓不落 skywalk-sdd/）');
+
   return { ok: true, repo: label, path: cwd, specPath: linked.path };
 }
 
@@ -1155,6 +1207,98 @@ function writeSddSpecRootHint(anchorDir, specPackageAbs) {
   return filePath;
 }
 
+/**
+ * 工作区 / 单仓 Git 根的 skywalk-sdd/ 改为指向包裹包内唯一实体（符号链接）。
+ * skills 仍可用 `node skywalk-sdd/log.cjs`，实体文件只在 *-sdd-specs/skywalk-sdd/。
+ * 链接失败时回退为薄转发脚本（不复制 ontology）。
+ */
+function deploySkywalkForwarders(anchorDir, specPackageAbs) {
+  const anchor = path.resolve(anchorDir);
+  const specAbs = path.resolve(specPackageAbs);
+  const relSpec = path.relative(anchor, specAbs).replace(/\\/g, '/');
+  const skywalkDir = path.join(anchor, 'skywalk-sdd');
+  const targetSkywalk = path.join(specAbs, 'skywalk-sdd');
+  fs.mkdirSync(path.join(skywalkDir, 'ontology'), { recursive: true });
+
+  const writeForwarder = (destRel, targetAbsPath) => {
+    const dest = path.join(skywalkDir, destRel);
+    fs.mkdirSync(path.dirname(dest), { recursive: true });
+    const relFromDestDir = path.relative(path.dirname(dest), targetAbsPath).replace(/\\/g, '/');
+    const body = [
+      '#!/usr/bin/env node',
+      "'use strict';",
+      "const { spawnSync } = require('child_process');",
+      "const path = require('path');",
+      `const target = path.resolve(__dirname, ${JSON.stringify(relFromDestDir)});`,
+      'const r = spawnSync(process.execPath, [target, ...process.argv.slice(2)], { stdio: \'inherit\' });',
+      'process.exit(r.status === null ? 1 : r.status);',
+      '',
+    ].join('\n');
+    fs.writeFileSync(dest, body, 'utf8');
+  };
+
+  const entries = [
+    'log.cjs',
+    'openspec-shim.cjs',
+    'context-client.cjs',
+    'apply-worktree-finish.cjs',
+  ];
+  for (const name of entries) {
+    writeForwarder(name, path.join(targetSkywalk, name));
+  }
+  writeForwarder(path.join('ontology', 'cli.cjs'), path.join(targetSkywalk, 'ontology', 'cli.cjs'));
+  console.log(`   ✓ skywalk-sdd/ 转发脚本 → ${relSpec}/skywalk-sdd/（实体在包裹包）`);
+  return { ok: true, mode: 'forwarders', relSpec };
+}
+
+function linkSkywalkToSpecPackage(anchorDir, specPackageAbs) {
+  const anchor = path.resolve(anchorDir);
+  const targetAbs = path.join(path.resolve(specPackageAbs), 'skywalk-sdd');
+  const linkAbs = path.join(anchor, 'skywalk-sdd');
+
+  if (!fs.existsSync(targetAbs)) {
+    console.log('   ⚠️  包裹包尚无 skywalk-sdd/，跳过工作区链接');
+    return { ok: false, message: 'spec skywalk-sdd missing' };
+  }
+
+  try {
+    let st = null;
+    try {
+      st = fs.lstatSync(linkAbs);
+    } catch (err) {
+      if (!err || err.code !== 'ENOENT') throw err;
+    }
+    if (st) {
+      if (st.isSymbolicLink()) {
+        const current = fs.realpathSync(linkAbs);
+        if (current === fs.realpathSync(targetAbs)) {
+          console.log('   ✓ skywalk-sdd/ 已链接到包裹包（唯一实体）');
+          return { ok: true, mode: 'symlink', linkAbs, targetAbs };
+        }
+        fs.unlinkSync(linkAbs);
+      } else if (st.isDirectory()) {
+        // 旧完整副本 → 删除后改链接（权威数据在包裹包）
+        fs.rmSync(linkAbs, { recursive: true, force: true });
+      } else {
+        fs.unlinkSync(linkAbs);
+      }
+    }
+  } catch (err) {
+    console.log(`   ⚠️  清理旧 skywalk-sdd/ 失败: ${err.message}`);
+    return deploySkywalkForwarders(anchor, specPackageAbs);
+  }
+
+  const rel = path.relative(anchor, targetAbs);
+  try {
+    fs.symlinkSync(rel, linkAbs, process.platform === 'win32' ? 'junction' : 'dir');
+    console.log(`   ✓ skywalk-sdd/ → ${rel.replace(/\\/g, '/')}（唯一实体在包裹包）`);
+    return { ok: true, mode: 'symlink', linkAbs, targetAbs, rel };
+  } catch (err) {
+    console.log(`   ⚠️  符号链接失败 (${err.message})，回退为转发脚本`);
+    return deploySkywalkForwarders(anchor, specPackageAbs);
+  }
+}
+
 /**
  * 检测当前项目已初始化的 AI 编辑器
  */
@@ -1185,6 +1329,8 @@ function updateGitignore() {
     '.agents/commands/personal-*',
     'skywalk-sdd/events/',
     'skywalk-sdd/state/',
+    '**/skywalk-sdd/events/',
+    '**/skywalk-sdd/state/',
     '.worktrees/'
   ];
 
@@ -1198,9 +1344,11 @@ function updateGitignore() {
 .workbuddy/commands/personal-*
 .agents/commands/personal-*
 
-# SDD Telemetry 数据（本地度量，可选提交；本体 JSON 与报告随 openspec/changes/<change>/ 提交）
+# SDD Telemetry 数据（实体在 *-sdd-specs/skywalk-sdd/；工作区可能是 symlink）
 skywalk-sdd/events/
 skywalk-sdd/state/
+**/skywalk-sdd/events/
+**/skywalk-sdd/state/
 
 # SDD Apply 隔离 worktree（本地临时目录）
 .worktrees/
@@ -1360,8 +1508,6 @@ async function main() {
     deployProfileArtifacts(selectedTools, workspaceRoot, getPackagePath());
 
     if (layout.isWorkspace) {
-      deployTelemetryDataDir(workspaceRoot);
-
       if (!specPackage) {
         console.log('📦 未发现 spec 仓，正在创建统一 SDD 包裹包（独立 Git）...');
         specPackage = workspaceLayout.ensureSpecPackage(workspaceRoot, { initGit: true });
@@ -1373,6 +1519,8 @@ async function main() {
         asIndependentGit: true,
       });
       writeSddSpecRootHint(workspaceRoot, specPackage.abs);
+      // 工作区不复制 skywalk-sdd 实体，只链到包裹包（skills 路径仍可用）
+      linkSkywalkToSpecPackage(workspaceRoot, specPackage.abs);
 
       // 重新探测，刷新 layout.specRepo / codeRepos
       layout = workspaceLayout.detectWorkspaceLayout(workspaceRoot);
@@ -1390,7 +1538,6 @@ async function main() {
     } else {
       // 单仓：Git 根只放代码 + skills + Hook；SDD 内容进统一包裹子目录
       const isGit = workspaceLayout.isGitRepo(workspaceRoot);
-      deployTelemetryDataDir(workspaceRoot);
 
       if (isGit) {
         console.log('📦 单仓模式：创建/复用仓内统一 SDD 包裹目录...');
@@ -1402,9 +1549,10 @@ async function main() {
           asIndependentGit: false,
         });
         writeSddSpecRootHint(workspaceRoot, specPackage.abs);
+        linkSkywalkToSpecPackage(workspaceRoot, specPackage.abs);
 
         deployMonoSddYaml(workspaceRoot, { specPathRelative: specPackage.name });
-        // Hook 装在 Git 根；Trailer 读包裹目录里的 sdd.config / openspec
+        // Hook 装在 Git 根；经 symlink 写入包裹包内的 git-hooks
         deployQualityGateTemplates(workspaceRoot, { mode: 'commit-msg-only' });
         const linked = sddConfig.setSpecPath(workspaceRoot, specPackage.abs, {
           allowNestedPackage: true,
@@ -1422,6 +1570,8 @@ async function main() {
           skipOpenspec,
           asIndependentGit: false,
         });
+        writeSddSpecRootHint(workspaceRoot, specPackage.abs);
+        linkSkywalkToSpecPackage(workspaceRoot, specPackage.abs);
         deployDotSddYaml(workspaceRoot);
       }
     }
@@ -1466,12 +1616,13 @@ async function main() {
     console.log('工作区部署结果:');
     console.log('  🎯 工作目录 .*/skills/opsx-*/     # skills 只装这一份');
     console.log('  📋 .sdd-workspace.yaml           # 子仓编排清单');
+    console.log('  🔗 skywalk-sdd/ → *-sdd-specs/skywalk-sdd/  # 符号链接，实体只在包裹包');
     if (specPackage) {
       console.log(`  📄 ${specPackage.name}/              # 统一 SDD 包裹包（独立 Git）`);
       console.log('       modules.yaml / sdd.config.yaml / openspec / openspec-templates / skywalk-sdd');
     }
     for (const repo of layout.codeRepos) {
-      console.log(`  🔗 ${repo.name}/  ← commit-msg Hook + .sdd.yaml（无 skills）`);
+      console.log(`  🔗 ${repo.name}/  ← commit-msg Hook + .sdd.yaml（无 skywalk-sdd/、无 skills）`);
     }
     console.log();
     console.log('新代码仓加入后执行:');
@@ -1485,6 +1636,7 @@ async function main() {
       console.log('       modules.yaml / sdd.config.yaml / openspec / openspec-templates / skywalk-sdd');
     }
     console.log('  🔗 .sdd.yaml (layout: mono) + commit-msg Hook');
+    console.log('  🔗 skywalk-sdd/ → *-sdd-specs/skywalk-sdd/  # 符号链接，实体只在包裹包');
   }
   if (selectedTools.includes('kunlunzhima')) {
     console.log('  📎 .kunlunzhima/commands/opsx/    # KunlunZhima OPSX command bridge（11 个）');
@@ -1496,10 +1648,6 @@ async function main() {
   if (selectedTools.includes('claude')) {
     console.log('  🪝 .claude/hooks/                 # Claude Code SDD Hook Pack（可选增强）');
   }
-  if (!layout.isWorkspace) {
-    console.log('  📊 skywalk-sdd/                  # Hook 运行时 ontology（Git 根）');
-    console.log('  🧰 skywalk-sdd/git-hooks/        # commit-msg Trailer Hook');
-  }
   console.log();
   
   // 统一的 skill 格式说明
@@ -1564,6 +1712,8 @@ module.exports = {
   deployMonoSddYaml,
   populateSpecPackage,
   writeSddSpecRootHint,
+  linkSkywalkToSpecPackage,
+  deploySkywalkForwarders,
   deployQualityGateTemplates,
   deployTelemetryDataDir,
   attachCodeRepoLite,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kld-sdd",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "description": "KLD SDD OpenSpec 项目初始化工具 - 一键部署 SDD skills",
   "main": "index.js",
   "bin": {

package/skywalk-sdd/ontology/naming-diagnose.cjs

@@ -67,17 +67,40 @@ function detectEntryMode(projectRoot) {
   return 'unknown';
 }
 
+function resolveCommitMsgScriptPath(projectRoot) {
+  const localScript = path.join(projectRoot, 'skywalk-sdd', 'git-hooks', 'commit-msg-sdd-trailer.cjs');
+  if (fs.existsSync(localScript)) return localScript;
+  // 多仓代码仓：脚本在 spec 包裹包，不在本仓 skywalk-sdd/
+  try {
+    const context = sddConfig.resolveCodeRepoContext(projectRoot);
+    if (context && context.specPath) {
+      const remote = path.join(context.specPath, 'skywalk-sdd', 'git-hooks', 'commit-msg-sdd-trailer.cjs');
+      if (fs.existsSync(remote)) return remote;
+    }
+  } catch {
+    // ignore
+  }
+  if (sddConfig.isMonoLayout(projectRoot)) {
+    const monoSpec = sddConfig.resolveMonoSpecRoot(projectRoot);
+    if (monoSpec) {
+      const nested = path.join(monoSpec, 'skywalk-sdd', 'git-hooks', 'commit-msg-sdd-trailer.cjs');
+      if (fs.existsSync(nested)) return nested;
+    }
+  }
+  return null;
+}
+
 function checkHookInstalled(projectRoot) {
   const hookPath = path.join(projectRoot, '.git', 'hooks', 'commit-msg');
-  const scriptPath = path.join(projectRoot, 'skywalk-sdd', 'git-hooks', 'commit-msg-sdd-trailer.cjs');
+  const scriptPath = resolveCommitMsgScriptPath(projectRoot);
   if (!fs.existsSync(path.join(projectRoot, '.git'))) {
     return { status: STATUS.SKIP, message: '非 Git 仓库，跳过 Hook 检查' };
   }
-  if (!fs.existsSync(scriptPath)) {
+  if (!scriptPath) {
     return {
       status: STATUS.FIXABLE,
       code: 'HOOK_SCRIPT_MISSING',
-      message: 'commit-msg 脚本未部署，可重新执行 kld-sdd-init 或手动复制模板',
+      message: 'commit-msg 脚本未找到（本仓或 sdd.specPath 下均无 skywalk-sdd/git-hooks/），可重新执行 kld-sdd-init',
       fix: { type: 'deploy-hook-script' },
     };
   }

package/templates/git-hooks/commit-msg-sdd-trailer.cjs

@@ -169,8 +169,18 @@ function upsertTrailers(message, trailers) {
   return body;
 }
 
+function resolveMsgFile(argv = process.argv) {
+  // Git 传入的 message 文件路径；跳过 --project= 等可选参数
+  for (let i = 2; i < argv.length; i += 1) {
+    const arg = argv[i];
+    if (!arg || arg.startsWith('--')) continue;
+    return arg;
+  }
+  return null;
+}
+
 function main(env = process.env) {
-  const msgFile = process.argv[2];
+  const msgFile = resolveMsgFile();
   if (!msgFile) {
     fail('缺少 commit message 文件参数');
   }