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

package/package.json

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

package/src/commands/install.js

@@ -6,6 +6,7 @@ import { ask, askSecret, chooseAgent } from "../lib/prompt.js";
 import { 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";
 import { collectDoctor } from "./doctor.js";
 import { packageVersion } from "../lib/package.js";
 import { downloadReleaseAsset, findReleaseAsset, githubToken, hasGithubAuth, latestRelease } from "../lib/github.js";
@@ -236,10 +237,13 @@ export async function installCommand(options = {}) {
   let manifest;
   let localTools = {};
   if (tokenMode) {
-    manifest = await installToolsFromManifest(runtimeDir, manifestPath, options);
+    manifest = readManifest(manifestPath);
+    const latestManifest = await resolveLatestManifest(manifest, key, options);
+    manifest = await installToolsFromManifest(runtimeDir, manifestPath, { ...options, manifestOverride: latestManifest });
   } else {
     manifest = readManifest(manifestPath);
-    await installToolsFromManifest(runtimeDir, manifestPath, { ...options, tools: ["data-harness-cli"] });
+    const latestManifest = await resolveLatestManifest(manifest, key, { ...options, tools: ["data-harness-cli"] });
+    await installToolsFromManifest(runtimeDir, manifestPath, { ...options, manifestOverride: latestManifest });
     localTools = await installLocalTools(runtimeDir, options);
   }
   ok(`${Object.keys(manifest.installedTools || {}).length + Object.keys(localTools).length} 个 CLI 已安装到 bin/`);

package/src/commands/update.js

@@ -7,6 +7,8 @@ import { installToolsFromManifest, manifestDigest, readManifest } from "../lib/m
 import { packageVersion } from "../lib/package.js";
 import { platformKey } from "../lib/platform.js";
 import { githubToken, latestRelease } from "../lib/github.js";
+import { resolveLatestTool } from "../lib/tool-release.js";
+import { protocolFromUrl, runGitWithProtocol } from "../lib/git-auth.js";
 import { buildAndCheck, installRuntimeBundle, printDoctorSummary } from "./install.js";
 import { collectDoctor } from "./doctor.js";
 import { action, blank, header, ok, shortSha, skip, step, warn } from "../lib/log.js";
@@ -22,48 +24,17 @@ async function npmLatest() {
   }
 }
 
-function archiveSuffix(url) {
-  if (url.endsWith(".zip")) return "zip";
-  if (url.endsWith(".tar.gz")) return "tar.gz";
-  return "";
-}
-
-function toolAssetName(tool, tag, key) {
-  const current = tool.platforms?.[key]?.url || "";
-  const suffix = archiveSuffix(current) || (key.startsWith("windows-") ? "zip" : "tar.gz");
-  return `${tool.binary}-${tag}-${key}.${suffix}`;
-}
-
-function releaseAsset(release, name) {
-  return (release.assets || []).find((asset) => asset.name === name);
-}
-
-function oneToolManifest(manifest, tool, tag, asset, key) {
+function oneToolManifest(manifest, tool) {
   return {
     ...manifest,
-    tools: [{
-      ...tool,
-      version: tag,
-      platforms: {
-        [key]: {
-          url: asset.browser_download_url || `https://github.com/${tool.repo}/releases/download/${tag}/${asset.name}`,
-          sha256: ""
-        }
-      }
-    }]
+    tools: [tool]
   };
 }
 
 async function maybeUpdateTool(runtimeDir, manifest, tool, options, state) {
   const key = platformKey();
-  const release = await latestRelease(tool.repo, options);
-  const tag = release.tag_name;
-  const assetName = toolAssetName(tool, tag, key);
-  const asset = releaseAsset(release, assetName);
-  if (!asset) {
-    warn(`${tool.name} 最新 release 缺少 ${assetName}，已跳过`);
-    return null;
-  }
+  const latestTool = await resolveLatestTool(tool, key, options);
+  const tag = latestTool.version;
   const current = state.tools?.[tool.name] || {};
   const tagChanged = current.version && current.version !== tag;
   const firstInstall = !current.version;
@@ -77,17 +48,24 @@ async function maybeUpdateTool(runtimeDir, manifest, tool, options, state) {
     options.skippedUpdates?.push(`${tool.name} ${tag}`);
     return null;
   }
-  const updatedManifest = oneToolManifest(manifest, tool, tag, asset, key);
+  const updatedManifest = oneToolManifest(manifest, latestTool);
   const installed = await installToolsFromManifest(runtimeDir, path.join(runtimeDir, ".bootstrap-cache", `${tool.name}-manifest.json`), {
     ...options,
     manifestOverride: updatedManifest
   });
-  const result = installed.installedTools?.[tool.name] || { version: tag, asset: assetName };
+  const result = installed.installedTools?.[tool.name] || { version: tag };
   ok(`${tool.name} 已更新到 ${tag}`);
   return result;
 }
 
-async function updateWikis(runtimeDir, options, state) {
+async function updateWikisGit(wikisDir, args, options) {
+  const remote = (await run("git", ["-C", wikisDir, "remote", "get-url", "origin"], { ...options, allowFailure: true })).stdout.trim();
+  const protocol = protocolFromUrl(remote);
+  if (!protocol) return run("git", ["-C", wikisDir, ...args], options);
+  return runGitWithProtocol(protocol, ["-C", wikisDir, ...args], options);
+}
+
+export async function updateWikis(runtimeDir, options, state) {
   const wikisDir = path.join(runtimeDir, "wikis");
   if (!githubToken(options) && state.installMode !== "github-token") {
     skip("harness-data-wikis 为本地路径模式，请手动检查");
@@ -97,9 +75,9 @@ async function updateWikis(runtimeDir, options, state) {
     skip("harness-data-wikis 不是 git checkout");
     return null;
   }
-  await run("git", ["-C", wikisDir, "fetch", "origin"]);
-  const local = (await run("git", ["-C", wikisDir, "rev-parse", "HEAD"])).stdout.trim();
-  const remote = (await run("git", ["-C", wikisDir, "rev-parse", "origin/HEAD"], { allowFailure: true })).stdout.trim();
+  await updateWikisGit(wikisDir, ["fetch", "origin"], options);
+  const local = (await run("git", ["-C", wikisDir, "rev-parse", "HEAD"], options)).stdout.trim();
+  const remote = (await run("git", ["-C", wikisDir, "rev-parse", "origin/HEAD"], { ...options, allowFailure: true })).stdout.trim();
   if (!remote || local === remote) {
     ok(`harness-data-wikis 已是最新 ${shortSha(local)}`);
     return null;
@@ -110,8 +88,8 @@ async function updateWikis(runtimeDir, options, state) {
     options.skippedUpdates?.push(`harness-data-wikis ${shortSha(remote)}`);
     return null;
   }
-  await run("git", ["-C", wikisDir, "pull", "--ff-only"]);
-  const commit = (await run("git", ["-C", wikisDir, "rev-parse", "HEAD"])).stdout.trim();
+  await updateWikisGit(wikisDir, ["pull", "--ff-only"], options);
+  const commit = (await run("git", ["-C", wikisDir, "rev-parse", "HEAD"], options)).stdout.trim();
   ok(`harness-data-wikis 已更新到 ${shortSha(commit)}`);
   return { commit };
 }

package/src/lib/tool-release.js

@@ -0,0 +1,47 @@
+import { latestRelease } from "./github.js";
+
+function archiveSuffix(asset, key) {
+  if (asset?.archive) return asset.archive;
+  if (asset?.url?.endsWith(".zip")) return "zip";
+  if (asset?.url?.endsWith(".tar.gz")) return "tar.gz";
+  return key.startsWith("windows-") ? "zip" : "tar.gz";
+}
+
+export function toolAssetName(tool, tag, key) {
+  const suffix = archiveSuffix(tool.platforms?.[key], key);
+  return `${tool.binary}-${tag}-${key}.${suffix}`;
+}
+
+export function releaseAsset(release, name) {
+  return (release.assets || []).find((asset) => asset.name === name);
+}
+
+export async function resolveLatestTool(tool, key, options = {}) {
+  const release = await latestRelease(tool.repo, options);
+  const tag = release.tag_name;
+  const name = toolAssetName(tool, tag, key);
+  const asset = releaseAsset(release, name);
+  if (!asset) {
+    throw new Error(`${tool.name} latest release ${tag} missing ${key} asset in ${tool.repo}: ${name}`);
+  }
+  return {
+    ...tool,
+    version: tag,
+    platforms: {
+      [key]: {
+        url: asset.browser_download_url || `https://github.com/${tool.repo}/releases/download/${tag}/${asset.name}`,
+        sha256: ""
+      }
+    }
+  };
+}
+
+export async function resolveLatestManifest(manifest, key, options = {}) {
+  const only = options.tools ? new Set(options.tools) : null;
+  const tools = [];
+  for (const tool of manifest.tools || []) {
+    if (only && !only.has(tool.name)) continue;
+    tools.push(await resolveLatestTool(tool, key, options));
+  }
+  return { ...manifest, tools };
+}