@morphllm/morph-setup 1.0.1 → 1.0.3

package/dist/index.js

@@ -621,11 +621,18 @@ async function writeJson(filePath, data) {
 function tomlEscapeString(value) {
   return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n");
 }
+function buildMorphArgs(input) {
+  const args = ["-y", "@morphllm/morphmcp"];
+  if (input.apiKey) args.push("--api-key", input.apiKey);
+  return args;
+}
 function buildCodexMorphBlock(input) {
   const lines = [];
   lines.push("[mcp_servers.morph-mcp]");
   lines.push('command = "npx"');
-  lines.push('args = ["-y", "@morphllm/morphmcp"]');
+  const morphArgs = buildMorphArgs(input);
+  const argsToml = morphArgs.map((a) => `"${tomlEscapeString(a)}"`).join(", ");
+  lines.push(`args = [${argsToml}]`);
   lines.push("enabled = true");
   const env = [];
   if (input.apiKey) env.push(`MORPH_API_KEY = "${tomlEscapeString(input.apiKey)}"`);
@@ -700,7 +707,7 @@ async function installToMcpServersJson(configPath, input, options) {
   servers[key] = {
     ...existing ?? {},
     command: "npx",
-    args: ["-y", "@morphllm/morphmcp"],
+    args: buildMorphArgs(input),
     ...env ? { env } : {}
   };
   await writeJson(configPath, obj);
@@ -727,7 +734,7 @@ async function installToClaudeCodeUserConfig(configPath, input) {
     ...existing ?? {},
     type: "stdio",
     command: "npx",
-    args: ["-y", "@morphllm/morphmcp"],
+    args: buildMorphArgs(input),
     ...env ? { env } : {}
   };
   await writeJson(configPath, obj);
@@ -761,7 +768,7 @@ async function installToOpenCodeConfig(configPath, input) {
   mcp[key] = {
     ...existing ?? {},
     type: "local",
-    command: ["npx", "-y", "@morphllm/morphmcp"],
+    command: ["npx", ...buildMorphArgs(input)],
     enabled: true,
     ...Object.keys(environment).length > 0 ? { environment } : {}
   };
@@ -798,7 +805,7 @@ async function installToAmpSettings(configPath, input) {
   servers[serverKey] = {
     ...existing ?? {},
     command: "npx",
-    args: ["-y", "@morphllm/morphmcp"],
+    args: buildMorphArgs(input),
     ...env ? { env } : {}
   };
   await writeJson(configPath, obj);
@@ -930,18 +937,28 @@ function getBundledSkillsDir() {
 function getAllAgentTypes() {
   return Object.keys(agents);
 }
-async function selectAgents(opts) {
-  const allAgents = getAllAgentTypes();
+async function selectPlatforms(opts) {
+  const supportedMcpIds = new Set(listSupportedMcpClients().map((c) => c.id));
+  const allPlatforms = getAllAgentTypes().filter((id) => supportedMcpIds.has(id));
   if (opts.cliAgents.length > 0) return opts.cliAgents;
-  if (opts.yes) return allAgents;
-  const detected = await detectInstalledAgents();
-  const initial = detected.length > 0 ? detected : allAgents;
+  if (opts.yes) {
+    const detectedAgents2 = await detectInstalledAgents();
+    const detectedMcp2 = detectMcpClients();
+    const detected2 = [.../* @__PURE__ */ new Set([...detectedAgents2, ...detectedMcp2])].filter(
+      (id) => supportedMcpIds.has(id)
+    );
+    return detected2.length > 0 ? detected2 : allPlatforms;
+  }
+  const detectedAgents = await detectInstalledAgents();
+  const detectedMcp = detectMcpClients();
+  const detected = /* @__PURE__ */ new Set([...detectedAgents, ...detectedMcp]);
+  const initial = detected.size > 0 ? [...detected] : allPlatforms;
   const res = await p.multiselect({
-    message: "Choose which agents to install skills into",
-    options: allAgents.map((id) => ({
+    message: "Choose which platforms you want to install into:",
+    options: allPlatforms.map((id) => ({
       value: id,
       label: agents[id].displayName,
-      hint: detected.includes(id) ? "detected" : void 0
+      hint: detected.has(id) ? "detected" : void 0
     })),
     initialValues: initial,
     required: true
@@ -949,25 +966,6 @@ async function selectAgents(opts) {
   if (p.isCancel(res)) process.exit(0);
   return res;
 }
-async function selectMcpClients(opts) {
-  const supported = listSupportedMcpClients();
-  const detected = detectMcpClients();
-  if (opts.yes) {
-    return detected.length > 0 ? detected : supported.map((c) => c.id);
-  }
-  const res = await p.multiselect({
-    message: "Choose which apps to install the MCP into",
-    options: supported.map((c) => ({
-      value: c.id,
-      label: c.label,
-      hint: detected.includes(c.id) ? "detected" : void 0
-    })),
-    initialValues: detected.length > 0 ? detected : supported.map((c) => c.id),
-    required: true
-  });
-  if (p.isCancel(res)) process.exit(0);
-  return res;
-}
 async function getMorphMcpInput(opts) {
   const envApiKey = process.env.MORPH_API_KEY;
   const effectiveApiKey = opts.cliApiKey ?? envApiKey;
@@ -1037,22 +1035,23 @@ async function main() {
   const pkg = require2("../package.json");
   setVersion(pkg.version);
   await showMorphSplash();
-  const program = new Command().name("morph-setup").description("Install Morph MCP and bundled skills onto coding agents").argument("[source]", "Optional skills source (repo/path). Bundled skills are always installed.").option("--morph-api-key <key>", "MORPH_API_KEY to write into MCP config (overrides env)").option("-g, --global", "Install skills globally (default)").option("--project", "Install skills to the current project instead of global").option("-a, --agent <agents...>", "Target specific agents (repeatable)").option("-s, --skill <skills...>", "Install specific skills by name (only affects <source> skills)").option("-l, --list", "List available skills without installing").option("-y, --yes", "Skip all confirmation prompts").version(pkg.version);
+  const program = new Command().name("morph-setup").description("Install Morph MCP and bundled skills onto coding agents").argument("[source]", "Optional skills source (repo/path). Bundled skills are always installed.").option("--morph-api-key <key>", "MORPH_API_KEY to write into MCP config (overrides env)").option("-g, --global", "Install skills globally (default)").option("-a, --agent <agents...>", "Target specific agents (repeatable)").option("-s, --skill <skills...>", "Install specific skills by name (only affects <source> skills)").option("-l, --list", "List available skills without installing").option("-y, --yes", "Skip all confirmation prompts").version(pkg.version);
   const argv = process.argv.slice();
   if (argv[2] === "--") argv.splice(2, 1);
   program.parse(argv);
   const opts = program.opts();
   const source = program.args[0];
   const yes = !!opts.yes;
-  const global = opts.project ? false : true;
+  const global = true;
   p.intro(chalk.greenBright(" Morph MCP Install "));
-  const mcpClients = await selectMcpClients({ yes });
   const mcpInput = await getMorphMcpInput({
     yes,
     cliApiKey: opts.morphApiKey
   });
   const cliAgents = (opts.agent ?? []).map((a) => a);
-  const targetAgents = await selectAgents({ yes, cliAgents });
+  const selectedPlatforms = await selectPlatforms({ yes, cliAgents });
+  const mcpClients = selectedPlatforms;
+  const targetAgents = selectedPlatforms;
   if (opts.list) {
     const bundled = await discoverSkills(getBundledSkillsDir());
     p.log.info(chalk.greenBright("Bundled skills:"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morphllm/morph-setup",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Install Morph MCP and bundled skills onto coding agents",
   "type": "module",
   "bin": {