oh-skillhub 0.1.13 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-skillhub",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "OpenHarmony Skills installer for Codex, Claude Code, and OpenCode.",
   "type": "commonjs",
   "bin": {

package/src/cli.js

@@ -8,7 +8,7 @@ const { resolveAgentTargets } = require("./agents");
 const { applyCleanPlan, planClean, scanInstalledSkills } = require("./cleaner");
 const { loadLocalManifest, loadProfiles, selectSkills } = require("./manifest");
 const { applyInstallPlan, planInstall } = require("./planner");
-const { ensureSkillSourceRoot } = require("./source");
+const { ensureSkillSourceRoot, ensureSkillSourceRootAsync } = require("./source");
 const { buildTelemetryEvent, enqueueTelemetryEvent, telemetryStatus } = require("./telemetry");
 
 const packageJson = require("../package.json");
@@ -392,11 +392,41 @@ async function installInteractiveSelection(manifest, choices, agent, selectedInd
     throw new Error("No skills matched the selected groups.");
   }
   output.write(`\nInstalling ${selectedChoices.map((choice) => choice.path).join(", ")} for ${agent}:user...\n`);
-  output.write(`Preparing skill source from ${manifest.source}#${manifest.ref}...\n`);
-  output.write(`${renderInstallForSkills(skills, { agent, scope: "user" })}\n`);
+  const sourceRoot = await withSpinner(output, `Preparing skill source from ${manifest.source}#${manifest.ref}`, () =>
+    ensureSkillSourceRootAsync(manifest, { env: process.env, skills }),
+  );
+  output.write(`${renderInstallForSkills(skills, { agent, scope: "user" }, sourceRoot)}\n`);
   output.write(`${renderInteractiveCompletion(skills, { agent, scope: "user" })}\n`);
 }
 
+async function withSpinner(output, message, task, options = {}) {
+  if (!output.isTTY) {
+    output.write(`${message}...\n`);
+    return task();
+  }
+
+  const frames = options.frames || ["|", "/", "-", "\\"];
+  const intervalMs = options.intervalMs || 120;
+  let index = 0;
+  const render = () => {
+    output.write(`\r${frames[index % frames.length]} ${message}...`);
+    index += 1;
+  };
+
+  render();
+  const timer = setInterval(render, intervalMs);
+  try {
+    const result = await task();
+    clearInterval(timer);
+    output.write(`\r${" ".repeat(message.length + 8)}\r✓ ${message}\n`);
+    return result;
+  } catch (error) {
+    clearInterval(timer);
+    output.write(`\r${" ".repeat(message.length + 8)}\r! ${message}\n`);
+    throw error;
+  }
+}
+
 function readAll(input) {
   return new Promise((resolve, reject) => {
     let text = "";
@@ -576,6 +606,7 @@ function runRawTuiSelection(input, output, choices, agent = "codex") {
 function runRawAgentSelection(input, output) {
   return new Promise((resolve, reject) => {
     let cursor = 0;
+    let selected = 0;
     const wasRaw = input.isRaw;
 
     readline.emitKeypressEvents(input);
@@ -583,7 +614,7 @@ function runRawAgentSelection(input, output) {
 
     function render() {
       output.write("\x1b[2J\x1b[H");
-      output.write(renderRawAgentMenu(cursor));
+      output.write(renderRawAgentMenu(cursor, selected));
     }
 
     function cleanup() {
@@ -608,9 +639,14 @@ function runRawAgentSelection(input, output) {
         render();
         return;
       }
-      if (key && (key.name === "space" || key.name === "return")) {
+      if (key && key.name === "space") {
+        selected = cursor;
+        render();
+        return;
+      }
+      if (key && key.name === "return") {
         cleanup();
-        resolve(AGENT_CHOICES[cursor].agent);
+        resolve(AGENT_CHOICES[selected].agent);
       }
     }
 
@@ -623,6 +659,7 @@ function runRawAgentSelection(input, output) {
 function runRawActionSelection(input, output) {
   return new Promise((resolve, reject) => {
     let cursor = 0;
+    let selected = 0;
     const wasRaw = input.isRaw;
 
     readline.emitKeypressEvents(input);
@@ -630,7 +667,7 @@ function runRawActionSelection(input, output) {
 
     function render() {
       output.write("\x1b[2J\x1b[H");
-      output.write(renderRawActionMenu(cursor));
+      output.write(renderRawActionMenu(cursor, selected));
     }
 
     function cleanup() {
@@ -655,9 +692,14 @@ function runRawActionSelection(input, output) {
         render();
         return;
       }
-      if (key && (key.name === "space" || key.name === "return")) {
+      if (key && key.name === "space") {
+        selected = cursor;
+        render();
+        return;
+      }
+      if (key && key.name === "return") {
         cleanup();
-        resolve(ACTION_CHOICES[cursor].action);
+        resolve(ACTION_CHOICES[selected].action);
       }
     }
 
@@ -667,7 +709,7 @@ function runRawActionSelection(input, output) {
   });
 }
 
-function renderRawActionMenu(cursor) {
+function renderRawActionMenu(cursor, selected = cursor) {
   const width = 76;
   const line = `+${"-".repeat(width - 2)}+`;
   const lines = [
@@ -677,20 +719,20 @@ function renderRawActionMenu(cursor) {
     line,
     "",
     colorize("Choose action", ANSI.bold),
-    colorize("  Up/Down or j/k: move    Space/Enter: select    Ctrl+C: cancel", ANSI.dim),
+    colorize("  Up/Down or j/k: move    Space: select    Enter: confirm    Ctrl+C: cancel", ANSI.dim),
     "",
   ];
   ACTION_CHOICES.forEach((choice, index) => {
     const pointer = index === cursor ? ">" : " ";
     const highlighted = index === cursor;
-    const row = `${pointer} ${rawCheckbox(highlighted, highlighted)} ${choice.label.padEnd(22, " ")} ${choice.hint}`;
+    const row = `${pointer} ${rawCheckbox(index === selected, highlighted)} ${choice.label.padEnd(22, " ")} ${choice.hint}`;
     lines.push(index === cursor ? colorize(row, ANSI.reverse, ANSI.bold) : row);
   });
   lines.push("");
   return `${lines.join("\n")}\n`;
 }
 
-function renderRawAgentMenu(cursor) {
+function renderRawAgentMenu(cursor, selected = cursor) {
   const width = 76;
   const line = `+${"-".repeat(width - 2)}+`;
   const lines = [
@@ -700,13 +742,13 @@ function renderRawAgentMenu(cursor) {
     line,
     "",
     colorize("Choose install target", ANSI.bold),
-    colorize("  Up/Down or j/k: move    Space/Enter: select    Ctrl+C: cancel", ANSI.dim),
+    colorize("  Up/Down or j/k: move    Space: select    Enter: confirm    Ctrl+C: cancel", ANSI.dim),
     "",
   ];
   AGENT_CHOICES.forEach((choice, index) => {
     const pointer = index === cursor ? ">" : " ";
     const highlighted = index === cursor;
-    const row = `${pointer} ${rawCheckbox(highlighted, highlighted)} ${choice.label.padEnd(10, " ")} ${choice.hint}`;
+    const row = `${pointer} ${rawCheckbox(index === selected, highlighted)} ${choice.label.padEnd(10, " ")} ${choice.hint}`;
     lines.push(index === cursor ? colorize(row, ANSI.reverse, ANSI.bold) : row);
   });
   lines.push("");
@@ -906,7 +948,7 @@ function selectSkillsForChoices(manifest, choices) {
   return Array.from(selected.values()).sort((left, right) => left.name.localeCompare(right.name));
 }
 
-function renderInstallForSkills(skills, targetOptions) {
+function renderInstallForSkills(skills, targetOptions, sourceRootOverride = null) {
   const targets = resolveAgentTargets({
     agent: targetOptions.agent,
     scope: targetOptions.scope,
@@ -916,7 +958,7 @@ function renderInstallForSkills(skills, targetOptions) {
   });
   const plan = planInstall(skills, targets);
   const manifest = loadLocalManifest();
-  const sourceRoot = ensureSkillSourceRoot(manifest, { env: process.env, skills });
+  const sourceRoot = sourceRootOverride || ensureSkillSourceRoot(manifest, { env: process.env, skills });
   const applied = applyInstallPlan(plan, { sourceRoot });
   const telemetryEnabled = process.env.OH_SKILLHUB_NO_TELEMETRY !== "1";
   for (const operation of applied) {
@@ -1036,5 +1078,6 @@ module.exports = {
   parseSelection,
   renderRawTuiMenu,
   renderTuiMenu,
+  withSpinner,
   selectSkillsForChoices,
 };

package/src/source.js

@@ -1,4 +1,4 @@
-const { spawnSync } = require("node:child_process");
+const { spawn, spawnSync } = require("node:child_process");
 const crypto = require("node:crypto");
 const fs = require("node:fs");
 const os = require("node:os");
@@ -48,6 +48,61 @@ function ensureSkillSourceRoot(manifest, options = {}) {
   return checkout;
 }
 
+async function ensureSkillSourceRootAsync(manifest, options = {}) {
+  const env = options.env || process.env;
+  if (env.OH_SKILLHUB_SOURCE_DIR) {
+    return requireDirectory(env.OH_SKILLHUB_SOURCE_DIR, "OH_SKILLHUB_SOURCE_DIR");
+  }
+
+  const source = manifest.source;
+  const ref = manifest.ref || "release";
+  if (!source) {
+    throw new Error("Manifest does not define a skill source repository.");
+  }
+
+  const cacheRoot = env.OH_SKILLHUB_CACHE_DIR || path.join(os.homedir(), ".oh-skillhub", "cache");
+  const sparsePaths = selectedSparsePaths(options.skills);
+  const checkout = path.join(cacheRoot, `${repositorySlug(source)}-${sanitize(ref)}-${sparseKey(sparsePaths)}`);
+  if (isUsableCheckout(checkout, sparsePaths)) {
+    return checkout;
+  }
+
+  fs.mkdirSync(cacheRoot, { recursive: true });
+  fs.rmSync(checkout, { recursive: true, force: true });
+  const tempCheckout = path.join(cacheRoot, `.tmp-${Date.now()}-${Math.random().toString(16).slice(2)}`);
+  const clone = await runGitAsync([
+    "-c",
+    "core.longpaths=true",
+    "clone",
+    "--depth",
+    "1",
+    "--branch",
+    ref,
+    "--no-checkout",
+    source,
+    tempCheckout,
+  ]);
+  if (clone.status !== 0) {
+    fs.rmSync(tempCheckout, { recursive: true, force: true });
+    const detail = gitDetail(clone);
+    throw new Error(`Failed to download skill source from ${source}#${ref}.${detail ? ` ${detail}` : ""}`);
+  }
+  const sparseInit = await runGitAsync(["-C", tempCheckout, "-c", "core.longpaths=true", "sparse-checkout", "init", "--no-cone"]);
+  const sparseSet = sparseInit.status === 0
+    ? await runGitAsync(["-C", tempCheckout, "-c", "core.longpaths=true", "sparse-checkout", "set", ...sparsePaths])
+    : sparseInit;
+  const checkoutResult = sparseSet.status === 0
+    ? await runGitAsync(["-C", tempCheckout, "-c", "core.longpaths=true", "checkout"])
+    : sparseSet;
+  if (checkoutResult.status !== 0) {
+    fs.rmSync(tempCheckout, { recursive: true, force: true });
+    const detail = gitDetail(checkoutResult);
+    throw new Error(`Failed to checkout selected skill source from ${source}#${ref}.${detail ? ` ${detail}` : ""}`);
+  }
+  fs.renameSync(tempCheckout, checkout);
+  return checkout;
+}
+
 function requireDirectory(value, label) {
   const dir = path.resolve(value);
   if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
@@ -82,10 +137,33 @@ function runGit(args) {
   return spawnSync("git", args, { encoding: "utf8", shell: false });
 }
 
+function runGitAsync(args) {
+  return new Promise((resolve) => {
+    const child = spawn("git", args, { shell: false });
+    let stdout = "";
+    let stderr = "";
+    child.stdout.setEncoding("utf8");
+    child.stderr.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk;
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk;
+    });
+    child.on("error", (error) => {
+      resolve({ status: 1, stdout, stderr: `${stderr}${error.message}` });
+    });
+    child.on("close", (status) => {
+      resolve({ status, stdout, stderr });
+    });
+  });
+}
+
 function gitDetail(result) {
   return (result.stderr || result.stdout || "").trim();
 }
 
 module.exports = {
   ensureSkillSourceRoot,
+  ensureSkillSourceRootAsync,
 };