@lumi-ai-lab/harness-data 0.0.13 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumi-ai-lab/harness-data",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "Installer and updater for Harness Data",
   "type": "module",
   "bin": {

package/src/commands/doctor.js

@@ -40,10 +40,15 @@ function configPathsValid(workspace) {
   return matches.length >= 3 && matches.every((entry) => fs.existsSync(entry));
 }
 
-function jsonFileValid(file) {
+function casCredentialsValid(dir) {
+  const encrypted = path.join(dir, "credentials.enc");
   try {
-    JSON.parse(fs.readFileSync(file, "utf8"));
-    return true;
+    if (fs.statSync(encrypted).size > 0) return true;
+  } catch {}
+
+  try {
+    const config = JSON.parse(fs.readFileSync(path.join(dir, "config.json"), "utf8"));
+    return Boolean(config?.cas?.username && config?.cas?.password);
   } catch {
     return false;
   }
@@ -65,7 +70,7 @@ export async function collectDoctor(workspace, options = {}) {
   add("config/harness-config.yaml", fs.existsSync(path.join(workspace, "config", "harness-config.yaml")));
   add("config/qdm-cli-paths.env", fs.existsSync(path.join(workspace, "config", "qdm-cli-paths.env")));
   add("config CLI paths", configPathsValid(workspace));
-  add("CAS credentials file", jsonFileValid(path.join(casConfigDir, "config.json")), casConfigDir);
+  add("CAS credentials file", casCredentialsValid(casConfigDir), casConfigDir);
   add("CMR token", await tokenCheck(workspace, "qdm-cmr-cli", env));
   add("Indicators token", await tokenCheck(workspace, "qdm-indicators-cli", env));
   add("Agent hook", concreteAgentNames.some((name) => agentOk(workspace, name)));

package/src/commands/install.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import { commandExists, run } from "../lib/exec.js";
 import { writeLocalConfig, linkAgents } from "../lib/config.js";
 import { ask, askSecret, chooseAgent } from "../lib/prompt.js";
-import { resolveWorkspaceDir, writeState } from "../lib/paths.js";
+import { readUserState, resolveWorkspaceDir, writeState } from "../lib/paths.js";
 import { installToolsFromManifest, manifestDigest, readManifest } from "../lib/manifest.js";
 import { binaryName, platformKey } from "../lib/platform.js";
 import { resolveLatestManifest } from "../lib/tool-release.js";
@@ -16,6 +16,14 @@ import { gitUrls, runGitWithProtocol } from "../lib/git-auth.js";
 const runtimeRepo = "lumi-ai-lab/harness-data";
 const wikisRepo = "lumi-ai-lab/harness-data-wikis";
 
+function readInstallState(runtimeDir) {
+  try {
+    return JSON.parse(fs.readFileSync(path.join(runtimeDir, ".harness", "installer-state.json"), "utf8"));
+  } catch {
+    return readUserState();
+  }
+}
+
 async function requireCommands(commands) {
   for (const command of commands) {
     if (!(await commandExists(command))) throw new Error(`missing required command: ${command}`);
@@ -162,8 +170,9 @@ async function writeCasCredentials(runtimeDir, options = {}) {
   if (!username || !password) throw new Error("CAS username and password are required");
   const dir = casConfigDir(runtimeDir);
   fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
-  fs.writeFileSync(path.join(dir, "config.json"), `${JSON.stringify({ cas: { username, password } }, null, 2)}\n`, { mode: 0o600 });
-  ok("CAS 凭证已保存到 .qdm-auth/cas/config.json");
+  const env = { QDM_CAS_CONFIG_DIR: dir };
+  await run(path.join(runtimeDir, "bin", binaryName("cas-cli")), ["config", "set-credentials", "--username", username, "--password", password], { cwd: runtimeDir, env });
+  ok("CAS 凭证已加密保存到 .qdm-auth/cas/credentials.enc");
   return dir;
 }
 
@@ -233,17 +242,18 @@ export async function installCommand(options = {}) {
   step(3, 8, "安装 CLI 工具");
   const manifestPath = path.resolve(options.manifest || path.join(runtimeDir, "bootstrap", "cli-manifest.json"));
   const tokenMode = await hasGithubAuth(options);
+  const installState = readInstallState(runtimeDir);
 
   let manifest;
   let localTools = {};
   if (tokenMode) {
     manifest = readManifest(manifestPath);
     const latestManifest = await resolveLatestManifest(manifest, key, options);
-    manifest = await installToolsFromManifest(runtimeDir, manifestPath, { ...options, manifestOverride: latestManifest });
+    manifest = await installToolsFromManifest(runtimeDir, manifestPath, { ...options, state: installState, manifestOverride: latestManifest });
   } else {
     manifest = readManifest(manifestPath);
     const latestManifest = await resolveLatestManifest(manifest, key, { ...options, tools: ["data-harness-cli"] });
-    await installToolsFromManifest(runtimeDir, manifestPath, { ...options, manifestOverride: latestManifest });
+    manifest = await installToolsFromManifest(runtimeDir, manifestPath, { ...options, state: installState, manifestOverride: latestManifest });
     localTools = await installLocalTools(runtimeDir, options);
   }
   ok(`${Object.keys(manifest.installedTools || {}).length + Object.keys(localTools).length} 个 CLI 已安装到 bin/`);

package/src/lib/config.js

@@ -36,16 +36,17 @@ export function writeLocalConfig(workspace, options = {}) {
 }
 
 export function validateCasConfigDir(dir) {
-  const file = path.join(dir, "config.json");
-  let config;
+  const encrypted = path.join(dir, "credentials.enc");
   try {
-    config = JSON.parse(fs.readFileSync(file, "utf8"));
-  } catch {
-    throw new Error(`CAS config is missing or invalid: ${file}`);
-  }
-  if (!config?.cas?.username || !config?.cas?.password) {
-    throw new Error(`CAS config must contain non-empty cas.username and cas.password: ${file}`);
-  }
+    if (fs.statSync(encrypted).size > 0) return;
+  } catch {}
+
+  const legacy = path.join(dir, "config.json");
+  try {
+    const config = JSON.parse(fs.readFileSync(legacy, "utf8"));
+    if (config?.cas?.username && config?.cas?.password) return;
+  } catch {}
+  throw new Error(`CAS credentials are missing or invalid in: ${dir}`);
 }
 
 export function linkAgents(workspace, agent) {

package/src/lib/manifest.js

@@ -4,7 +4,7 @@ import https from "node:https";
 import path from "node:path";
 import { commandExists, run } from "./exec.js";
 import { platformKey } from "./platform.js";
-import { action, warn } from "./log.js";
+import { action, skip, warn } from "./log.js";
 
 export function readManifest(file) {
   return JSON.parse(fs.readFileSync(file, "utf8"));
@@ -136,6 +136,35 @@ function fileSha256(file) {
   return crypto.createHash("sha256").update(fs.readFileSync(file)).digest("hex");
 }
 
+function executable(file) {
+  try {
+    fs.accessSync(file, fs.constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function reusableInstalledTool(workspace, tool, asset, options = {}) {
+  const current = tool.version ? optionsStateTool(options, tool.name) : null;
+  if (!current?.version || current.version !== tool.version) return null;
+  if (!current.sha256) return null;
+  const binary = path.join(workspace, "bin", tool.binary);
+  if (!executable(binary)) return null;
+  const actualSha = fileSha256(binary);
+  if (actualSha !== current.sha256) return null;
+  return {
+    version: current.version,
+    asset: current.asset || assetName(asset),
+    sha256: current.sha256,
+    ...(current.assetSha256 ? { assetSha256: current.assetSha256 } : {})
+  };
+}
+
+function optionsStateTool(options, name) {
+  return options?.state?.tools?.[name] || null;
+}
+
 export async function installToolsFromManifest(workspace, manifestPath, options = {}) {
   const manifest = options.manifestOverride || readManifest(manifestPath);
   const only = options.tools ? new Set(options.tools) : null;
@@ -150,6 +179,12 @@ export async function installToolsFromManifest(workspace, manifestPath, options
     if (only && !only.has(tool.name)) continue;
     const asset = tool.platforms?.[key];
     if (!asset?.url) throw new Error(`manifest missing ${tool.name} asset for ${key}`);
+    const reusable = !options.force ? reusableInstalledTool(workspace, tool, asset, options) : null;
+    if (reusable) {
+      if (options.log !== false) skip(`${tool.name} 已是最新 ${tool.version}`);
+      installedTools[tool.name] = reusable;
+      continue;
+    }
     const archive = path.join(cacheDir, assetName(asset));
     if (options.log !== false) action(`下载 ${tool.name} ${tool.version} (${key})`);
     await downloadAsset(tool, asset, archive, options);
@@ -165,10 +200,12 @@ export async function installToolsFromManifest(workspace, manifestPath, options
     const binary = path.join(binDir, tool.binary);
     if (!fs.existsSync(binary)) throw new Error(`${tool.binary} was not extracted to bin/`);
     fs.chmodSync(binary, 0o755);
+    const binarySha = fileSha256(binary);
     installedTools[tool.name] = {
       version: tool.version || "",
       asset: assetName(asset),
-      sha256: sha || actualSha
+      sha256: binarySha,
+      assetSha256: sha || actualSha
     };
   }
   Object.defineProperty(manifest, "installedTools", { value: installedTools, enumerable: false });