kld-sdd 2.6.11 → 2.6.13

package/lib/hook-gate-core.js

@@ -50,16 +50,45 @@ function normalizeHookInput(input) {
   return normalized;
 }
 
+function resolveSkywalkDir(dir) {
+  const root = path.resolve(dir || '.');
+  const direct = path.join(root, 'skywalk-sdd');
+  if (
+    fs.existsSync(path.join(direct, 'log.cjs'))
+    || fs.existsSync(path.join(direct, 'log.js'))
+  ) {
+    return direct;
+  }
+  const hintFile = path.join(root, '.sdd-spec-root');
+  if (fs.existsSync(hintFile)) {
+    const rel = String(fs.readFileSync(hintFile, 'utf8') || '')
+      .trim()
+      .split(/\r?\n/)[0]
+      .trim();
+    if (rel) {
+      const nested = path.join(root, rel, 'skywalk-sdd');
+      if (
+        fs.existsSync(path.join(nested, 'log.cjs'))
+        || fs.existsSync(path.join(nested, 'log.js'))
+      ) {
+        return nested;
+      }
+    }
+  }
+  return null;
+}
+
 function hasTelemetryCli(dir) {
-  return fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.cjs')) ||
-    fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.js'));
+  return Boolean(resolveSkywalkDir(dir));
 }
 
 function findProjectRoot(startDir) {
   if (!startDir) return '';
   let current = path.resolve(startDir);
   for (let i = 0; i < 25; i++) {
-    if (hasTelemetryCli(current)) return current;
+    if (hasTelemetryCli(current) || fs.existsSync(path.join(current, '.sdd-spec-root'))) {
+      return current;
+    }
     const parent = path.dirname(current);
     if (parent === current) return '';
     current = parent;
@@ -96,7 +125,10 @@ function safeChangeName(name) {
 }
 
 function findActiveApplyStage(projectRoot) {
-  const stateDir = path.join(projectRoot, 'skywalk-sdd', 'state');
+  const skywalk = resolveSkywalkDir(projectRoot);
+  const stateDir = skywalk
+    ? path.join(skywalk, 'state')
+    : path.join(projectRoot, 'skywalk-sdd', 'state');
   if (!fs.existsSync(stateDir)) return null;
 
   let latest = null;
@@ -118,7 +150,10 @@ function findActiveApplyStage(projectRoot) {
 
 function hasCompletedCheck(projectRoot, changeName) {
   const safeName = safeChangeName(changeName);
-  const eventsChangeDir = path.join(projectRoot, 'skywalk-sdd', 'events', safeName);
+  const skywalk = resolveSkywalkDir(projectRoot);
+  const eventsChangeDir = skywalk
+    ? path.join(skywalk, 'events', safeName)
+    : path.join(projectRoot, 'skywalk-sdd', 'events', safeName);
   if (!fs.existsSync(eventsChangeDir)) return false;
 
   const jsonlFiles = fs.readdirSync(eventsChangeDir)
@@ -316,6 +351,7 @@ module.exports = {
   readStdin,
   parseHookInput,
   normalizeHookInput,
+  resolveSkywalkDir,
   hasTelemetryCli,
   findProjectRoot,
   getProjectRoot,

package/lib/init.js

@@ -822,6 +822,35 @@ function deployTelemetryDataDir(targetCwd = process.cwd()) {
     console.log(`   ⚠️  Telemetry CLI 源文件缺失: ${telemetrySrc}`);
   }
 
+  const metricsV3Src = path.join(pkgPath, 'skywalk-sdd', 'metrics-v3.cjs');
+  const metricsV3Dst = path.join(dataDir, 'metrics-v3.cjs');
+  if (fs.existsSync(metricsV3Src)) {
+    fs.copyFileSync(metricsV3Src, metricsV3Dst);
+    console.log('   ✓ 部署 skywalk-sdd/metrics-v3.cjs（V3 指标运行时）');
+  } else {
+    console.log(`   ⚠️  V3 指标模块源文件缺失: ${metricsV3Src}（report/metrics 可能无法加载 metrics-v3）`);
+  }
+
+  const runtimeMetadataSrc = path.join(pkgPath, 'skywalk-sdd', 'runtime-metadata.cjs');
+  const runtimeMetadataDst = path.join(dataDir, 'runtime-metadata.cjs');
+  if (fs.existsSync(runtimeMetadataSrc)) {
+    fs.copyFileSync(runtimeMetadataSrc, runtimeMetadataDst);
+    const packageVersion = require(path.join(pkgPath, 'package.json')).version;
+    fs.writeFileSync(path.join(dataDir, 'runtime-metadata.json'), `${JSON.stringify({
+      schema_version: 'kld-sdd-runtime-metadata/v1',
+      package_name: '@hunterzheng/kld-sdd',
+      version: packageVersion,
+    }, null, 2)}\n`, 'utf8');
+    console.log(`   ✓ 部署 kld-sdd 运行时身份（${packageVersion}）`);
+  }
+
+  const reportingSrc = path.join(pkgPath, 'skywalk-sdd', 'reporting');
+  const reportingDst = path.join(dataDir, 'reporting');
+  if (fs.existsSync(reportingSrc)) {
+    copyDir(reportingSrc, reportingDst);
+    console.log('   ✓ 部署 skywalk-sdd/reporting/（V3 单次变更报告）');
+  }
+
   const contextClientSrc = path.join(pkgPath, 'skywalk-sdd', 'context-client.cjs');
   const contextClientDst = path.join(dataDir, 'context-client.cjs');
   if (fs.existsSync(contextClientSrc)) {
@@ -873,16 +902,20 @@ function installGitHookShim(cwd, hookName, scriptPath, options = {}) {
   // Git 把 commit-msg 文件路径放在 $1；--project 等额外参数必须跟在 "$@" 后面，
   // 否则 trailer 脚本会把 --project=… 误当成 message 文件（argv[2]）。
   const extraArgs = options.extraArgs || '';
-  const nodeLine = extraArgs
-    ? `  node "${scriptPath}" "$@" ${extraArgs}`
-    : `  node "${scriptPath}" "$@"`;
+  // Windows 反斜杠路径在 #!/bin/sh（Git for Windows MSYS2）中不被 [ -f ] 和 node 识别，
+  // 统一转为正斜杠，确保 hook shim 跨平台可执行。
+  const shScriptPath = scriptPath.replace(/\\/g, '/');
+  const shExtraArgs = extraArgs.replace(/\\/g, '/');
+  const nodeLine = shExtraArgs
+    ? `  node "${shScriptPath}" "$@" ${shExtraArgs}`
+    : `  node "${shScriptPath}" "$@"`;
   const shim = [
     '#!/bin/sh',
     `# ${marker}`,
-    `if [ -f "${scriptPath}" ]; then`,
+    `if [ -f "${shScriptPath}" ]; then`,
     nodeLine,
     'else',
-    `  echo "[kld-sdd] Hook 脚本不存在: ${scriptPath}" >&2`,
+    `  echo "[kld-sdd] Hook 脚本不存在: ${shScriptPath}" >&2`,
     '  exit 1',
     'fi',
     '',
@@ -892,7 +925,7 @@ function installGitHookShim(cwd, hookName, scriptPath, options = {}) {
     const existing = fs.readFileSync(hookPath, 'utf8');
     if (existing.includes(marker)) {
       // 已是 SDD shim：若指向路径变化（如改为引用 spec 仓），允许覆盖升级
-      if (existing.includes(scriptPath) && (!extraArgs || existing.includes(extraArgs.trim()))) {
+      if (existing.includes(shScriptPath) && (!shExtraArgs || existing.includes(shExtraArgs.trim()))) {
         console.log(`   ✓ .git/hooks/${hookName} 已包含 SDD 质量门禁`);
         return;
       }
@@ -951,7 +984,7 @@ function installCodeRepoCommitMsgHook(codeRepoRoot, specRepoRoot, options = {})
     return false;
   }
   installGitHookShim(cwd, 'commit-msg', ensured.scriptPath, {
-    extraArgs: `--project=${cwd}`,
+    extraArgs: `"--project=${cwd}"`,
   });
   return true;
 }
@@ -1208,94 +1241,62 @@ function writeSddSpecRootHint(anchorDir, specPackageAbs) {
 }
 
 /**
- * 工作区 / 单仓 Git 根的 skywalk-sdd/ 改为指向包裹包内唯一实体（符号链接）。
- * skills 仍可用 `node skywalk-sdd/log.cjs`，实体文件只在 *-sdd-specs/skywalk-sdd/。
- * 链接失败时回退为薄转发脚本（不复制 ontology）。
+ * 移除工作区 / Git 根上多余的 skywalk-sdd（符号链接或旧完整副本）。
+ * 唯一实体只保留在 *-sdd-specs/skywalk-sdd/。
+ *
+ * 触发条件（满足其一即可）：
+ * - 存在 .sdd-spec-root
+ * - 同级已有 *-sdd-specs/skywalk-sdd（多仓/单仓包裹包）
  */
-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) {
+function removeOuterSkywalk(anchorDir) {
   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' };
+  const outer = path.join(anchor, 'skywalk-sdd');
+  let st = null;
+  try {
+    st = fs.lstatSync(outer);
+  } catch (err) {
+    if (err && err.code === 'ENOENT') return { ok: true, removed: false };
+    throw err;
   }
 
+  const hint = path.join(anchor, '.sdd-spec-root');
+  const hasHint = fs.existsSync(hint);
+  let hasNestedEntity = false;
   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);
+    for (const name of fs.readdirSync(anchor)) {
+      if (!/-sdd-specs$/i.test(name)) continue;
+      const entity = path.join(anchor, name, 'skywalk-sdd', 'log.cjs');
+      if (fs.existsSync(entity)) {
+        hasNestedEntity = true;
+        break;
       }
     }
-  } catch (err) {
-    console.log(`   ⚠️  清理旧 skywalk-sdd/ 失败: ${err.message}`);
-    return deploySkywalkForwarders(anchor, specPackageAbs);
+  } catch {
+    // ignore
+  }
+
+  if (!hasHint && !hasNestedEntity) {
+    // 无包裹包迹象时不贸然删除（可能是旧平铺布局）
+    return { ok: true, removed: false, skipped: true };
   }
 
-  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 };
+    if (st.isSymbolicLink()) {
+      fs.unlinkSync(outer);
+      console.log('   ✓ 已移除 Git/工作区根多余的 skywalk-sdd 符号链接（实体在包裹包）');
+      return { ok: true, removed: true, mode: 'symlink' };
+    }
+    if (st.isDirectory()) {
+      fs.rmSync(outer, { recursive: true, force: true });
+      console.log('   ✓ 已移除 Git/工作区根多余的 skywalk-sdd/（实体在包裹包）');
+      return { ok: true, removed: true, mode: 'directory' };
+    }
+    fs.unlinkSync(outer);
+    console.log('   ✓ 已移除 Git/工作区根多余的 skywalk-sdd');
+    return { ok: true, removed: true, mode: 'file' };
   } catch (err) {
-    console.log(`   ⚠️  符号链接失败 (${err.message})，回退为转发脚本`);
-    return deploySkywalkForwarders(anchor, specPackageAbs);
+    console.log(`   ⚠️  未能移除根目录 skywalk-sdd/: ${err.message}`);
+    return { ok: false, message: err.message };
   }
 }
 
@@ -1519,8 +1520,7 @@ async function main() {
         asIndependentGit: true,
       });
       writeSddSpecRootHint(workspaceRoot, specPackage.abs);
-      // 工作区不复制 skywalk-sdd 实体，只链到包裹包（skills 路径仍可用）
-      linkSkywalkToSpecPackage(workspaceRoot, specPackage.abs);
+      removeOuterSkywalk(workspaceRoot);
 
       // 重新探测，刷新 layout.specRepo / codeRepos
       layout = workspaceLayout.detectWorkspaceLayout(workspaceRoot);
@@ -1549,11 +1549,11 @@ async function main() {
           asIndependentGit: false,
         });
         writeSddSpecRootHint(workspaceRoot, specPackage.abs);
-        linkSkywalkToSpecPackage(workspaceRoot, specPackage.abs);
+        removeOuterSkywalk(workspaceRoot);
 
         deployMonoSddYaml(workspaceRoot, { specPathRelative: specPackage.name });
-        // Hook 装在 Git 根；经 symlink 写入包裹包内的 git-hooks
-        deployQualityGateTemplates(workspaceRoot, { mode: 'commit-msg-only' });
+        // Hook 装在 Git 根，脚本在包裹包内（Git 根不落 skywalk-sdd/）
+        installCodeRepoCommitMsgHook(workspaceRoot, specPackage.abs);
         const linked = sddConfig.setSpecPath(workspaceRoot, specPackage.abs, {
           allowNestedPackage: true,
         });
@@ -1571,7 +1571,7 @@ async function main() {
           asIndependentGit: false,
         });
         writeSddSpecRootHint(workspaceRoot, specPackage.abs);
-        linkSkywalkToSpecPackage(workspaceRoot, specPackage.abs);
+        removeOuterSkywalk(workspaceRoot);
         deployDotSddYaml(workspaceRoot);
       }
     }
@@ -1603,6 +1603,12 @@ async function main() {
   // 7. 更新工作目录 .gitignore
   updateGitignore();
 
+  // 8. 收尾：无论前面是否走过 symlink/旧副本路径，强制清掉工作区/Git 根多余 skywalk-sdd/
+  if (specPackage && fs.existsSync(specPackage.abs)) {
+    writeSddSpecRootHint(workspaceRoot, specPackage.abs);
+  }
+  removeOuterSkywalk(workspaceRoot);
+
   const selectedNames = selectedTools.map(t => TOOL_CONFIGS[t].name).join(', ');
 
   console.log();
@@ -1616,7 +1622,8 @@ async function main() {
     console.log('工作区部署结果:');
     console.log('  🎯 工作目录 .*/skills/opsx-*/     # skills 只装这一份');
     console.log('  📋 .sdd-workspace.yaml           # 子仓编排清单');
-    console.log('  🔗 skywalk-sdd/ → *-sdd-specs/skywalk-sdd/  # 符号链接，实体只在包裹包');
+    console.log('  📌 .sdd-spec-root                 # 指向包裹包；CLI 用 $(cat .sdd-spec-root)/skywalk-sdd/…');
+    console.log('  ✗ 工作区根无 skywalk-sdd/          # 实体只在包裹包内');
     if (specPackage) {
       console.log(`  📄 ${specPackage.name}/              # 统一 SDD 包裹包（独立 Git）`);
       console.log('       modules.yaml / sdd.config.yaml / openspec / openspec-templates / skywalk-sdd');
@@ -1635,8 +1642,8 @@ async function main() {
       console.log(`  📄 ${specPackage.name}/              # 统一 SDD 包裹包（仓内子目录）`);
       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/  # 符号链接，实体只在包裹包');
+    console.log('  🔗 .sdd.yaml (layout: mono) + commit-msg Hook（脚本在包裹包）');
+    console.log('  📌 .sdd-spec-root → 包裹包；无根目录 skywalk-sdd/');
   }
   if (selectedTools.includes('kunlunzhima')) {
     console.log('  📎 .kunlunzhima/commands/opsx/    # KunlunZhima OPSX command bridge（11 个）');
@@ -1712,8 +1719,7 @@ module.exports = {
   deployMonoSddYaml,
   populateSpecPackage,
   writeSddSpecRootHint,
-  linkSkywalkToSpecPackage,
-  deploySkywalkForwarders,
+  removeOuterSkywalk,
   deployQualityGateTemplates,
   deployTelemetryDataDir,
   attachCodeRepoLite,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kld-sdd",
-  "version": "2.6.11",
+  "version": "2.6.13",
   "description": "KLD SDD OpenSpec 项目初始化工具 - 一键部署 SDD skills",
   "main": "index.js",
   "bin": {
@@ -8,7 +8,7 @@
     "kld-sdd-init": "bin/kld-sdd-init.js"
   },
   "scripts": {
-    "test": "node test/external-key.cjs && node test/change-key.cjs && node test/modules-and-sdd-config.cjs && node test/active-changes.cjs && node test/hook-layouts.cjs && node test/spec-package-init.cjs && node test/workspace-layout.cjs && node test/ontology-release-blockers.cjs && node test/ontology-semantic-core.cjs && node test/ontology-identity-versioning.cjs && node test/ontology-identity-continuity.cjs && node test/ontology-state-transaction.cjs && node test/ontology-process-concurrency.cjs && node test/ontology-observer-convergence.cjs && node test/ontology-working-runtime.cjs && node test/ontology-stage-materialization.cjs && node test/ontology-template-contract.cjs && node test/ontology-cli-archive.cjs && node test/archive-package-producer.cjs && node test/validate-skills-bundle.cjs && node test/tool-profiles.cjs && node test/settings-merge.cjs && node test/command-bridge.cjs && node test/codebuddy-hooks.cjs && node test/skill-content-contract.cjs && node test/init-agent-profiles.cjs"
+    "test": "node test/external-key.cjs && node test/change-key.cjs && node test/modules-and-sdd-config.cjs && node test/active-changes.cjs && node test/hook-layouts.cjs && node test/spec-package-init.cjs && node test/workspace-layout.cjs && node test/ontology-release-blockers.cjs && node test/ontology-semantic-core.cjs && node test/ontology-identity-versioning.cjs && node test/ontology-identity-continuity.cjs && node test/ontology-state-transaction.cjs && node test/ontology-process-concurrency.cjs && node test/ontology-observer-convergence.cjs && node test/ontology-working-runtime.cjs && node test/ontology-stage-materialization.cjs && node test/ontology-template-contract.cjs && node test/ontology-cli-archive.cjs && node test/archive-package-producer.cjs && node --test test/change-report-correctness.cjs test/report-metrics-correctness.cjs test/change-report-model-ui.cjs && node test/validate-skills-bundle.cjs && node test/tool-profiles.cjs && node test/settings-merge.cjs && node test/command-bridge.cjs && node test/codebuddy-hooks.cjs && node test/skill-content-contract.cjs && node test/init-agent-profiles.cjs && node test/init-report-runtime.cjs"
   },
   "keywords": [
     "kld",
@@ -32,6 +32,9 @@
     "templates/",
     "kld-sdd-guide.html",
     "skywalk-sdd/index.cjs",
+    "skywalk-sdd/metrics-v3.cjs",
+    "skywalk-sdd/runtime-metadata.cjs",
+    "skywalk-sdd/reporting/",
     "skywalk-sdd/context-client.cjs",
     "skywalk-sdd/ontology/",
     "skywalk-sdd/apply-worktree-finish.cjs",