oh-skillhub 0.1.4 → 0.1.6

package/README.md

@@ -11,7 +11,7 @@ npx oh-skillhub install --domain arkui --agent codex
 npx oh-skillhub install --domain arkui --agent all --scope user
 ```
 
-Running without arguments starts a TUI selector and installs the selected skill set to the default Codex user skills directory.
+Running without arguments starts a TUI selector. Choose the install target first (`Codex`, `Claude`, `OpenCode`, or `All`), then choose the skill groups to install.
 
 In an interactive terminal:
 
@@ -22,7 +22,7 @@ In an interactive terminal:
 When input is piped or the terminal does not support raw key input, enter numbers separated by spaces:
 
 ```bash
-printf "3 9\n" | npx oh-skillhub@latest
+printf "1\n3 9\n" | npx oh-skillhub@latest
 ```
 
 ## Current Capabilities
@@ -31,6 +31,7 @@ printf "3 9\n" | npx oh-skillhub@latest
 - Resolve profile/domain selections such as `arkui`, `app-dev`, `cicd`, `testing`, and `security`.
 - Install skills into Codex, Claude Code, and OpenCode target directories.
 - Support `--agent codex|claude|opencode|all`.
+- Support interactive target selection for `Codex`, `Claude`, `OpenCode`, and `All`.
 - Support `--scope user|project`.
 - Support `--dry-run` install plans.
 - Run a TUI matching the `skills/common/*` and `skills/domain/*` repository layout.

package/package.json

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

package/src/cli.js

@@ -21,6 +21,20 @@ const DOMAIN_NAMES = [
   "kernel",
   "security",
 ];
+const ANSI = {
+  reset: "\x1b[0m",
+  bold: "\x1b[1m",
+  dim: "\x1b[2m",
+  cyan: "\x1b[36m",
+  green: "\x1b[32m",
+  reverse: "\x1b[7m",
+};
+const AGENT_CHOICES = [
+  { agent: "codex", label: "Codex", hint: "~/.codex/skills" },
+  { agent: "claude", label: "Claude", hint: "~/.claude/skills" },
+  { agent: "opencode", label: "OpenCode", hint: "~/.config/opencode/skill" },
+  { agent: "all", label: "All", hint: "Codex + Claude + OpenCode" },
+];
 
 async function main(argv = []) {
   if (argv.length === 0) {
@@ -149,17 +163,46 @@ function renderInstall(options) {
 async function runInteractiveInstaller(input = process.stdin, output = process.stdout) {
   const manifest = loadLocalManifest();
   const choices = buildRepositoryChoices(manifest);
-  const selectedIndexes =
-    input.isTTY && output.isTTY
-      ? await runRawTuiSelection(input, output, choices)
-      : await runPromptSelection(input, output, choices);
+  let agent;
+  let selectedIndexes;
+  if (input.isTTY && output.isTTY) {
+    agent = await runRawAgentSelection(input, output);
+    selectedIndexes = await runRawTuiSelection(input, output, choices, agent);
+  } else {
+    const answers = splitPromptAnswers(await readAll(input));
+    const [agentAnswer, groupAnswer] = answers.length > 1 ? [answers[0], answers.slice(1).join(" ")] : ["", answers[0] || ""];
+    output.write(renderAgentMenu());
+    output.write("Select target [1]: \n");
+    agent = AGENT_CHOICES[parseSingleSelection(agentAnswer, AGENT_CHOICES.length, 1)].agent;
+    output.write(renderTuiMenu(choices, agent));
+    output.write("Select groups [9]: \n");
+    selectedIndexes = parseSelection(groupAnswer, choices.length, 9);
+  }
   const selectedChoices = selectedIndexes.map((index) => choices[index]);
   const skills = selectSkillsForChoices(manifest, selectedChoices);
   if (!skills.length) {
     throw new Error("No skills matched the selected groups.");
   }
-  output.write(`\nInstalling ${selectedChoices.map((choice) => choice.path).join(", ")} for codex:user...\n`);
-  output.write(`${renderInstallForSkills(skills, { agent: "codex", scope: "user" })}\n`);
+  output.write(`\nInstalling ${selectedChoices.map((choice) => choice.path).join(", ")} for ${agent}:user...\n`);
+  output.write(`${renderInstallForSkills(skills, { agent, scope: "user" })}\n`);
+}
+
+function readAll(input) {
+  return new Promise((resolve, reject) => {
+    let text = "";
+    input.setEncoding("utf8");
+    input.on("data", (chunk) => {
+      text += chunk;
+    });
+    input.on("end", () => resolve(text));
+    input.on("error", reject);
+  });
+}
+
+function splitPromptAnswers(text) {
+  return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n").filter((line, index, lines) => {
+    return line.length > 0 || index < lines.length - 1;
+  });
 }
 
 function buildRepositoryChoices(manifest) {
@@ -175,7 +218,7 @@ function buildRepositoryChoices(manifest) {
   return choices;
 }
 
-function renderTuiMenu(choices) {
+function renderTuiMenu(choices, agent = "codex") {
   const width = 72;
   const line = `+${"-".repeat(width - 2)}+`;
   const lines = [
@@ -185,7 +228,7 @@ function renderTuiMenu(choices) {
     line,
     "",
     "Target",
-    "  Agent: codex",
+    `  Agent: ${agent}`,
     "  Scope: user",
     "",
     "Choose skill groups",
@@ -204,18 +247,49 @@ function renderTuiMenu(choices) {
   return `${lines.join("\n")}\n`;
 }
 
-async function runPromptSelection(input, output, choices) {
-  output.write(renderTuiMenu(choices));
-  const rl = readlinePromises.createInterface({ input, output });
+function renderAgentMenu() {
+  const width = 72;
+  const line = `+${"-".repeat(width - 2)}+`;
+  const lines = [
+    line,
+    `| ${padRight("OH SkillHub", width - 4)} |`,
+    `| ${padRight("OpenHarmony Skills Installer", width - 4)} |`,
+    line,
+    "",
+    "Choose install target",
+    "  Pick where the selected skills should be installed.",
+    "",
+  ];
+  AGENT_CHOICES.forEach((choice, index) => {
+    lines.push(`  ${index + 1}. [ ] ${choice.label.padEnd(10, " ")} ${choice.hint}`);
+  });
+  lines.push("");
+  return `${lines.join("\n")}\n`;
+}
+
+async function runPromptAgentSelection(input, output, existingInterface) {
+  output.write(renderAgentMenu());
+  const rl = existingInterface || readlinePromises.createInterface({ input, output });
+  try {
+    const answer = await rl.question("Select target [1]: ");
+    return AGENT_CHOICES[parseSingleSelection(answer, AGENT_CHOICES.length, 1)].agent;
+  } finally {
+    if (!existingInterface) rl.close();
+  }
+}
+
+async function runPromptSelection(input, output, choices, agent = "codex", existingInterface) {
+  output.write(renderTuiMenu(choices, agent));
+  const rl = existingInterface || readlinePromises.createInterface({ input, output });
   try {
     const answer = await rl.question("Select groups [9]: ");
     return parseSelection(answer, choices.length, 9);
   } finally {
-    rl.close();
+    if (!existingInterface) rl.close();
   }
 }
 
-function runRawTuiSelection(input, output, choices) {
+function runRawTuiSelection(input, output, choices, agent = "codex") {
   return new Promise((resolve, reject) => {
     let cursor = 8;
     const selected = new Set([cursor]);
@@ -226,7 +300,7 @@ function runRawTuiSelection(input, output, choices) {
 
     function render() {
       output.write("\x1b[2J\x1b[H");
-      output.write(renderRawTuiMenu(choices, cursor, selected));
+      output.write(renderRawTuiMenu(choices, cursor, selected, agent));
     }
 
     function cleanup() {
@@ -269,35 +343,123 @@ function runRawTuiSelection(input, output, choices) {
   });
 }
 
-function renderRawTuiMenu(choices, cursor, selected) {
+function runRawAgentSelection(input, output) {
+  return new Promise((resolve, reject) => {
+    let cursor = 0;
+    const wasRaw = input.isRaw;
+
+    readline.emitKeypressEvents(input);
+    input.setRawMode(true);
+
+    function render() {
+      output.write("\x1b[2J\x1b[H");
+      output.write(renderRawAgentMenu(cursor));
+    }
+
+    function cleanup() {
+      input.removeListener("keypress", onKeypress);
+      input.setRawMode(Boolean(wasRaw));
+      output.write("\x1b[?25h");
+    }
+
+    function onKeypress(_str, key) {
+      if (key && key.ctrl && key.name === "c") {
+        cleanup();
+        reject(new Error("Cancelled."));
+        return;
+      }
+      if (key && (key.name === "down" || key.name === "j")) {
+        cursor = (cursor + 1) % AGENT_CHOICES.length;
+        render();
+        return;
+      }
+      if (key && (key.name === "up" || key.name === "k")) {
+        cursor = (cursor - 1 + AGENT_CHOICES.length) % AGENT_CHOICES.length;
+        render();
+        return;
+      }
+      if (key && (key.name === "space" || key.name === "return")) {
+        cleanup();
+        resolve(AGENT_CHOICES[cursor].agent);
+      }
+    }
+
+    output.write("\x1b[?25l");
+    render();
+    input.on("keypress", onKeypress);
+  });
+}
+
+function renderRawAgentMenu(cursor) {
   const width = 76;
   const line = `+${"-".repeat(width - 2)}+`;
   const lines = [
     line,
-    `| ${padRight("OH SkillHub", width - 4)} |`,
-    `| ${padRight("OpenHarmony Skills Installer", width - 4)} |`,
+    rawHeaderLine("OH SkillHub", width, ANSI.cyan, ANSI.bold),
+    rawHeaderLine("OpenHarmony Skills Installer", width, ANSI.dim),
     line,
     "",
-    "Target",
-    "  Agent: codex",
+    colorize("Choose install target", ANSI.bold),
+    colorize("  Up/Down or j/k: move    Space/Enter: select    Ctrl+C: cancel", ANSI.dim),
+    "",
+  ];
+  AGENT_CHOICES.forEach((choice, index) => {
+    const pointer = index === cursor ? ">" : " ";
+    const row = `${pointer} [ ] ${choice.label.padEnd(10, " ")} ${choice.hint}`;
+    lines.push(index === cursor ? colorize(row, ANSI.reverse, ANSI.bold) : row);
+  });
+  lines.push("");
+  return `${lines.join("\n")}\n`;
+}
+
+function renderRawTuiMenu(choices, cursor, selected, agent = "codex") {
+  const width = 76;
+  const line = `+${"-".repeat(width - 2)}+`;
+  const lines = [
+    line,
+    rawHeaderLine("OH SkillHub", width, ANSI.cyan, ANSI.bold),
+    rawHeaderLine("OpenHarmony Skills Installer", width, ANSI.dim),
+    line,
+    "",
+    colorize("Target", ANSI.bold),
+    `  Agent: ${agent}`,
     "  Scope: user",
     "",
-    "Choose skill groups",
-    "  Up/Down or j/k: move    Space: select    Enter: install    Ctrl+C: cancel",
+    colorize("Choose skill groups", ANSI.bold),
+    colorize("  Up/Down or j/k: move    Space: select    Enter: install    Ctrl+C: cancel", ANSI.dim),
     "",
   ];
   choices.forEach((choice, index) => {
     const pointer = index === cursor ? ">" : " ";
-    const checkbox = selected.has(index) ? "[✓]" : "[ ]";
-    lines.push(`${pointer} ${checkbox} ${choice.path.padEnd(28, " ")} ${choice.count} skill(s)`);
+    const highlighted = index === cursor;
+    const checkbox = rawCheckbox(selected.has(index), highlighted);
+    const row = `${pointer} ${checkbox} ${choice.path.padEnd(28, " ")} ${choice.count} skill(s)`;
+    lines.push(highlighted ? colorize(row, ANSI.reverse, ANSI.bold) : row);
     for (const leaf of renderSkillLeaves(choice)) {
-      lines.push(`      - ${leaf}`);
+      lines.push(colorize(`      - ${leaf}`, ANSI.dim));
     }
   });
   lines.push("");
   return `${lines.join("\n")}\n`;
 }
 
+function colorize(value, ...codes) {
+  return `${codes.join("")}${value}${ANSI.reset}`;
+}
+
+function rawHeaderLine(value, width, ...codes) {
+  const styled = colorize(value, ...codes);
+  return `| ${styled}${" ".repeat(width - 4 - value.length)} |`;
+}
+
+function rawCheckbox(isSelected, highlighted) {
+  if (!isSelected) {
+    return "[ ]";
+  }
+  const restore = highlighted ? `${ANSI.reverse}${ANSI.bold}` : "";
+  return `${colorize("[✓]", ANSI.green, ANSI.bold)}${restore}`;
+}
+
 function renderSkillLeaves(choice) {
   return (choice.skills || []).map((skill) => {
     if (choice.scope === "common") {
@@ -332,6 +494,14 @@ function parseSelection(answer, max, defaultNumber) {
   return indexes;
 }
 
+function parseSingleSelection(answer, max, defaultNumber) {
+  const indexes = parseSelection(answer, max, defaultNumber);
+  if (indexes.length !== 1) {
+    throw new Error("Choose one target.");
+  }
+  return indexes[0];
+}
+
 function selectSkillsForChoices(manifest, choices) {
   const selected = new Map();
   for (const choice of choices) {
@@ -435,7 +605,7 @@ function helpText() {
   return [
     "oh-skillhub",
     "",
-    "Run without arguments to choose a skill domain interactively.",
+    "Run without arguments to choose an agent target and skill domain interactively.",
     "",
     "Commands:",
     "  list [--domain <name>] [--stage <name>]",
@@ -457,6 +627,8 @@ module.exports = {
   renderList,
   renderTelemetry,
   buildRepositoryChoices,
+  renderAgentMenu,
+  renderRawAgentMenu,
   parseSelection,
   renderRawTuiMenu,
   renderTuiMenu,