neon 5.0.1 → 6.1.0

package/dist/init/chrome.js

@@ -1,31 +1,46 @@
 import { isCi } from "../env.js";
+import { HEADING_CANCELLED, HEADING_COMPLETE, HEADING_FAILED, HEADING_PENDING, INIT_SUBTITLE } from "./copy.js";
 import chalk from "chalk";
 //#region src/init/chrome.ts
 const NEON_GREEN = "#4BB578";
 const INIT_BANNER_LINES = [
-	" ██╗  ██╗██████╗  ██████╗ ██╗  ██╗",
-	" ███╗ ██║██╔═══╝ ██╔═══██╗███╗ ██║",
-	" ████╗██║██████╗ ██║   ██║████╗██║",
-	" ██╔████║██╔═══╝ ██║   ██║██╔████║",
-	" ██║╚███║██████╗ ╚██████╔╝██║╚███║",
-	" ╚═╝ ╚══╝╚═════╝  ╚═════╝ ╚═╝ ╚══╝"
+	" ██╗  ██╗██████╗ ██████╗ ██╗  ██╗",
+	" ███╗ ██║██╔═══╝██╔═══██╗███╗ ██║",
+	" ████╗██║██████╗██║   ██║████╗██║",
+	" ██╔████║██╔═══╝██║   ██║██╔████║",
+	" ██║╚███║██████╗╚██████╔╝██║╚███║",
+	" ╚═╝ ╚══╝╚═════╝ ╚═════╝ ╚═╝ ╚══╝"
 ];
 const formatInitBanner = () => INIT_BANNER_LINES.join("\n");
 const shouldPrintInitBanner = (yes) => !yes && !isCi() && Boolean(process.stdout.isTTY);
 const printInitBanner = () => {
-	process.stdout.write(`\n${chalk.hex(NEON_GREEN)(formatInitBanner())}\n\n${chalk.dim("Set up this directory for Neon.")}\n\n`);
+	process.stdout.write(`\n${chalk.hex(NEON_GREEN)(formatInitBanner())}\n\n${chalk.dim(INIT_SUBTITLE)}\n\n`);
+};
+const printInitProgress = (message) => {
+	process.stdout.write(`${message}\n`);
 };
 const formatInitDone = (input) => {
 	const labelWidth = Math.max(0, ...input.rows.map((row) => row.label.length));
+	const intro = input.body !== void 0 && input.body.length > 0 ? `\n\n${input.body}` : "";
 	const body = input.rows.length === 0 ? "" : `\n\n${input.rows.map((row) => `  ${row.label.padEnd(labelWidth)}  ${row.value}`).join("\n")}`;
 	const next = input.next.length === 0 ? "" : `\n\nNext:\n${input.next.map((line) => `  ${line}`).join("\n")}`;
 	const rule = "-".repeat(input.heading.length);
-	return `${input.heading}\n${rule}${body}${next}\n`;
+	return `${input.heading}\n${rule}${intro}${body}${next}\n`;
+};
+const headingColor = (heading) => {
+	if (heading === "Neon setup complete.") return chalk.hex(NEON_GREEN).bold;
+	if (heading === "Neon setup needs a next step.") return chalk.yellow.bold;
+	if (heading === "Neon setup failed.") return chalk.red.bold;
+	if (heading === "Neon setup cancelled.") return chalk.dim;
+	return chalk.hex(NEON_GREEN).bold;
 };
 const printInitDone = (text) => {
-	const painted = (text.endsWith("\n") ? text.slice(0, -1) : text).split("\n").map((line, index) => {
-		if (index === 0) return chalk.hex(NEON_GREEN).bold(line);
-		if (/^-{3,}$/.test(line)) return chalk.hex(NEON_GREEN)(line);
+	const lines = (text.endsWith("\n") ? text.slice(0, -1) : text).split("\n");
+	const heading = lines[0] ?? "";
+	const paintHeading = headingColor(heading);
+	const painted = lines.map((line, index) => {
+		if (index === 0) return paintHeading(line);
+		if (/^-{3,}$/.test(line)) return heading === "Neon setup failed." ? chalk.red(line) : heading === "Neon setup needs a next step." ? chalk.yellow(line) : heading === "Neon setup cancelled." ? chalk.dim(line) : chalk.hex(NEON_GREEN)(line);
 		if (line === "Next:") return chalk.bold(line);
 		return line;
 	});
@@ -40,6 +55,25 @@ const agentSetupDoneLabel = (input) => {
 	if (!input.ran && input.setup !== "skip") return "not run";
 	return agentSetupLabel(input.setup);
 };
+const formatAgentIds = (agents) => agents.join(", ");
+const agentsRowValue = (input) => {
+	if (input.setup === null || input.setup === "skip") return "skipped";
+	if (input.setup === "skills") return "default Neon skills in this directory";
+	const ids = formatAgentIds(input.agents);
+	if (input.setup === "plugin") return ids.length > 0 ? `Neon plugin: ${ids}` : "Neon plugin";
+	if (input.setup === "skills-mcp") return ids.length > 0 ? `skills and MCP: ${ids}` : "skills and MCP";
+	return ids.length > 0 ? `plugin and skills/MCP: ${ids}` : "plugin and skills/MCP";
+};
+const projectRowValue = (link) => {
+	switch (link) {
+		case "already_linked": return "already linked";
+		case "linked": return "linked";
+		case "claimable": return "claimable";
+		case "skipped": return "skipped";
+		case null: return "not linked";
+		default: return link;
+	}
+};
 const configSummaryLabel = (summary) => {
 	switch (summary) {
 		case "created": return "neon.ts created";
@@ -49,19 +83,20 @@ const configSummaryLabel = (summary) => {
 		default: return summary;
 	}
 };
-const INIT_STEP_LABELS = {
-	bootstrap: "Creating the app from the selected template…",
-	plugins: "Installing the Neon plugin…",
-	skills: "Installing Neon agent skills…",
-	mcp: "Setting up the Neon MCP server…",
-	link: "Linking a Neon project…",
-	config: "Setting up neon.ts…",
-	env: "Refreshing Neon env vars…"
+const configRowValue = (config, filename) => {
+	if (config === "created") return "neon.ts created";
+	if (config === "existing") return `existing ${filename ?? "Neon config"} preserved`;
+	if (config === "skipped" || config === null) return "skipped";
+	return config;
 };
-const initStepLabel = (step) => {
-	const command = step[0];
-	if (command === void 0) return;
-	return INIT_STEP_LABELS[command];
+const headingForKind = (kind) => {
+	switch (kind) {
+		case "success": return HEADING_COMPLETE;
+		case "pending": return HEADING_PENDING;
+		case "error": return HEADING_FAILED;
+		case "aborted": return HEADING_CANCELLED;
+		default: return kind;
+	}
 };
 //#endregion
-export { INIT_BANNER_LINES, INIT_STEP_LABELS, NEON_GREEN, agentSetupDoneLabel, agentSetupLabel, configSummaryLabel, formatInitBanner, formatInitDone, initStepLabel, printInitBanner, printInitDone, shouldPrintInitBanner };
+export { INIT_BANNER_LINES, NEON_GREEN, agentSetupDoneLabel, agentSetupLabel, agentsRowValue, configRowValue, configSummaryLabel, formatInitBanner, formatInitDone, headingForKind, printInitBanner, printInitDone, printInitProgress, projectRowValue, shouldPrintInitBanner };

package/dist/init/copy.js

@@ -0,0 +1,133 @@
+import { getCliName } from "../utils/cli_name.js";
+//#region src/init/copy.ts
+const INIT_SUBTITLE = "Set up coding agents and this directory for Neon.";
+const MODE_MESSAGE = "How would you like to set up Neon?";
+const MODE_RECOMMENDED_TITLE = "Recommended setup";
+const MODE_RECOMMENDED_DESCRIPTION = "Set up detected agents, link a project, and add a default neon.ts in this directory.";
+const MODE_CUSTOM_TITLE = "Custom setup";
+const MODE_CUSTOM_DESCRIPTION = "Choose agent tooling, project setup, and the services declared in neon.ts.";
+const AGENT_SETUP_MESSAGE = "How should Neon be added to your coding agents?";
+const AGENT_SETUP_PLUGIN_TITLE = "Neon plugin";
+const AGENT_SETUP_PLUGIN_DESCRIPTION = "Install Neon skills and the MCP server together.";
+const AGENT_SETUP_SKILLS_TITLE = "Skills and MCP separately";
+const AGENT_SETUP_SKILLS_DESCRIPTION = "Install Neon skills and configure the MCP server as separate steps.";
+const AGENT_SETUP_SKIP_TITLE = "Skip agent setup";
+const AGENT_SETUP_SKIP_DESCRIPTION = "Continue to project setup without changing agent configuration.";
+const AGENT_PICKER_MESSAGE = "Which coding agents should receive Neon tooling? (space to toggle, enter to confirm)";
+const AGENT_DETECTED_DESCRIPTION = "Detected on this machine or in this directory.";
+const AGENT_OTHER_DESCRIPTION = "Install for this agent.";
+const SKILLS_PICKER_MESSAGE = "Which Neon skills should be installed? (space to toggle, enter to confirm)";
+const MCP_SCOPE_MESSAGE = "Where should the Neon MCP server be configured?";
+const MCP_SCOPE_GLOBAL_TITLE = "User configuration";
+const MCP_SCOPE_GLOBAL_DESCRIPTION = "Make the MCP server available across projects.";
+const MCP_SCOPE_PROJECT_TITLE = "This directory";
+const MCP_SCOPE_PROJECT_DESCRIPTION = "Add the MCP server to this project's agent configuration.";
+const MCP_AUTH_MESSAGE = "How should the MCP server authenticate to Neon?";
+const MCP_AUTH_OAUTH_TITLE = "Sign in from the coding agent";
+const MCP_AUTH_OAUTH_DESCRIPTION = "Configure OAuth. The agent asks you to sign in on first use.";
+const MCP_AUTH_API_KEY_TITLE = "Use a Neon API key";
+const MCP_AUTH_API_KEY_DESCRIPTION = "Reuse an existing MCP key or create a key after CLI authentication.";
+const CLAIMABLE_MCP_API_KEY = "Claimable project setup cannot create an account API key for MCP. Use --mcp-auth oauth.";
+const CLAIMABLE_NO_LINK = "--claimable cannot be combined with --no-link.";
+const CLAIMABLE_ACCOUNT_FLAGS = "--claimable cannot be combined with --org-id, --project-id, --project-name, --region-id, or --branch.";
+const CLAIMABLE_ALREADY_LINKED = "--claimable cannot run in a directory that is already linked. Omit --claimable, or unlink first.";
+const PROJECT_SETUP_MESSAGE = "How would you like to get a Neon project?";
+const PROJECT_SETUP_LINK_TITLE = "Sign in to Neon";
+const PROJECT_SETUP_LINK_DESCRIPTION = "Link an existing project or create a new one in your account.";
+const PROJECT_SETUP_CLAIMABLE_TITLE = "Create a claimable project";
+const PROJECT_SETUP_CLAIMABLE_DESCRIPTION = "Start without an account. The project expires in 72 hours unless claimed.";
+const CONFIG_CONFIRM_HINT = "Declare Neon services in a file you can review before deploying.";
+const CONFIG_CONFIRM_MESSAGE = "Create neon.ts in this directory?";
+const SERVICES_HINT = "Leave the optional services unselected for the default neon.ts.";
+const SERVICES_MESSAGE = "Which services should neon.ts declare? (space to toggle, enter to confirm)";
+const PACKAGE_MANAGER_MESSAGE = "Which package manager should install the Neon dependencies?";
+const NO_AGENTS_FALLBACK_STATUS = "No coding agents detected. Installing the default Neon skills for Cursor and Codex in this directory.";
+const NO_AGENT_SETUP_CONFLICT = "--no-agent-setup cannot be combined with --agent, --skill, or MCP flags.";
+const NON_TTY_LINK_NEEDS_AUTH = "No interactive terminal. Sign in with `neon auth`, then re-run, or pass --claimable.";
+const YES_LINK_NEEDS_AUTH = "-y cannot sign in. Sign in with `neon auth`, then re-run, or pass --claimable.";
+const MCP_SCOPED_NEEDS_PROJECT = "--mcp-project-scoped requires a linked project. Link a project first, or omit --mcp-project-scoped.";
+const namedAgentsUnavailable = (ids) => `--agent ${ids.join(", ")} cannot install this tooling. Pass agents that support it, or omit --agent.`;
+const mcpConfigLocationUnavailable = (ids, location) => location === "project" ? `--agent ${ids.join(", ")} cannot install project-level MCP config. Use --mcp-config-location global, or choose an agent that supports project config.` : `--agent ${ids.join(", ")} cannot install global MCP config. Choose an agent that supports global config.`;
+const mcpConfigLocationSkipped = (ids, location) => {
+	const subject = ids.length === 1 ? "that agent does" : "those agents do";
+	const skills = ids.length === 1 ? "Its skills" : "Their skills";
+	const target = ids.length === 1 ? "it" : "them";
+	return location === "project" ? `Skipped project-level MCP config for ${ids.join(", ")} because ${subject} not support it. ${skills} will still be installed. Use --mcp-config-location global to configure MCP for ${target}.` : `Skipped global MCP config for ${ids.join(", ")} because ${subject} not support it. ${skills} will still be installed.`;
+};
+const NON_TTY_AGENT_SETUP = "No interactive terminal. Pass -y for Recommended, or pass --skill, --mcp-auth, --agent, or --no-agent-setup.";
+const HEADING_COMPLETE = "Neon setup complete.";
+const HEADING_PENDING = "Neon setup needs a next step.";
+const HEADING_FAILED = "Neon setup failed.";
+const HEADING_CANCELLED = "Neon setup cancelled.";
+const CANCELLED_BODY = "Changes completed before cancellation were kept.";
+const PROGRESS = {
+	plugins: "Installing the Neon plugin...",
+	skills: "Installing Neon skills...",
+	mcp: "Configuring the Neon MCP server...",
+	auth: "Signing in to Neon...",
+	link: "Linking a Neon project...",
+	claim: "Creating a claimable project...",
+	config: "Creating neon.ts...",
+	install: (pm) => `Installing Neon dependencies with ${pm}...`,
+	env: "Pulling Neon environment variables..."
+};
+const unattendedUnauthedNext = () => [
+	"Link a project with a Neon account and an authenticated CLI.",
+	"Sign up: https://neon.com/signup",
+	`${getCliName()} auth`,
+	`${getCliName()} link`,
+	"",
+	"Or create a claimable project without an account. It expires in 72 hours unless claimed.",
+	`${getCliName()} claim create`
+];
+const skippedLinkNext = () => ["To connect this directory to a Neon project:", `${getCliName()} link`];
+const extraServicesNext = () => [
+	"Review neon.ts and confirm the linked project and branch before deploying.",
+	"Preview the changes:",
+	`${getCliName()} config plan`,
+	"",
+	"Deploy when the changes and target are correct:",
+	`${getCliName()} deploy`,
+	"",
+	"Refresh local environment variables after deployment:",
+	`${getCliName()} env pull`
+];
+const existingConfigNext = () => ["The existing Neon config was preserved. Refresh environment variables when its declared services are available:", `${getCliName()} env pull`];
+const claimableNext = (expiresAt) => [
+	`This project expires at ${expiresAt}.`,
+	"To keep it, open the claim flow and sign in to Neon:",
+	`${getCliName()} claim accept`
+];
+const claimableThenServicesNext = (expiresAt) => [
+	...claimableNext(expiresAt),
+	"",
+	"After claiming the project, review neon.ts and preview the changes:",
+	`${getCliName()} config plan`,
+	"",
+	"Deploy when the changes and target are correct:",
+	`${getCliName()} deploy`,
+	"",
+	"Refresh local environment variables:",
+	`${getCliName()} env pull`
+];
+const installFailedNext = (command) => ({
+	heading: HEADING_FAILED,
+	body: "Could not install the Neon dependencies.",
+	next: ["Install the dependencies, then run neon init again:", command]
+});
+const envPullFailedNext = () => ({
+	heading: HEADING_FAILED,
+	body: "The project is linked, but its environment variables could not be pulled.",
+	next: ["Resolve the error above, then retry:", `${getCliName()} env pull`]
+});
+const headingForOutcome = (outcome) => {
+	switch (outcome) {
+		case "success": return HEADING_COMPLETE;
+		case "pending": return HEADING_PENDING;
+		case "error": return HEADING_FAILED;
+		case "aborted": return HEADING_CANCELLED;
+		default: return outcome;
+	}
+};
+//#endregion
+export { AGENT_DETECTED_DESCRIPTION, AGENT_OTHER_DESCRIPTION, AGENT_PICKER_MESSAGE, AGENT_SETUP_MESSAGE, AGENT_SETUP_PLUGIN_DESCRIPTION, AGENT_SETUP_PLUGIN_TITLE, AGENT_SETUP_SKILLS_DESCRIPTION, AGENT_SETUP_SKILLS_TITLE, AGENT_SETUP_SKIP_DESCRIPTION, AGENT_SETUP_SKIP_TITLE, CANCELLED_BODY, CLAIMABLE_ACCOUNT_FLAGS, CLAIMABLE_ALREADY_LINKED, CLAIMABLE_MCP_API_KEY, CLAIMABLE_NO_LINK, CONFIG_CONFIRM_HINT, CONFIG_CONFIRM_MESSAGE, HEADING_CANCELLED, HEADING_COMPLETE, HEADING_FAILED, HEADING_PENDING, INIT_SUBTITLE, MCP_AUTH_API_KEY_DESCRIPTION, MCP_AUTH_API_KEY_TITLE, MCP_AUTH_MESSAGE, MCP_AUTH_OAUTH_DESCRIPTION, MCP_AUTH_OAUTH_TITLE, MCP_SCOPED_NEEDS_PROJECT, MCP_SCOPE_GLOBAL_DESCRIPTION, MCP_SCOPE_GLOBAL_TITLE, MCP_SCOPE_MESSAGE, MCP_SCOPE_PROJECT_DESCRIPTION, MCP_SCOPE_PROJECT_TITLE, MODE_CUSTOM_DESCRIPTION, MODE_CUSTOM_TITLE, MODE_MESSAGE, MODE_RECOMMENDED_DESCRIPTION, MODE_RECOMMENDED_TITLE, NON_TTY_AGENT_SETUP, NON_TTY_LINK_NEEDS_AUTH, NO_AGENTS_FALLBACK_STATUS, NO_AGENT_SETUP_CONFLICT, PACKAGE_MANAGER_MESSAGE, PROGRESS, PROJECT_SETUP_CLAIMABLE_DESCRIPTION, PROJECT_SETUP_CLAIMABLE_TITLE, PROJECT_SETUP_LINK_DESCRIPTION, PROJECT_SETUP_LINK_TITLE, PROJECT_SETUP_MESSAGE, SERVICES_HINT, SERVICES_MESSAGE, SKILLS_PICKER_MESSAGE, YES_LINK_NEEDS_AUTH, claimableNext, claimableThenServicesNext, envPullFailedNext, existingConfigNext, extraServicesNext, headingForOutcome, installFailedNext, mcpConfigLocationSkipped, mcpConfigLocationUnavailable, namedAgentsUnavailable, skippedLinkNext, unattendedUnauthedNext };

package/dist/init/detect.js

@@ -0,0 +1,58 @@
+import { t as storeFor } from "../_chunks/credential_io-D8AR-jvB.js";
+import { isCi } from "../env.js";
+import { h as resolveProfile, u as locationOf } from "../_chunks/profiles-CvnFEQyd.js";
+import { i as selectCredential, t as credentialInputs } from "../_chunks/auth_selection-pitMFzDe.js";
+import { detectInstalledAgents, uniqueAgentIds } from "../mcp/agents.js";
+import "./agents.js";
+import { directoryIsEmpty } from "./plan.js";
+import { detectAgent } from "./detect_host.js";
+import { canPickAgentsInteractively } from "../utils/agent_picker.js";
+import { existsSync, readdirSync } from "node:fs";
+import { detectProjectAgents } from "add-mcp";
+//#region src/init/detect.ts
+const listingHasCredentials = (configDir, profile) => {
+	try {
+		return storeFor(configDir).inspect(locationOf(resolveProfile(configDir, profile))).credentials !== null;
+	} catch {
+		return false;
+	}
+};
+const hasLocalCredentials = (configDir) => {
+	const inputs = credentialInputs();
+	const selection = selectCredential({
+		apiKeyFlag: inputs.apiKeyFlag,
+		profileFlag: inputs.profileFlag,
+		apiKeyEnv: inputs.apiKeyEnv,
+		profileEnv: inputs.profileEnv
+	});
+	if (selection.source === "explicit-api-key" || selection.source === "ambient-api-key") return true;
+	const dir = configDir || inputs.configDir;
+	if (!dir) return false;
+	return listingHasCredentials(dir, selection.profile || "DEFAULT");
+};
+const collectDetectedAgents = (input) => uniqueAgentIds([
+	...input.global,
+	...input.project,
+	...input.host === null ? [] : [input.host]
+]);
+const detectInitEnvironment = async (options) => {
+	const names = options.directoryNames ?? (existsSync(options.cwd) ? readdirSync(options.cwd) : []);
+	const host = (options.detectAgent ?? detectAgent)();
+	const project = await (options.detectProjectAgents ?? detectProjectAgents)(options.cwd);
+	const globalAgents = await (options.detectInstalledAgents ?? detectInstalledAgents)();
+	const detectedAgents = collectDetectedAgents({
+		host,
+		project,
+		global: globalAgents
+	});
+	return {
+		authenticated: (options.hasLocalCredentials ?? hasLocalCredentials)(options.configDir),
+		emptyDirectory: directoryIsEmpty(names),
+		interactive: options.interactive ?? canPickAgentsInteractively(),
+		hostAgent: host,
+		detectedAgents,
+		ci: isCi()
+	};
+};
+//#endregion
+export { collectDetectedAgents, detectInitEnvironment, hasLocalCredentials };

package/dist/init/funnel.js

@@ -0,0 +1,115 @@
+import pkg_default from "../pkg.js";
+import { trackEvent } from "../analytics.js";
+import { randomUUID } from "node:crypto";
+//#region src/init/funnel.ts
+const CLI_INIT_START = "cli_init_start";
+const CLI_INIT_END = "cli_init_end";
+const FLAG_ALIASES = {
+	"-y": "--yes",
+	"--yes": "--yes",
+	"--default": "--yes",
+	"-a": "--agent",
+	"--agent": "--agent",
+	"--no-link": "--no-link",
+	"--link": "--link",
+	"--no-config": "--no-config",
+	"--config": "--config",
+	"--services": "--services",
+	"--org-id": "--org-id",
+	"--project-id": "--project-id",
+	"--project-name": "--project-name",
+	"--region-id": "--region-id",
+	"--branch": "--branch",
+	"--branch-id": "--branch",
+	"--claimable": "--claimable",
+	"--package-manager": "--package-manager",
+	"--skill": "--skill",
+	"--mcp-config-location": "--mcp-config-location",
+	"--mcp-auth": "--mcp-auth",
+	"--mcp-project-scoped": "--mcp-project-scoped",
+	"--no-agent-setup": "--no-agent-setup",
+	"--agent-setup": "--agent-setup",
+	"--no-analytics": "--no-analytics",
+	"--analytics": "--analytics",
+	"--profile": "--profile",
+	"--config-dir": "--config-dir",
+	"--api-host": "--api-host",
+	"--context-file": "--context-file",
+	"--force-auth": "--force-auth",
+	"--no-force-auth": "--no-force-auth"
+};
+const flagName = (token) => {
+	const raw = token.split("=")[0];
+	if (raw === void 0) return;
+	return FLAG_ALIASES[raw];
+};
+const initFlagsFromArgv = (argv) => {
+	const initAt = argv.lastIndexOf("init");
+	const slice = initAt >= 0 ? argv.slice(initAt + 1) : argv;
+	const flags = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const token of slice) {
+		if (token === "--") break;
+		if (!token.startsWith("-")) continue;
+		const name = flagName(token);
+		if (name === void 0 || seen.has(name)) continue;
+		seen.add(name);
+		flags.push(name);
+	}
+	return flags;
+};
+const createInitRunId = () => randomUUID();
+const initStartProperties = (input) => ({
+	init_run_id: input.initRunId,
+	cli_version: pkg_default.version,
+	flags: initFlagsFromArgv(input.argv ?? process.argv),
+	authenticated: input.detection.authenticated,
+	empty_directory: input.detection.emptyDirectory,
+	interactive: input.detection.interactive,
+	host_agent: input.detection.hostAgent,
+	detected_agents: input.detection.detectedAgents,
+	ci: input.detection.ci
+});
+const initEndProperties = (input) => ({
+	init_run_id: input.initRunId,
+	cli_version: pkg_default.version,
+	mode: input.mode,
+	agent_setup: input.agentSetup,
+	agents_installed: input.agentsInstalled,
+	link: input.link,
+	config: input.config,
+	services: input.services,
+	outcome: input.outcome
+});
+const emitInitStart = (properties) => {
+	trackEvent(CLI_INIT_START, properties);
+};
+const emitInitEnd = (properties) => {
+	trackEvent(CLI_INIT_END, properties);
+};
+const createInitFunnel = (initRunId = createInitRunId()) => ({
+	initRunId,
+	mode: null,
+	agentSetup: null,
+	agentsInstalled: [],
+	link: null,
+	config: null,
+	services: null,
+	ended: false
+});
+const finishInitFunnel = (state, outcome, analytics) => {
+	if (state.ended || !analytics) return;
+	state.ended = true;
+	emitInitEnd(initEndProperties({
+		initRunId: state.initRunId,
+		mode: state.mode,
+		agentSetup: state.agentSetup,
+		agentsInstalled: state.agentsInstalled,
+		link: state.link,
+		config: state.config,
+		services: state.services,
+		outcome
+	}));
+};
+//#endregion
+export { CLI_INIT_END, CLI_INIT_START, createInitFunnel, createInitRunId, emitInitEnd, emitInitStart, finishInitFunnel, initEndProperties, initFlagsFromArgv, initStartProperties };

package/dist/init/mode.js

@@ -0,0 +1,30 @@
+import { NON_TTY_AGENT_SETUP, NO_AGENT_SETUP_CONFLICT } from "./copy.js";
+import { INIT_NEEDS_YES_OR_TERMINAL } from "./plan.js";
+//#region src/init/mode.ts
+const hasInitMcpFlags = (input) => input.mcpConfigLocation !== void 0 || input.mcpAuth !== void 0 || input.mcpProjectScoped === true;
+const hasSkillsFlag = (skills) => skills !== void 0 && skills.length > 0;
+const hasCustomizingFlags = (input) => input.skipAgents || input.claimable || hasSkillsFlag(input.skills) || hasInitMcpFlags(input);
+const hasExistingSetupFlags = (input) => input.namedAgents || input.noLink || input.configFlag !== void 0 || input.services !== void 0 || input.hasLinkInputs;
+const resolveInitMode = (input) => {
+	if (hasCustomizingFlags(input)) return { kind: "custom" };
+	if (input.yes) return { kind: "recommended" };
+	if (hasExistingSetupFlags(input)) return { kind: "custom" };
+	if (input.interactive) return { kind: "ask" };
+	throw new Error(INIT_NEEDS_YES_OR_TERMINAL);
+};
+const assertAgentSetupFlags = (input) => {
+	if (!input.skipAgents) return;
+	if (input.namedAgents || hasSkillsFlag(input.skills) || hasInitMcpFlags(input)) throw new Error(NO_AGENT_SETUP_CONFLICT);
+};
+const inferInitAgentSetup = (input) => {
+	if (input.skipAgents) return { kind: "skip" };
+	const hasSkills = hasSkillsFlag(input.skills);
+	if (hasSkills && input.hasMcpFlags) return { kind: "skills-mcp" };
+	if (hasSkills) return { kind: "skills" };
+	if (input.hasMcpFlags) return { kind: "skills-mcp" };
+	if (input.namedAgents || input.yes) return { kind: "auto" };
+	if (input.canAsk) return { kind: "ask" };
+	throw new Error(NON_TTY_AGENT_SETUP);
+};
+//#endregion
+export { assertAgentSetupFlags, hasInitMcpFlags, inferInitAgentSetup, resolveInitMode };

package/dist/init/plan.js

@@ -36,21 +36,47 @@ const postScaffoldActions = (input) => {
 	return actions;
 };
 const planAgentSteps = (input) => {
-	const y = input.yes ? ["-y"] : [];
-	if (input.agentSetup === "plugin") return [["plugins", ...y]];
-	if (input.agentSetup === "skills-mcp") return [["skills", ...y], ["mcp", ...y]];
+	if (input.agentSetup === "plugin") return [{
+		kind: "plugins",
+		options: { yes: input.yes }
+	}];
+	if (input.agentSetup === "skills-mcp") return [{
+		kind: "skills",
+		options: { yes: input.yes }
+	}, {
+		kind: "mcp",
+		options: { yes: input.yes }
+	}];
 	return [];
 };
 const planToolingSteps = (tooling, options) => {
-	const prefix = options.yes ? ["-y"] : [];
-	const flagsFor = (ids) => options.named ? [...prefix, ...agentArgv(ids)] : [...prefix];
+	const agentsFor = (ids) => options.named ? { agents: ids } : {};
+	const agentFor = (ids) => options.named ? { agent: [...ids] } : {};
 	switch (tooling.setup) {
 		case "skip": return [];
-		case "plugin": return [["plugins", ...flagsFor(tooling.agents)]];
+		case "plugin": return [{
+			kind: "plugins",
+			options: {
+				yes: options.yes,
+				...agentsFor(tooling.agents)
+			}
+		}];
 		case "skills-mcp": {
 			const steps = [];
-			if (tooling.skillsAgents.length > 0) steps.push(["skills", ...flagsFor(tooling.skillsAgents)]);
-			if (tooling.mcpAgents.length > 0) steps.push(["mcp", ...flagsFor(tooling.mcpAgents)]);
+			if (tooling.skillsAgents.length > 0) steps.push({
+				kind: "skills",
+				options: {
+					yes: options.yes,
+					...agentsFor(tooling.skillsAgents)
+				}
+			});
+			if (tooling.mcpAgents.length > 0) steps.push({
+				kind: "mcp",
+				options: {
+					yes: options.yes,
+					...agentFor(tooling.mcpAgents)
+				}
+			});
 			return steps;
 		}
 		default: return tooling;
@@ -95,7 +121,7 @@ const BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
 	"--no-agent-setup",
 	"--no-link",
 	"--no-config",
-	"--skip-template",
+	"--claimable",
 	"--config",
 	"--list",
 	"--list-templates",
@@ -174,6 +200,104 @@ const chooseYesAgentTooling = (agents) => {
 		mcpAgents
 	};
 };
+const FALLBACK_SKILLS_AGENTS = ["cursor", "codex"];
+const splitInitTooling = (agents, pluginScope, mcpConfigLocation = pluginScope) => {
+	const pluginSet = new Set(pluginsInstallableAgents(pluginScope));
+	const mcpSet = new Set(mcpInstallableAgents(mcpConfigLocation));
+	const pluginAgents = uniqueAgentIds(agents.filter((id) => pluginSet.has(id)));
+	const rest = uniqueAgentIds(agents.filter((id) => !pluginSet.has(id)));
+	const skillsAgents = rest.filter((id) => supportsSkills(id));
+	const mcpAgents = rest.filter((id) => mcpSet.has(id));
+	const [pluginFirst, ...pluginRest] = pluginAgents;
+	if (pluginFirst !== void 0 && (skillsAgents.length > 0 || mcpAgents.length > 0)) return {
+		setup: "mixed",
+		pluginAgents: [pluginFirst, ...pluginRest],
+		skillsAgents,
+		mcpAgents
+	};
+	if (pluginFirst !== void 0) return {
+		setup: "plugin",
+		agents: [pluginFirst, ...pluginRest]
+	};
+	if (skillsAgents.length === 0 && mcpAgents.length === 0) return { setup: "skip" };
+	return {
+		setup: "skills-mcp",
+		skillsAgents,
+		mcpAgents
+	};
+};
+const recommendedTooling = (detected) => {
+	const split = splitInitTooling(detected, "global");
+	if (split.setup === "skip") return {
+		setup: "skills",
+		agents: FALLBACK_SKILLS_AGENTS
+	};
+	return split;
+};
+const planInitToolingSteps = (input) => {
+	const pluginOptions = (agents) => ({
+		yes: input.yes,
+		global: input.pluginScope === "global",
+		agents
+	});
+	const skillsOptions = (agents) => ({
+		yes: input.yes,
+		global: input.skillsGlobal,
+		agents,
+		...input.skills !== void 0 ? { skills: input.skills } : {}
+	});
+	const mcpOptions = (agents) => ({
+		yes: input.yes,
+		oauth: input.mcpOauth,
+		project: input.mcpProject === true,
+		agent: [...agents],
+		...input.mcpProjectId !== void 0 ? { projectId: input.mcpProjectId } : {}
+	});
+	switch (input.tooling.setup) {
+		case "skip": return [];
+		case "plugin": return [{
+			kind: "plugins",
+			options: pluginOptions(input.tooling.agents)
+		}];
+		case "skills": return [{
+			kind: "skills",
+			options: {
+				yes: input.yes,
+				agents: input.tooling.agents,
+				...input.skills !== void 0 ? { skills: input.skills } : {}
+			}
+		}];
+		case "skills-mcp": {
+			const steps = [];
+			if (input.tooling.skillsAgents.length > 0) steps.push({
+				kind: "skills",
+				options: skillsOptions(input.tooling.skillsAgents)
+			});
+			if (input.tooling.mcpAgents.length > 0) steps.push({
+				kind: "mcp",
+				options: mcpOptions(input.tooling.mcpAgents)
+			});
+			return steps;
+		}
+		case "mixed": {
+			const steps = [{
+				kind: "plugins",
+				options: pluginOptions(input.tooling.pluginAgents)
+			}];
+			if (input.tooling.skillsAgents.length > 0) steps.push({
+				kind: "skills",
+				options: skillsOptions(input.tooling.skillsAgents)
+			});
+			if (input.tooling.mcpAgents.length > 0) steps.push({
+				kind: "mcp",
+				options: mcpOptions(input.tooling.mcpAgents)
+			});
+			return steps;
+		}
+		default: return input.tooling;
+	}
+};
+const funnelAgentSetup = (tooling) => tooling.setup;
 const planYesAgentSteps = (tooling) => planToolingSteps(tooling, {
 	yes: true,
 	named: false
@@ -208,7 +332,7 @@ const assertNamedAgentTooling = (named, command = "init", context) => {
 	if (named.length === 0) return;
 	const tooling = chooseYesAgentTooling(named);
 	if (tooling.setup === "skip") throw new Error(`${NAMED_AGENTS_UNSUPPORTED} Supported agents: ${initYesSupportedAgents().join(", ")}`);
-	if (namedAgentsNeedSplit(named, tooling)) throw new Error(namedAgentsMixedMessage(named, command, context));
+	if (command === "bootstrap" && namedAgentsNeedSplit(named, tooling)) throw new Error(namedAgentsMixedMessage(named, command, context));
 };
 const resolveNamedAgents = (raw) => {
 	if (raw.length === 0) return [];
@@ -252,30 +376,9 @@ const linkInputArgv = (input) => {
 	if (input.branch) args.push("--branch", input.branch);
 	return args;
 };
-const planExistingInit = (input) => {
-	const steps = [...planAgentSteps(input)];
-	if (!input.linked) steps.push(planLinkStep({
-		yes: input.yes,
-		extra: input.linkExtra
-	}));
-	if (input.config.kind === "write") steps.push(planConfigInitStep({
-		yes: input.yes,
-		services: input.config.services
-	}));
-	return steps;
-};
 const resolveInitAgentSetup = async (input) => {
 	if (input.interactive) return input.pick();
 	throw new Error(INIT_NEEDS_YES_OR_TERMINAL);
 };
-const childArgv = (step, forward) => {
-	const args = [...step];
-	if (forward.configDir) args.push("--config-dir", forward.configDir);
-	if (forward.profile) args.push("--profile", forward.profile);
-	args.push("--api-host", forward.apiHost);
-	args.push("--context-file", forward.contextFile);
-	if (forward.analytics === false) args.push("--no-analytics");
-	return args;
-};
 //#endregion
-export { INIT_NEEDS_YES_OR_TERMINAL, NAMED_AGENTS_MIXED, NAMED_AGENTS_UNSUPPORTED, assertNamedAgentTooling, bootstrapInitStep, childArgv, chooseYesAgentTooling, collectYesAgents, directoryIsEmpty, initPluginAgents, initSkillsMcpAgents, initYesSupportedAgents, linkInputArgv, namedAgentsMixedMessage, namedAgentsNeedSplit, noDetectedAgentsMessage, planAgentSteps, planConfigInitStep, planExistingInit, planLinkStep, planToolingSteps, planYesAgentSteps, postScaffoldActions, projectContextFile, resolveInitAgentSetup, resolveNamedAgents, resolveYesAgentList, rewriteUnknownAgentArg };
+export { FALLBACK_SKILLS_AGENTS, INIT_NEEDS_YES_OR_TERMINAL, NAMED_AGENTS_MIXED, NAMED_AGENTS_UNSUPPORTED, assertNamedAgentTooling, bootstrapInitStep, chooseYesAgentTooling, collectYesAgents, directoryIsEmpty, funnelAgentSetup, initPluginAgents, initSkillsMcpAgents, initYesSupportedAgents, linkInputArgv, namedAgentsMixedMessage, namedAgentsNeedSplit, noDetectedAgentsMessage, planAgentSteps, planConfigInitStep, planInitToolingSteps, planLinkStep, planToolingSteps, planYesAgentSteps, postScaffoldActions, projectContextFile, recommendedTooling, resolveInitAgentSetup, resolveNamedAgents, resolveYesAgentList, rewriteUnknownAgentArg, splitInitTooling };