kld-sdd 2.6.16 → 2.6.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kld-sdd",
-  "version": "2.6.16",
+  "version": "2.6.21",
   "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 test/evidence-integrity-oracle.cjs test/evidence-integrity-wiring.cjs 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"
+    "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/evidence-integrity-oracle.cjs test/evidence-integrity-wiring.cjs 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 && node test/init-output-verbosity.cjs && node test/init-account-binding.cjs && node --test test/usage-contract.test.cjs test/user-config.test.cjs test/device-auth.test.cjs test/usage-runtime-removal.test.cjs skywalk-sdd/usage-reporter.test.cjs skywalk-sdd/usage-reporting.test.cjs && node test/progress-package-artifact.test.cjs"
   },
   "keywords": [
     "kld",
@@ -24,7 +24,7 @@
   "author": "KLD Team",
   "license": "MIT",
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=14.18.0"
   },
   "files": [
     "bin/",
@@ -39,6 +39,10 @@
     "skywalk-sdd/openspec-shim.cjs",
     "skywalk-sdd/ontology/",
     "skywalk-sdd/apply-worktree-finish.cjs",
+    "skywalk-sdd/spec-root.cjs",
+    "skywalk-sdd/lib/",
+    "skywalk-sdd/kb-upload.cjs",
+    "skywalk-sdd/kb-sync-identity.cjs",
     "README.md"
   ]
 }

package/skywalk-sdd/apply-worktree-finish.cjs

@@ -11,32 +11,11 @@
 const fs = require('fs');
 const path = require('path');
 const { execFileSync } = require('child_process');
+const { parseArgs } = require('./lib/shared.cjs');
 
 const TEMP_DIR_NAMES = ['node_modules', 'dist', '.turbo', '.next', 'coverage', 'build'];
 
-function parseArgs(argv) {
-  const args = {};
-  for (let i = 2; i < argv.length; i++) {
-    const token = argv[i];
-    if (token === '--') continue;
-    if (token.startsWith('--')) {
-      const eq = token.indexOf('=');
-      if (eq !== -1) {
-        args[token.slice(2, eq)] = token.slice(eq + 1);
-      } else {
-        const key = token.slice(2);
-        const next = argv[i + 1];
-        if (next && !next.startsWith('--')) {
-          args[key] = next;
-          i++;
-        } else {
-          args[key] = true;
-        }
-      }
-    }
-  }
-  return args;
-}
+// parseArgs 已迁移至 lib/shared.cjs
 
 function git(cwd, gitArgs, opts = {}) {
   return execFileSync('git', gitArgs, {

package/skywalk-sdd/context-client.cjs

@@ -6,17 +6,18 @@ const http = require('http');
 const https = require('https');
 const { URL } = require('url');
 const path = require('path');
+const {
+  parseArgs,
+  requestJson: sharedRequestJson,
+  loadKbState,
+  resolveKbParams,
+  stripBom,
+} = require('./lib/shared.cjs');
 
-function parseArgs(argv) {
-  const args = {};
-  for (const item of argv.slice(2)) {
-    if (!item.startsWith('--')) continue;
-    const equal = item.indexOf('=');
-    if (equal < 0) args[item.slice(2)] = true;
-    else args[item.slice(2, equal)] = item.slice(equal + 1);
-  }
-  return args;
-}
+// Re-export requestJson for external callers (API compatibility)
+const requestJson = sharedRequestJson;
+
+// parseArgs 已迁移至 lib/shared.cjs（统一 5 份实现）
 
 function queryFromArgs(args) {
   if (typeof args.query === 'string' && args.query.trim()) {
@@ -38,60 +39,8 @@ function buildEndpoint(apiBase, spaceId, kbId, mode) {
   return `${base}/v1/spaces/${space}/knowledge-bases/${kb}/context/match-requirement`;
 }
 
-function requestJson(url, payload, token, timeoutMs) {
-  return new Promise((resolve, reject) => {
-    const target = new URL(url);
-    const transport = target.protocol === 'https:' ? https : http;
-    const body = JSON.stringify(payload);
-    const headers = {
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-      'Content-Length': Buffer.byteLength(body),
-    };
-    if (token) headers.Authorization = `Bearer ${token}`;
-
-    const request = transport.request(
-      {
-        hostname: target.hostname,
-        port: target.port || (target.protocol === 'https:' ? 443 : 80),
-        path: target.pathname + target.search,
-        method: 'POST',
-        headers,
-        timeout: timeoutMs,
-      },
-      (response) => {
-        let responseBody = '';
-        response.on('data', (chunk) => {
-          responseBody += chunk;
-        });
-        response.on('end', () => {
-          let parsed;
-          try {
-            parsed = responseBody ? JSON.parse(responseBody) : null;
-          } catch {
-            reject(new Error(`knowledge base returned invalid JSON (HTTP ${response.statusCode})`));
-            return;
-          }
-          if (response.statusCode >= 400) {
-            reject(new Error(parsed?.message || `knowledge base HTTP ${response.statusCode}`));
-            return;
-          }
-          // code 字段仅当存在且不为 0 时才视为业务错误（health/ingest 等管理 API 返回 code，
-          // 但 resolve/search 等 context API 直接返回 data，不包含 code 字段）
-          if (parsed?.code != null && parsed.code !== 0) {
-            reject(new Error(parsed?.message || `knowledge base error code ${parsed.code}`));
-            return;
-          }
-          resolve(parsed.data);
-        });
-      },
-    );
-    request.on('timeout', () => request.destroy(new Error(`knowledge base timeout after ${timeoutMs}ms`)));
-    request.on('error', reject);
-    request.write(body);
-    request.end();
-  });
-}
+// requestJson 已迁移至 lib/shared.cjs（统一 HTTP 请求逻辑）
+// 保留 const requestJson = sharedRequestJson 以维持 API 兼容
 
 function compactContext(data, includeCandidates, mode = 'match') {
   if (includeCandidates) return data;
@@ -157,33 +106,35 @@ function buildPayload(args, mode) {
 
 async function retrieveContext(args = parseArgs(process.argv), env = process.env) {
   // 优先从共享 state 文件读取配置（与 opsx-ontology-query / opsx-kb-ingest 共用）
-  // 搜索多个可能的 IDE skills 目录（.codebuddy / .claude / .cursor 等）
   let stateConfig = {};
   const stateFile = args['state-file'] || env.SDD_KB_STATE_FILE;
-  const candidatePaths = [];
-  if (stateFile) candidatePaths.push(stateFile);
-  // 从 skywalk-sdd 目录向上查找 skills/.shared/kb-state.json
-  const ideDirs = ['.codebuddy', '.claude', '.cursor', '.vscode'];
-  for (const ide of ideDirs) {
-    candidatePaths.push(path.join(__dirname, '..', ide, 'skills', '.shared', 'kb-state.json'));
-  }
-  // 也检查 skywalk-sdd 同级的 .shared
-  candidatePaths.push(path.join(__dirname, '.shared', 'kb-state.json'));
-  for (const p of candidatePaths) {
+
+  if (stateFile) {
+    // 显式指定路径，直接读取
     try {
-      if (fs.existsSync(p)) {
-        stateConfig = JSON.parse(fs.readFileSync(p, 'utf8'));
-        break;
+      if (fs.existsSync(stateFile)) {
+        let raw = fs.readFileSync(stateFile, 'utf8');
+        raw = stripBom(raw);
+        stateConfig = JSON.parse(raw);
       }
-    } catch (_) { /* try next */ }
+    } catch (e) {
+      console.error(`⚠️  kb-state.json 解析失败 (${stateFile}): ${e.message}`);
+    }
+  } else {
+    // 从 __dirname 逐层向上搜索（复用 shared.cjs 的 loadKbState）
+    const { config, warnings } = loadKbState(__dirname, env);
+    if (warnings.length > 0) {
+      for (const w of warnings) console.error(`⚠️  ${w}`);
+    }
+    stateConfig = config || {};
   }
 
-  const apiBase = args['api-base'] || stateConfig.api || env.ENGINEERING_KB_API || 'http://localhost:8090/api';
-  const token = args.token || stateConfig.apiKey || env.ENGINEERING_KB_TOKEN || '';
-  const spaceId = args['space-id'] || env.ENGINEERING_KB_SPACE_ID ||
-    (stateConfig.targets && stateConfig.targets.length > 0 ? stateConfig.targets[0].spaceId : '');
-  const kbId = args['kb-id'] || env.ENGINEERING_KB_KB_ID ||
-    (stateConfig.targets && stateConfig.targets.length > 0 ? stateConfig.targets[0].kbId : '');
+  const { apiBase: kbApiBase, token: kbToken, spaceId: kbSpaceId, kbId: kbKbId, targets: kbTargets } = resolveKbParams(stateConfig, env);
+
+  const apiBase = args['api-base'] || kbApiBase;
+  const token = args.token || kbToken;
+  const spaceId = args['space-id'] || kbSpaceId;
+  const kbId = args['kb-id'] || kbKbId;
 
   // --check-only: 只检查 KB 配置是否就绪，不发起 API 请求
   // 用于 SDD 各阶段（propose/spec/design/task/check）统一检测 KB 可用性，消除相对路径歧义
@@ -197,13 +148,13 @@ async function retrieveContext(args = parseArgs(process.argv), env = process.env
         available: false,
         reason: 'engineering_kb_not_configured',
         missing,
-        hint: 'Run opsx-ontology-query Session startup to configure .shared/kb-state.json',
+        hint: 'Run /opsx-kb-config to configure kb-state.json (in spec root)',
       };
     }
     return {
       available: true,
       api: apiBase,
-      targets: stateConfig.targets || [],
+      targets: kbTargets,
     };
   }