oh-skillhub 0.1.17 → 0.1.18

package/package.json

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

package/src/agents.js

@@ -13,11 +13,10 @@ function resolveAgentTargets(options = {}) {
   if (!["user", "project"].includes(scope)) {
     throw new Error(`Unsupported scope "${scope}". Use user or project.`);
   }
-  if (agent === "all" && options.target) {
+  const agents = normalizeAgentSelection(agent);
+  if (agents.length > 1 && options.target) {
     throw new Error("--agent all cannot be combined with --target");
   }
-
-  const agents = agent === "all" ? SUPPORTED_AGENTS : [agent];
   for (const item of agents) {
     if (!SUPPORTED_AGENTS.includes(item)) {
       throw new Error(`Unsupported agent "${item}". Use codex, claude, opencode, or all.`);
@@ -31,6 +30,16 @@ function resolveAgentTargets(options = {}) {
   }));
 }
 
+function normalizeAgentSelection(agent) {
+  if (agent === "all") {
+    return SUPPORTED_AGENTS;
+  }
+  if (Array.isArray(agent)) {
+    return Array.from(new Set(agent));
+  }
+  return [agent];
+}
+
 function defaultDirFor(agent, scope, cwd, homeDir, env) {
   if (scope === "project") {
     if (agent === "codex") return path.join(cwd, ".codex", "skills");

package/src/cli.js

@@ -38,6 +38,8 @@ const AGENT_CHOICES = [
   { agent: "opencode", label: "OpenCode", hint: "~/.config/opencode/skill" },
   { agent: "all", label: "All", hint: "Codex + Claude + OpenCode" },
 ];
+const INDIVIDUAL_AGENT_INDEXES = [0, 1, 2];
+const ALL_AGENT_INDEX = 3;
 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" },
@@ -156,7 +158,7 @@ async function runCleanWithAnswers(options, input, output, scriptedAnswers = nul
     } else {
       output.write(renderAgentMenu());
       output.write("Select target [1]: \n");
-      agent = AGENT_CHOICES[parseSingleSelection(takeAnswer() || "", AGENT_CHOICES.length, 1)].agent;
+      agent = parseAgentSelection(takeAnswer() || "");
     }
   }
   const targets = resolveAgentTargets({
@@ -379,7 +381,7 @@ async function runInteractiveInstallerFromAnswers(answers, output = process.stdo
   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;
+  const agent = parseAgentSelection(agentAnswer);
   output.write(renderTuiMenu(choices, agent));
   output.write("Select groups [9]: \n");
   const selectedIndexes = parseSelection(groupAnswer, choices.length, 9);
@@ -392,7 +394,7 @@ async function installInteractiveSelection(manifest, choices, agent, selectedInd
   if (!skills.length) {
     throw new Error("No skills matched the selected groups.");
   }
-  output.write(`\nInstalling ${selectedChoices.map((choice) => choice.path).join(", ")} for ${agent}:user...\n`);
+  output.write(`\nInstalling ${selectedChoices.map((choice) => choice.path).join(", ")} for ${formatAgentSelection(agent)}:user...\n`);
   const sourceRoot = await withSpinner(output, `Preparing skill source from ${manifest.source}#${manifest.ref}`, () =>
     ensureSkillSourceRootAsync(manifest, { env: process.env, skills }),
   );
@@ -469,7 +471,7 @@ function renderTuiMenu(choices, agent = "codex") {
     line,
     "",
     "Target",
-    `  Agent: ${agent}`,
+    `  Agent: ${formatAgentSelection(agent)}`,
     "  Scope: user",
     "",
     "Choose skill groups",
@@ -607,7 +609,7 @@ function runRawTuiSelection(input, output, choices, agent = "codex") {
 function runRawAgentSelection(input, output) {
   return new Promise((resolve, reject) => {
     let cursor = 0;
-    let selected = 0;
+    const selected = new Set([0]);
     const wasRaw = input.isRaw;
 
     readline.emitKeypressEvents(input);
@@ -641,13 +643,13 @@ function runRawAgentSelection(input, output) {
         return;
       }
       if (key && key.name === "space") {
-        selected = cursor;
+        toggleAgentSelection(selected, cursor);
         render();
         return;
       }
       if (key && key.name === "return") {
         cleanup();
-        resolve(AGENT_CHOICES[selected].agent);
+        resolve(agentSelectionFromIndexes(selected, cursor));
       }
     }
 
@@ -733,9 +735,10 @@ function renderRawActionMenu(cursor, selected = cursor) {
   return `${lines.join("\n")}\n`;
 }
 
-function renderRawAgentMenu(cursor, selected = cursor) {
+function renderRawAgentMenu(cursor, selected = new Set([cursor])) {
   const width = 76;
   const line = `+${"-".repeat(width - 2)}+`;
+  const selectedIndexes = normalizeAgentIndexes(selected);
   const lines = [
     line,
     rawHeaderLine("OH SkillHub", width, ANSI.cyan, ANSI.bold),
@@ -749,7 +752,7 @@ function renderRawAgentMenu(cursor, selected = cursor) {
   AGENT_CHOICES.forEach((choice, index) => {
     const pointer = index === cursor ? ">" : " ";
     const highlighted = index === cursor;
-    const row = `${pointer} ${rawCheckbox(index === selected, highlighted)} ${choice.label.padEnd(10, " ")} ${choice.hint}`;
+    const row = `${pointer} ${rawCheckbox(isAgentIndexSelected(selectedIndexes, index), highlighted)} ${choice.label.padEnd(10, " ")} ${choice.hint}`;
     lines.push(index === cursor ? colorize(row, ANSI.reverse, ANSI.bold) : row);
   });
   lines.push("");
@@ -925,6 +928,15 @@ function parseSingleSelection(answer, max, defaultNumber) {
   return indexes[0];
 }
 
+function parseAgentSelection(answer) {
+  const indexes = parseSelection(answer, AGENT_CHOICES.length, 1);
+  if (indexes.includes(ALL_AGENT_INDEX)) {
+    return "all";
+  }
+  const agents = indexes.map((index) => AGENT_CHOICES[index].agent);
+  return agents.length === 1 ? agents[0] : agents;
+}
+
 function isSingleSelection(answer, max) {
   try {
     parseSingleSelection(answer, max, 1);
@@ -934,6 +946,62 @@ function isSingleSelection(answer, max) {
   }
 }
 
+function normalizeAgentIndexes(selected) {
+  const indexes = selected instanceof Set ? Array.from(selected) : [selected];
+  if (indexes.includes(ALL_AGENT_INDEX)) {
+    return new Set(INDIVIDUAL_AGENT_INDEXES);
+  }
+  return new Set(indexes.filter((index) => INDIVIDUAL_AGENT_INDEXES.includes(index)));
+}
+
+function isAgentIndexSelected(selected, index) {
+  if (index === ALL_AGENT_INDEX) {
+    return INDIVIDUAL_AGENT_INDEXES.every((item) => selected.has(item));
+  }
+  return selected.has(index);
+}
+
+function toggleAgentSelection(selected, cursor) {
+  if (cursor === ALL_AGENT_INDEX) {
+    if (INDIVIDUAL_AGENT_INDEXES.every((index) => selected.has(index))) {
+      selected.clear();
+      selected.add(0);
+      return;
+    }
+    selected.clear();
+    for (const index of INDIVIDUAL_AGENT_INDEXES) {
+      selected.add(index);
+    }
+    return;
+  }
+  if (selected.has(cursor) && selected.size > 1) {
+    selected.delete(cursor);
+    return;
+  }
+  selected.add(cursor);
+}
+
+function agentSelectionFromIndexes(selected, cursor = 0) {
+  const normalized = normalizeAgentIndexes(selected);
+  if (!normalized.size) {
+    normalized.add(INDIVIDUAL_AGENT_INDEXES.includes(cursor) ? cursor : 0);
+  }
+  if (INDIVIDUAL_AGENT_INDEXES.every((index) => normalized.has(index))) {
+    return "all";
+  }
+  const agents = Array.from(normalized)
+    .sort((left, right) => left - right)
+    .map((index) => AGENT_CHOICES[index].agent);
+  return agents.length === 1 ? agents[0] : agents;
+}
+
+function formatAgentSelection(agent) {
+  if (Array.isArray(agent)) {
+    return agent.join(", ");
+  }
+  return agent;
+}
+
 function selectSkillsForChoices(manifest, choices) {
   const selected = new Map();
   for (const choice of choices) {
@@ -987,7 +1055,7 @@ function renderInteractiveCompletion(skills, targetOptions, output = process.std
     renderStatusLine(
       "success",
       "INSTALL SUCCESS",
-      `Installed ${skills.length} skill(s) for ${targetOptions.agent}:${targetOptions.scope}.`,
+      `Installed ${skills.length} skill(s) for ${formatAgentSelection(targetOptions.agent)}:${targetOptions.scope}.`,
       output,
     ),
   ].join("\n");