@agent-native/core 0.51.11 → 0.51.14

package/dist/cli/skills.d.ts

@@ -203,6 +203,7 @@ interface SkillsClientPromptContext {
         label: string;
         hint: string;
     }>;
+    installsMcp: boolean;
 }
 interface SkillsTargetPromptContext {
     initialTargets: string[];

package/dist/cli/skills.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["../../src/cli/skills.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAKL,KAAK,gBAAgB,EAEtB,MAAM,gBAAgB,CAAC;AAUxB,OAAO,EAAW,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AA6jBjE,eAAO,MAAM,sBAAsB,0tfAQlC,CAAC;AAmVF,eAAO,MAAM,mBAAmB,i1NAQ/B,CAAC;AAEF,eAAO,MAAM,6BAA6B,+2WASzC,CAAC;AAEF,eAAO,MAAM,qBAAqB,+gIAOjC,CAAC;AAyBF,eAAO,MAAM,qBAAqB,ys4BAsdjC,CAAC;AAEF,eAAO,MAAM,qBAAqB,q6iCA0iBjC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoN/B,CAAC;AAIF,eAAO,MAAM,gCAAgC,4BAA4B,CAAC;AAoE1E,KAAK,aAAa,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;AACnE,KAAK,eAAe,GAAG,QAAQ,GAAG,aAAa,GAAG,aAAa,CAAC;AAEhE,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,GAAG,EAAE,OAAO,CAAC;IACb;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,QAAQ,EAAE,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAmDD,UAAU,iBAAiB;IACzB,KAAK,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACzC;AAED,MAAM,MAAM,iBAAiB,GAAG,cAAc,GAAG,KAAK,CAAC;AAEvD,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAC/C,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC;IAC9B,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,aAAa,CAAC,EAAE,CACd,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,CACb,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9B,kBAAkB,CAAC,EAAE,CACnB,OAAO,EAAE,+BAA+B,KACrC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAC7B,WAAW,CAAC,EAAE,CACZ,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,cAAc,CAAC,EAAE,CACf,OAAO,EAAE,2BAA2B,KACjC,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAChD,wBAAwB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,CACX,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE,iBAAiB,KACxB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB;;;;OAIG;IACH,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C;;;;;OAKG;IACH,SAAS,CAAC,EAAE,YAAY,CAAC;CAC1B;AAED,UAAU,yBAAyB;IACjC,cAAc,EAAE,QAAQ,EAAE,CAAC;IAC3B,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAClE;AAED,UAAU,yBAAyB;IACjC,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChE;AAED,UAAU,+BAA+B;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,wBAAwB;IAChC,YAAY,EAAE,SAAS,GAAG,MAAM,CAAC;CAClC;AAED,UAAU,2BAA2B;IACnC,WAAW,EAAE,eAAe,CAAC;CAC9B;AAq6BD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,gBAAgB,CA8GhE;AAsbD,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,gBAAgB,EACxB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,eAAe,CAAC,CAiV1B;AAoLD,wBAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA8Wf"}
+{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["../../src/cli/skills.ts"],"names":[],"mappings":"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"}

package/dist/cli/skills.js

@@ -45,16 +45,16 @@ Examples:
 The add command installs the SKILL.md instructions, registers the app-backed
 MCP connector, and then authenticates it in one step so you do not hit an OAuth
 wall on the first tool call. By default, add targets every supported local
-client this CLI can configure (Claude Code, Claude Code CLI, Codex, and Cowork);
+client this CLI can configure (Claude Code, Codex, and Cowork);
 pass --client to narrow it. Authentication reuses "npx @agent-native/core@latest connect":
 OAuth-capable clients (Claude Code) get a URL-only entry and a /mcp authenticate
 prompt, while Codex / Cowork run the browser device-code flow. In a
 non-interactive shell or CI the auth step is skipped and the exact
 "npx @agent-native/core@latest connect <url> --client all" command is printed instead.
 
-Running "npx @agent-native/skills@latest add ..." directly installs instructions only;
-use this Agent Native CLI path when you want MCP setup and auth too. Pass --no-connect to
-register the connector without authenticating (leave auth to the host or run
+Running "npx @agent-native/skills@latest add ..." uses this same shared install
+flow with the broader BuilderIO skills catalog enabled. Pass --no-connect to
+register MCP where possible without authenticating (leave auth to the host or run
 "npx @agent-native/core@latest connect" later). Pass --mcp-url to register that connector against
 a custom origin (an ngrok tunnel, a local dev server, or a self-hosted
 deployment) instead of the built-in hosted default — a bare origin gets the
@@ -2246,6 +2246,14 @@ const CLIENT_HINTS = {
     codex: "$CODEX_HOME/config.toml or ~/.codex/config.toml",
     cowork: "~/.cowork/mcp.json",
 };
+const SKILLS_CLIENTS = ["claude-code", "codex", "cowork"];
+const SKILL_INSTRUCTION_CLIENTS = ["claude-code", "codex"];
+const SKILL_INSTRUCTION_CLIENT_HINTS = {
+    "claude-code": ".claude/skills or .claude/commands",
+    "claude-code-cli": ".claude/skills or .claude/commands",
+    codex: ".agents/skills or ~/.codex/skills",
+    cowork: "MCP only",
+};
 function normalizeKnownSkillTarget(value) {
     const key = value?.trim().toLowerCase();
     if (!key)
@@ -2632,11 +2640,36 @@ function normalizeClientIds(values) {
     }
     return out;
 }
-function clientPromptOptions() {
-    return CLIENTS.map((client) => ({
+function normalizeSkillsClientIds(values) {
+    const seen = new Set();
+    const out = [];
+    for (const client of normalizeClientIds(values)) {
+        const normalized = client === "claude-code-cli" ? "claude-code" : client;
+        if (seen.has(normalized))
+            continue;
+        seen.add(normalized);
+        out.push(normalized);
+    }
+    return out;
+}
+function resolveSkillsClientArg(client) {
+    return normalizeSkillsClientIds(resolveClients(client));
+}
+function skillsClients(installsMcp) {
+    return installsMcp ? SKILLS_CLIENTS : SKILL_INSTRUCTION_CLIENTS;
+}
+function filterSkillsClients(clients, installsMcp) {
+    if (installsMcp)
+        return clients;
+    return clients.filter((client) => SKILL_INSTRUCTION_CLIENTS.includes(client));
+}
+function clientPromptOptions(installsMcp) {
+    return skillsClients(installsMcp).map((client) => ({
         value: client,
         label: CLIENT_LABELS[client],
-        hint: CLIENT_HINTS[client],
+        hint: installsMcp
+            ? CLIENT_HINTS[client]
+            : SKILL_INSTRUCTION_CLIENT_HINTS[client],
     }));
 }
 const DEFAULT_PUBLIC_SKILLS_SOURCE = "BuilderIO/skills";
@@ -2703,6 +2736,12 @@ function skillPromptOptions(options = {}) {
         ...publicSkillPromptOptions(options),
     ];
 }
+function defaultSkillPromptTargets(options) {
+    return [
+        ...DEFAULT_SKILL_PROMPT_TARGETS,
+        ...publicSkillEntries(options).map((entry) => entry.name),
+    ];
+}
 function publicSkillSelectionTarget(skillNames) {
     return `${PUBLIC_SKILL_TARGET_PREFIX}${skillNames.join(",")}`;
 }
@@ -2756,9 +2795,13 @@ function shouldPrompt(parsed, options) {
 }
 async function promptForClients(context) {
     const clack = await import("@clack/prompts");
+    const message = context.installsMcp
+        ? "Install the MCP connector and skills for which local agents?\n" +
+            "  (space toggles, enter confirms; saved for next time)"
+        : "Install skill instructions for which local agents?\n" +
+            "  (space toggles, enter confirms; saved for next time)";
     const result = await clack.multiselect({
-        message: "Install the MCP connector for which local agents?\n" +
-            "  (space toggles, enter confirms; saved for next time)",
+        message,
         options: context.options,
         initialValues: context.initialClients,
         required: true,
@@ -2801,7 +2844,7 @@ async function promptForPlanMode(context) {
             {
                 value: "hosted",
                 label: "Hosted Plans, shareable links",
-                hint: "Stores plans at plan.agent-native.com. Enables sharing, comments, browser editor. Requires one-time browser sign-in.",
+                hint: "100% free and open source. Stores plans at plan.agent-native.com with sharing, comments, and browser editor. Requires one-time browser sign-in.",
             },
             {
                 value: "local-files",
@@ -2872,15 +2915,20 @@ async function promptForSkills(context) {
         return [];
     return result.filter((value) => typeof value === "string");
 }
-async function resolveSkillsClients(parsed, options) {
+async function resolveSkillsClients(parsed, options, installsMcp) {
     if (parsed.clientExplicit || !shouldPrompt(parsed, options)) {
-        return resolveClients(parsed.client);
+        const clients = filterSkillsClients(resolveSkillsClientArg(parsed.client), installsMcp);
+        if (clients.length === 0) {
+            throw new Error("Local-file skill instructions only support Codex or Claude Code clients.");
+        }
+        return clients;
     }
-    const initialClients = resolveClients("all");
+    const initialClients = skillsClients(installsMcp);
     const prompt = options.promptClients ?? promptForClients;
-    const selected = normalizeClientIds(await prompt({
+    const selected = normalizeSkillsClientIds(await prompt({
         initialClients,
-        options: clientPromptOptions(),
+        options: clientPromptOptions(installsMcp),
+        installsMcp,
     }));
     if (selected.length === 0)
         return null;
@@ -2919,6 +2967,9 @@ function targetsIncludePlans(targets) {
 function planSkillNamesSelected(skillNames) {
     return Boolean(skillNames?.some((name) => normalizeKnownSkillTarget(name) === "visual-plans"));
 }
+function shouldForwardPlanModeFlag(target, skillNames) {
+    return targetIncludesPlans(target) || planSkillNamesSelected(skillNames);
+}
 function recapSkillNamesSelected(skillNames) {
     return Boolean(skillNames?.some((name) => {
         const normalized = name.trim().toLowerCase();
@@ -2983,7 +3034,7 @@ async function resolveSkillTargets(parsed, options) {
         available: promptOptions.map((option) => option.value).join(","),
     });
     const selected = await prompt({
-        initialTargets: DEFAULT_SKILL_PROMPT_TARGETS,
+        initialTargets: defaultSkillPromptTargets(options),
         options: promptOptions,
     });
     if (!selected || selected.length === 0)
@@ -3221,7 +3272,7 @@ function preserveMcpUrlAppPathOverride(target, input) {
     };
 }
 function dryRunInstallCommand(parsed, target) {
-    const clients = parsed.clients ?? resolveClients(parsed.client);
+    const clients = parsed.clients ?? resolveSkillsClientArg(parsed.client);
     const args = [
         "@agent-native/core@latest",
         "skills",
@@ -3232,7 +3283,8 @@ function dryRunInstallCommand(parsed, target) {
         "--scope",
         parsed.scope,
     ];
-    if (parsed.planMode)
+    const forwardsPlanFlags = shouldForwardPlanModeFlag(target, parsed.plainSkillNames);
+    if (forwardsPlanFlags && parsed.planMode)
         args.push("--mode", parsed.planMode);
     if (parsed.mcpUrl)
         args.push("--mcp-url", parsed.mcpUrl);
@@ -3353,24 +3405,28 @@ function isGithubSkillRepoTarget(target) {
 function isPlainSkillRepoTarget(target) {
     return isPlainSkillRepoPath(target) || isGithubSkillRepoTarget(target);
 }
-function agentNativeSkillsInstallArgs(parsed, target, clients) {
+function agentNativeSkillsInstallArgs(parsed, target, clients, baseDir) {
     const args = [
         "--yes",
         "@agent-native/skills@latest",
         "add",
+        "--copy",
         target,
         "--client",
         clientArgForClients(clients),
         "--scope",
         parsed.scope,
     ];
+    if (baseDir)
+        args.push("--cwd", baseDir);
     if (parsed.withGithubAction)
         args.push("--with-github-action");
     if (parsed.force)
         args.push("--force");
-    if (parsed.planMode)
+    const forwardsPlanFlags = shouldForwardPlanModeFlag(target, parsed.plainSkillNames);
+    if (forwardsPlanFlags && parsed.planMode)
         args.push("--mode", parsed.planMode);
-    if (parsed.mcpUrl)
+    if (forwardsPlanFlags && parsed.mcpUrl)
         args.push("--mcp-url", parsed.mcpUrl);
     if (!parsed.mcp)
         args.push("--no-mcp");
@@ -3397,13 +3453,13 @@ async function addPlainSkillRepo(parsed, options) {
     if (parsed.mcpUrl && !planSkillNamesSelected(parsed.plainSkillNames)) {
         throw new Error("--mcp-url only applies to app-backed Agent Native skills.");
     }
-    const clients = parsed.clients ?? resolveClients(parsed.client);
+    const clients = parsed.clients ?? resolveSkillsClientArg(parsed.client);
     const skillsAgents = skillsAgentsForClients(clients);
     const selectedSkillNames = parsed.plainSkillNames ?? [];
     if (skillsAgents.length === 0) {
         throw new Error("Plain skill repositories can only install instructions for Codex or Claude Code clients.");
     }
-    const args = agentNativeSkillsInstallArgs(parsed, target, clients);
+    const args = agentNativeSkillsInstallArgs(parsed, target, clients, options.baseDir);
     if (!parsed.dryRun) {
         const code = await (options.runCommand ?? runCommand)("npx", args, {
             stdio: parsed.yes ? "silent" : "inherit",
@@ -3483,13 +3539,29 @@ async function connectAfterEnsure(installTarget, clients, parsed, options) {
     options.log?.(`Authenticating ${installTarget.displayName}…`);
     options.telemetry?.track("skills_cli connect started");
     try {
-        await (options.runConnect ?? runConnect)([
+        const connectArgs = [
             hostedUrl,
             "--client",
             clientArgForClients(clients),
             "--scope",
             parsed.scope,
-        ]);
+        ];
+        if (options.runConnect) {
+            await options.runConnect(connectArgs);
+        }
+        else {
+            await runConnect(connectArgs, {
+                isInteractive: options.isInteractive,
+                logOut: (message) => {
+                    if (message.trim())
+                        options.log?.(message);
+                },
+                logErr: (message) => {
+                    if (message.trim())
+                        options.log?.(message);
+                },
+            });
+        }
         options.telemetry?.track("skills_cli connect completed");
         return { connected: true, connectCommand: "" };
     }
@@ -3550,7 +3622,7 @@ export async function addAgentNativeSkill(parsed, options = {}) {
         if (!parsed.instructions && parsed.mcp) {
             throw new Error("Context X-Ray does not need MCP config yet. Run without --mcp-only.");
         }
-        const clients = parsed.clients ?? resolveClients(parsed.client);
+        const clients = parsed.clients ?? resolveSkillsClientArg(parsed.client);
         const skillsAgents = skillsAgentsForClients(clients);
         if (parsed.dryRun) {
             const githubActionPath = parsed.withGithubAction && knownTarget === "visual-plans"
@@ -3605,7 +3677,7 @@ export async function addAgentNativeSkill(parsed, options = {}) {
     if (parsed.mcpUrl) {
         installTarget = withMcpUrlOverride(installTarget, parsed.mcpUrl);
     }
-    const clients = parsed.clients ?? resolveClients(parsed.client);
+    const clients = parsed.clients ?? resolveSkillsClientArg(parsed.client);
     installTarget = preserveMcpUrlAppPathOverride(installTarget, parsed.mcpUrl);
     const skillsAgents = skillsAgentsForClients(clients);
     if (parsed.dryRun) {
@@ -3648,6 +3720,7 @@ export async function addAgentNativeSkill(parsed, options = {}) {
     let instructionsWritten;
     let connected = false;
     let connectCommand;
+    let registeredMcpClients = shouldRegisterMcp ? clients : [];
     try {
         if (parsed.instructions) {
             if (skillsAgents.length === 0) {
@@ -3710,7 +3783,7 @@ export async function addAgentNativeSkill(parsed, options = {}) {
         if (shouldRegisterMcp) {
             commands.push(`npx @agent-native/core@latest app-skill ensure --manifest ${installTarget.loaded.file} --client ${parsed.client} --scope ${parsed.scope} --yes`);
             if (!parsed.dryRun) {
-                await ensureAppSkill(installTarget.loaded, {
+                const ensureResult = await ensureAppSkill(installTarget.loaded, {
                     clients,
                     scope: parsed.scope,
                     baseDir: options.baseDir,
@@ -3718,6 +3791,7 @@ export async function addAgentNativeSkill(parsed, options = {}) {
                     confirm: true,
                     log: options.log,
                 });
+                registeredMcpClients = ensureResult.written.map((written) => written.client);
                 options.telemetry?.track("skills_cli mcp registered", {
                     skills: installTarget.skillNames.join(","),
                 });
@@ -3729,9 +3803,18 @@ export async function addAgentNativeSkill(parsed, options = {}) {
                     const result = await connectAfterEnsure(installTarget, clients, parsed, options);
                     connected = result.connected;
                     connectCommand = result.connectCommand || undefined;
+                    if (connected)
+                        registeredMcpClients = clients;
                     if (connectCommand)
                         commands.push(connectCommand);
                 }
+                else {
+                    const pendingClients = clients.filter((client) => !registeredMcpClients.includes(client));
+                    if (pendingClients.length > 0) {
+                        connectCommand = connectCommandFor(installTarget.loaded.manifest.hosted.url, pendingClients, parsed.scope);
+                        commands.push(connectCommand);
+                    }
+                }
             }
         }
         // `--with-github-action`: also drop the PR Visual Recap workflow into the
@@ -3791,7 +3874,7 @@ export async function addAgentNativeSkill(parsed, options = {}) {
             mcpUrl: knownTarget === "visual-plans" && planMode === "local-files"
                 ? ""
                 : installTarget.loaded.manifest.hosted.mcpUrl,
-            mcpClients: shouldRegisterMcp ? clients : [],
+            mcpClients: registeredMcpClients,
             dryRun: parsed.dryRun,
             commands,
             written: instructionsWritten,
@@ -3863,6 +3946,22 @@ function planModeSummary(mode) {
         return "Self-hosted/custom Plan app";
     return "Hosted Plans - shareable links and comments";
 }
+function targetInstallsMcp(target, parsed) {
+    if (!parsed.mcp)
+        return false;
+    if (publicSkillSelectionNames(target))
+        return false;
+    const knownTarget = normalizeKnownSkillTarget(target);
+    if (knownTarget === "visual-plans")
+        return parsed.planMode !== "local-files";
+    if (knownTarget) {
+        return !isLocalOnlyBuiltInSkill(BUILT_IN_APP_SKILLS[knownTarget]);
+    }
+    return true;
+}
+function targetsInstallMcp(targets, parsed) {
+    return targets.some((target) => targetInstallsMcp(target, parsed));
+}
 function instructionContentForSkill(skillName) {
     if (skillName === "quick-recap") {
         return "When writing final response status indicators, use the /quick-recap skill always.";
@@ -3955,9 +4054,16 @@ export async function runSkills(argv, options = {}) {
     if (parsed.baseDir) {
         options = { ...options, baseDir: path.resolve(parsed.baseDir) };
     }
+    const clackForLog = parsed.printJson
+        ? undefined
+        : await import("@clack/prompts");
     const log = parsed.printJson
         ? undefined
-        : (message) => process.stdout.write(`${message}\n`);
+        : (message) => {
+            if (!message.trim())
+                return;
+            clackForLog?.log.info(message);
+        };
     if (parsed.command === "help") {
         process.stdout.write(`${HELP}\n`);
         return;
@@ -4062,7 +4168,8 @@ export async function runSkills(argv, options = {}) {
                 mode: parsed.planMode,
             });
         }
-        const clients = await resolveSkillsClients(parsed, optionsWithTelemetry);
+        const installsMcp = targetsInstallMcp(targets, parsed);
+        const clients = await resolveSkillsClients(parsed, optionsWithTelemetry, installsMcp);
         if (!clients) {
             telemetry.track("skills_cli cancelled", { step: "clients" });
             return;
@@ -4230,15 +4337,16 @@ export async function runSkills(argv, options = {}) {
         clack.note(summary.join("\n"), `Installed ${installedNames} skill${results.length === 1 ? "" : "s"}`);
         // GitHub Action follow-ups — kept as exact, copy-pasteable command lines.
         for (const line of [githubActionLine, githubActionSuggestionLine].filter(Boolean)) {
-            process.stdout.write(`${line}\n`);
+            clack.log.info(line);
         }
         const slashCommands = completedSkills.map((name) => `/${name}`).join("  ");
-        const configuredEveryClient = CLIENTS.every((client) => clients.includes(client));
+        const configuredEveryClient = SKILLS_CLIENTS.every((client) => clients.includes(client));
         const clientHint = configuredEveryClient
             ? ""
             : "\n   Add another client later with --client <client> (e.g. --client claude-code).";
+        const reloadTarget = mcpClients.length > 0 ? "skill + MCP server" : "skill";
         clack.outro(`✅ All set! Start using ${slashCommands || "your new skills"} in your agent client.` +
-            `\n   You may need to reload the client for the skill + MCP server to appear.` +
+            `\n   You may need to reload the client for the ${reloadTarget} to appear.` +
             clientHint);
     }
     catch (error) {