oh-skillhub 0.1.11 → 0.1.12

package/README.md

@@ -12,16 +12,23 @@ npx oh-skillhub install --domain arkui --agent all --scope user
 npx oh-skillhub clean --agent claude --scope user --dry-run
 ```
 
-Running without arguments starts a TUI selector. Choose the install target first (`Codex`, `Claude`, `OpenCode`, or `All`), then choose the skill groups to install.
+Running without arguments starts a TUI selector. Choose an action first (`Install skills` or `Clean installed skills`). Install then asks for the target (`Codex`, `Claude`, `OpenCode`, or `All`) and skill groups. Clean asks for the target and installed skills to remove.
 
 In an interactive terminal:
 
 - Use `Up` / `Down` or `j` / `k` to move.
-- Press `Space` to select or unselect a group.
-- Press `Enter` to install selected groups.
+- Press `Space` to select or unselect items.
+- Press `Enter` to confirm the current action.
 
 When input is piped or the terminal does not support raw key input, enter numbers separated by spaces:
 
+```bash
+printf "1\n1\n3 9\n" | npx oh-skillhub@latest
+printf "2\n2\n1\n\n" | npx oh-skillhub@latest
+```
+
+The old piped installer format is still accepted:
+
 ```bash
 printf "1\n3 9\n" | npx oh-skillhub@latest
 ```
@@ -37,6 +44,7 @@ printf "1\n3 9\n" | npx oh-skillhub@latest
 - Support `--scope user|project`.
 - Support `--dry-run` install plans.
 - Scan installed skills and clean selected skills with `clean`.
+- Show clean as a first-class option in the default TUI.
 - Move cleaned skills to `.oh-skillhub/trash` by default, with `--purge` for permanent deletion.
 - Run a TUI matching the `skills/common/*` and `skills/domain/*` repository layout.
 - Keep anonymous telemetry events in a local retry queue.
@@ -119,7 +127,7 @@ node bin/oh-skillhub.js install --domain arkui --agent all --scope user --dry-ru
 
 - Uses a bundled manifest derived from the GitCode `release` branch examples.
 - Does not yet refresh the remote GitCode manifest at runtime.
-- Writes a generated `SKILL.md` from manifest metadata instead of downloading full remote skill directories.
+- Downloads and installs full skill directories for manifest entries, but does not yet support arbitrary remote skill discovery outside the bundled manifest.
 - Telemetry collector upload is designed but not yet wired; events are queued locally.
 
 

package/package.json

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

package/src/cli.js

@@ -37,10 +37,14 @@ const AGENT_CHOICES = [
   { agent: "opencode", label: "OpenCode", hint: "~/.config/opencode/skill" },
   { agent: "all", label: "All", hint: "Codex + Claude + OpenCode" },
 ];
+const ACTION_CHOICES = [
+  { action: "install", label: "Install skills", hint: "Choose OpenHarmony skill groups to install" },
+  { action: "clean", label: "Clean installed skills", hint: "Scan an agent target and remove selected skills" },
+];
 
 async function main(argv = []) {
   if (argv.length === 0) {
-    await runInteractiveInstaller();
+    await runHome();
     return;
   }
   if (argv[0] === "--help" || argv[0] === "-h") {
@@ -101,18 +105,52 @@ function parseArgs(args) {
   return options;
 }
 
+async function runHome(input = process.stdin, output = process.stdout) {
+  if (input.isTTY && output.isTTY) {
+    const action = await runRawActionSelection(input, output);
+    if (action === "clean") {
+      await runClean({}, input, output);
+      return;
+    }
+    await runInteractiveInstaller(input, output);
+    return;
+  }
+
+  const answers = splitPromptAnswers(await readAll(input));
+  const hasActionAnswer = answers.length >= 3 && isSingleSelection(answers[0], ACTION_CHOICES.length);
+  if (!hasActionAnswer) {
+    await runInteractiveInstallerFromAnswers(answers, output);
+    return;
+  }
+
+  output.write(renderActionMenu());
+  output.write("Select action [1]: \n");
+  const action = ACTION_CHOICES[parseSingleSelection(answers[0], ACTION_CHOICES.length, 1)].action;
+  if (action === "clean") {
+    await runCleanWithAnswers({}, input, output, answers.slice(1));
+    return;
+  }
+  await runInteractiveInstallerFromAnswers(answers.slice(1), output);
+}
+
 async function runClean(options, input = process.stdin, output = process.stdout) {
   const scriptedAnswers = input.isTTY ? null : splitPromptAnswers(await readAll(input));
+  await runCleanWithAnswers(options, input, output, scriptedAnswers);
+}
+
+async function runCleanWithAnswers(options, input, output, scriptedAnswers = null) {
+  const cleanOptions = { names: [], ...options };
+  const hasScriptedAnswers = Array.isArray(scriptedAnswers);
   let answerIndex = 0;
   const takeAnswer = () => {
-    if (!scriptedAnswers) return null;
+    if (!hasScriptedAnswers) return null;
     const answer = scriptedAnswers[answerIndex] || "";
     answerIndex += 1;
     return answer;
   };
-  let agent = options.agent;
-  if (!agent && !options.target) {
-    if (input.isTTY && output.isTTY) {
+  let agent = cleanOptions.agent;
+  if (!agent && !cleanOptions.target) {
+    if (!hasScriptedAnswers && input.isTTY && output.isTTY) {
       agent = await runRawAgentSelection(input, output);
     } else {
       output.write(renderAgentMenu());
@@ -122,8 +160,8 @@ async function runClean(options, input = process.stdin, output = process.stdout)
   }
   const targets = resolveAgentTargets({
     agent: agent || "codex",
-    scope: options.scope || "user",
-    target: options.target,
+    scope: cleanOptions.scope || "user",
+    target: cleanOptions.target,
     cwd: process.cwd(),
     homeDir: os.homedir(),
     env: process.env,
@@ -135,8 +173,8 @@ async function runClean(options, input = process.stdin, output = process.stdout)
   }
   let selected;
   let prefilledConfirmation = null;
-  if (!options.names.length && !options.dryRun) {
-    if (input.isTTY) {
+  if (!cleanOptions.names.length && !cleanOptions.dryRun) {
+    if (!hasScriptedAnswers && input.isTTY) {
       selected = await promptCleanSelection(input, output, discovered);
     } else {
       output.write(renderCleanSelectionMenu(discovered));
@@ -145,16 +183,16 @@ async function runClean(options, input = process.stdin, output = process.stdout)
       prefilledConfirmation = takeAnswer() || "";
     }
   } else {
-    selected = selectCleanSkills(discovered, options.names);
-    if (!input.isTTY) {
+    selected = selectCleanSkills(discovered, cleanOptions.names);
+    if (hasScriptedAnswers || !input.isTTY) {
       prefilledConfirmation = takeAnswer();
     }
   }
   if (!selected.length) {
-    throw new Error(`No installed skills matched: ${options.names.join(", ")}`);
+    throw new Error(`No installed skills matched: ${cleanOptions.names.join(", ")}`);
   }
-  const plan = planClean(selected, { mode: options.purge ? "purge" : "trash" });
-  if (options.dryRun) {
+  const plan = planClean(selected, { mode: cleanOptions.purge ? "purge" : "trash" });
+  if (cleanOptions.dryRun) {
     output.write(`${renderCleanPlan("Clean dry run", plan)}\n`);
     return;
   }
@@ -318,23 +356,32 @@ function renderInstall(options) {
 }
 
 async function runInteractiveInstaller(input = process.stdin, output = process.stdout) {
+  if (!(input.isTTY && output.isTTY)) {
+    await runInteractiveInstallerFromAnswers(splitPromptAnswers(await readAll(input)), output);
+    return;
+  }
+
   const manifest = loadLocalManifest();
   const choices = buildRepositoryChoices(manifest);
-  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 agent = await runRawAgentSelection(input, output);
+  const selectedIndexes = await runRawTuiSelection(input, output, choices, agent);
+  await installInteractiveSelection(manifest, choices, agent, selectedIndexes, output);
+}
+
+async function runInteractiveInstallerFromAnswers(answers, output = process.stdout) {
+  const manifest = loadLocalManifest();
+  const choices = buildRepositoryChoices(manifest);
+  const [agentAnswer, groupAnswer] = answers.length > 1 ? [answers[0], answers.slice(1).join(" ")] : ["", answers[0] || ""];
+  output.write(renderAgentMenu());
+  output.write("Select target [1]: \n");
+  const agent = AGENT_CHOICES[parseSingleSelection(agentAnswer, AGENT_CHOICES.length, 1)].agent;
+  output.write(renderTuiMenu(choices, agent));
+  output.write("Select groups [9]: \n");
+  const selectedIndexes = parseSelection(groupAnswer, choices.length, 9);
+  await installInteractiveSelection(manifest, choices, agent, selectedIndexes, output);
+}
+
+async function installInteractiveSelection(manifest, choices, agent, selectedIndexes, output) {
   const selectedChoices = selectedIndexes.map((index) => choices[index]);
   const skills = selectSkillsForChoices(manifest, selectedChoices);
   if (!skills.length) {
@@ -426,6 +473,26 @@ function renderAgentMenu() {
   return `${lines.join("\n")}\n`;
 }
 
+function renderActionMenu() {
+  const width = 72;
+  const line = `+${"-".repeat(width - 2)}+`;
+  const lines = [
+    line,
+    `| ${padRight("OH SkillHub", width - 4)} |`,
+    `| ${padRight("OpenHarmony Skills Manager", width - 4)} |`,
+    line,
+    "",
+    "Choose action",
+    "  Install new skills or clean existing skills from an agent target.",
+    "",
+  ];
+  ACTION_CHOICES.forEach((choice, index) => {
+    lines.push(`  ${index + 1}. [ ] ${choice.label.padEnd(22, " ")} ${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 });
@@ -549,6 +616,75 @@ function runRawAgentSelection(input, output) {
   });
 }
 
+function runRawActionSelection(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(renderRawActionMenu(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) % ACTION_CHOICES.length;
+        render();
+        return;
+      }
+      if (key && (key.name === "up" || key.name === "k")) {
+        cursor = (cursor - 1 + ACTION_CHOICES.length) % ACTION_CHOICES.length;
+        render();
+        return;
+      }
+      if (key && (key.name === "space" || key.name === "return")) {
+        cleanup();
+        resolve(ACTION_CHOICES[cursor].action);
+      }
+    }
+
+    output.write("\x1b[?25l");
+    render();
+    input.on("keypress", onKeypress);
+  });
+}
+
+function renderRawActionMenu(cursor) {
+  const width = 76;
+  const line = `+${"-".repeat(width - 2)}+`;
+  const lines = [
+    line,
+    rawHeaderLine("OH SkillHub", width, ANSI.cyan, ANSI.bold),
+    rawHeaderLine("OpenHarmony Skills Manager", width, ANSI.dim),
+    line,
+    "",
+    colorize("Choose action", ANSI.bold),
+    colorize("  Up/Down or j/k: move    Space/Enter: select    Ctrl+C: cancel", ANSI.dim),
+    "",
+  ];
+  ACTION_CHOICES.forEach((choice, index) => {
+    const pointer = index === cursor ? ">" : " ";
+    const row = `${pointer} [ ] ${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) {
   const width = 76;
   const line = `+${"-".repeat(width - 2)}+`;
@@ -661,6 +797,15 @@ function parseSingleSelection(answer, max, defaultNumber) {
   return indexes[0];
 }
 
+function isSingleSelection(answer, max) {
+  try {
+    parseSingleSelection(answer, max, 1);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function selectSkillsForChoices(manifest, choices) {
   const selected = new Map();
   for (const choice of choices) {
@@ -774,7 +919,7 @@ function helpText() {
   return [
     "oh-skillhub",
     "",
-    "Run without arguments to choose an agent target and skill domain interactively.",
+    "Run without arguments to choose install or clean interactively.",
     "",
     "Commands:",
     "  list [--domain <name>] [--stage <name>]",
@@ -798,7 +943,9 @@ module.exports = {
   renderTelemetry,
   buildRepositoryChoices,
   renderAgentMenu,
+  renderActionMenu,
   renderCleanPlan,
+  renderRawActionMenu,
   renderRawAgentMenu,
   parseSelection,
   renderRawTuiMenu,