kld-sdd 2.4.13 → 2.4.14

package/lib/init.js

@@ -599,6 +599,36 @@ function deployOpsxSkills(selectedTools = Object.keys(TOOL_CONFIGS)) {
  * 部署 Claude Code Hook Pack（可选增强）
  * Hook 只调用 skywalk-sdd/log.cjs，不写私有日志，不替代 OPSX 模板采集。
  */
+function hookCommandText(hook) {
+  const args = Array.isArray(hook.args) ? hook.args : [];
+  return [hook.command, ...args].filter(Boolean).join(' ').replace(/\s+/g, ' ').trim();
+}
+
+function isSddClaudeHook(hook) {
+  const text = hookCommandText(hook);
+  return /(?:^|\s|["'])\.claude[\\/]+hooks[\\/]+sdd-(?:prompt|pre-tool|post-tool|stop)\.(?:cjs|js)(?=$|\s|["'])/i.test(text) ||
+    /(?:^|\s|["'])\$\{CLAUDE_PROJECT_DIR\}[\\/]+\.claude[\\/]+hooks[\\/]+sdd-(?:prompt|pre-tool|post-tool|stop)\.(?:cjs|js)(?=$|\s|["'])/i.test(text);
+}
+
+function sameHookCommand(left, right) {
+  return hookCommandText(left) === hookCommandText(right) &&
+    String(left.type || '') === String(right.type || '');
+}
+
+function removeManagedSddHooks(entries) {
+  return entries
+    .map(entry => {
+      if (!Array.isArray(entry.hooks)) {
+        return entry;
+      }
+      return {
+        ...entry,
+        hooks: entry.hooks.filter(hook => !isSddClaudeHook(hook)),
+      };
+    })
+    .filter(entry => !Array.isArray(entry.hooks) || entry.hooks.length > 0);
+}
+
 function deployClaudeHookPack(selectedTools = Object.keys(TOOL_CONFIGS)) {
   if (!selectedTools.includes('claude')) {
     return true;
@@ -642,11 +672,14 @@ function deployClaudeHookPack(selectedTools = Object.keys(TOOL_CONFIGS)) {
 
   existingSettings.hooks = existingSettings.hooks || {};
   for (const [eventName, entries] of Object.entries(templateSettings.hooks || {})) {
-    existingSettings.hooks[eventName] = existingSettings.hooks[eventName] || [];
+    existingSettings.hooks[eventName] = removeManagedSddHooks(existingSettings.hooks[eventName] || []);
     for (const entry of entries) {
-      const templateCommands = (entry.hooks || []).map(h => h.command).filter(Boolean);
+      const templateHooks = entry.hooks || [];
       const exists = existingSettings.hooks[eventName].some(existingEntry => {
-        return (existingEntry.hooks || []).some(h => templateCommands.includes(h.command));
+        const existingHooks = existingEntry.hooks || [];
+        return templateHooks.every(templateHook => {
+          return existingHooks.some(existingHook => sameHookCommand(existingHook, templateHook));
+        });
       });
       if (!exists) {
         existingSettings.hooks[eventName].push(entry);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kld-sdd",
-  "version": "2.4.13",
+  "version": "2.4.14",
   "description": "KLD SDD OpenSpec 项目初始化工具 - 内置模版一键初始化",
   "main": "index.js",
   "bin": {

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

@@ -39,11 +39,18 @@ function main() {
   });
 
   if (result.error) {
-    console.error(`SDD pre-push: failed to run doctor: ${result.error.message}`);
-    process.exit(1);
+    console.warn(`SDD pre-push: failed to run doctor: ${result.error.message}; push will continue.`);
+    return;
   }
 
-  process.exit(result.status || 0);
+  if (result.status && result.status !== 0) {
+    console.warn(`SDD pre-push: doctor reported issues with exit code ${result.status}; push will continue.`);
+    return;
+  }
+
+  if (result.signal) {
+    console.warn(`SDD pre-push: doctor stopped by signal ${result.signal}; push will continue.`);
+  }
 }
 
 main();

package/templates/hooks/claude/hooks/sdd-post-tool.cjs

@@ -19,16 +19,38 @@ function parseInput(raw) {
   }
 }
 
+function hasTelemetryCli(dir) {
+  return fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.cjs')) ||
+    fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.js'));
+}
+
+function findTelemetryRoot(startDir) {
+  if (!startDir) return '';
+
+  let current = path.resolve(startDir);
+  while (true) {
+    if (hasTelemetryCli(current)) return current;
+    const parent = path.dirname(current);
+    if (parent === current) return '';
+    current = parent;
+  }
+}
+
 function findProjectRoot(input) {
   const toolInput = input.tool_input || input.toolInput || {};
   const candidates = [
     toolInput.cwd,
     input.cwd,
     input.project_root,
+    process.env.CLAUDE_PROJECT_DIR,
     process.env.PWD,
     process.cwd(),
   ].filter(Boolean);
-  return candidates.find(dir => fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.js'))) || process.cwd();
+  for (const dir of candidates) {
+    const root = findTelemetryRoot(dir);
+    if (root) return root;
+  }
+  return process.cwd();
 }
 
 function latestActiveStage(projectRoot) {
@@ -75,7 +97,11 @@ function inferRecord(command) {
 }
 
 function recordTelemetry(projectRoot, activeStage, record, result) {
-  const logPath = path.join(projectRoot, 'skywalk-sdd', 'log.js');
+  const logPath = path.join(projectRoot, 'skywalk-sdd', 'log.cjs');
+  const legacyLogPath = path.join(projectRoot, 'skywalk-sdd', 'log.js');
+  const logCli = fs.existsSync(logPath) ? logPath : legacyLogPath;
+  if (!fs.existsSync(logCli)) return;
+
   const details = { [record.detailsKey]: { ...record.details } };
   if (record.type === 'build_result') {
     details.build_results.success = result === 'success';
@@ -83,7 +109,7 @@ function recordTelemetry(projectRoot, activeStage, record, result) {
   }
 
   const args = [
-    logPath,
+    logCli,
     'record',
     `--type=${record.type}`,
     `--command=${activeStage.command || activeStage.stage || 'unknown'}`,

package/templates/hooks/claude/hooks/sdd-prompt.cjs

@@ -18,14 +18,36 @@ function parseInput(raw) {
   }
 }
 
+function hasTelemetryCli(dir) {
+  return fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.cjs')) ||
+    fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.js'));
+}
+
+function findTelemetryRoot(startDir) {
+  if (!startDir) return '';
+
+  let current = path.resolve(startDir);
+  while (true) {
+    if (hasTelemetryCli(current)) return current;
+    const parent = path.dirname(current);
+    if (parent === current) return '';
+    current = parent;
+  }
+}
+
 function findProjectRoot(input) {
   const candidates = [
     input.cwd,
     input.project_root,
+    process.env.CLAUDE_PROJECT_DIR,
     process.env.PWD,
     process.cwd(),
   ].filter(Boolean);
-  return candidates.find(dir => fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.js'))) || process.cwd();
+  for (const dir of candidates) {
+    const root = findTelemetryRoot(dir);
+    if (root) return root;
+  }
+  return process.cwd();
 }
 
 function readActiveStages(projectRoot) {

package/templates/hooks/claude/hooks/sdd-stop.cjs

@@ -19,14 +19,36 @@ function parseInput(raw) {
   }
 }
 
+function hasTelemetryCli(dir) {
+  return fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.cjs')) ||
+    fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.js'));
+}
+
+function findTelemetryRoot(startDir) {
+  if (!startDir) return '';
+
+  let current = path.resolve(startDir);
+  while (true) {
+    if (hasTelemetryCli(current)) return current;
+    const parent = path.dirname(current);
+    if (parent === current) return '';
+    current = parent;
+  }
+}
+
 function findProjectRoot(input) {
   const candidates = [
     input.cwd,
     input.project_root,
+    process.env.CLAUDE_PROJECT_DIR,
     process.env.PWD,
     process.cwd(),
   ].filter(Boolean);
-  return candidates.find(dir => fs.existsSync(path.join(dir, 'skywalk-sdd', 'log.js'))) || process.cwd();
+  for (const dir of candidates) {
+    const root = findTelemetryRoot(dir);
+    if (root) return root;
+  }
+  return process.cwd();
 }
 
 function readActiveStages(projectRoot) {
@@ -45,9 +67,13 @@ function readActiveStages(projectRoot) {
 }
 
 function writeWarning(projectRoot, event) {
-  const logPath = path.join(projectRoot, 'skywalk-sdd', 'log.js');
+  const logPath = path.join(projectRoot, 'skywalk-sdd', 'log.cjs');
+  const legacyLogPath = path.join(projectRoot, 'skywalk-sdd', 'log.js');
+  const logCli = fs.existsSync(logPath) ? logPath : legacyLogPath;
+  if (!fs.existsSync(logCli)) return;
+
   const args = [
-    logPath,
+    logCli,
     'record',
     '--type=telemetry_warning',
     `--command=${event.command || event.stage || 'unknown'}`,

package/templates/hooks/claude/settings.json

@@ -5,7 +5,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/sdd-prompt.cjs"
+            "command": "node \"${CLAUDE_PROJECT_DIR}/.claude/hooks/sdd-prompt.cjs\""
           }
         ]
       }
@@ -16,7 +16,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/sdd-pre-tool.cjs"
+            "command": "node \"${CLAUDE_PROJECT_DIR}/.claude/hooks/sdd-pre-tool.cjs\""
           }
         ]
       }
@@ -27,7 +27,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/sdd-post-tool.cjs"
+            "command": "node \"${CLAUDE_PROJECT_DIR}/.claude/hooks/sdd-post-tool.cjs\""
           }
         ]
       }
@@ -37,7 +37,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "node .claude/hooks/sdd-stop.cjs"
+            "command": "node \"${CLAUDE_PROJECT_DIR}/.claude/hooks/sdd-stop.cjs\""
           }
         ]
       }