fix: centralize authstack and fix capitalization (SK-732)

.gitignore

@@ -4,4 +4,5 @@ dist
 .DS_Store
 package-lock.json
 .local/
-docs/
+docs/
+plans/

README.md

@@ -14,7 +14,7 @@
 
 ---
 
-Install Scalekit auth extensions into your AI coding tools — Cursor, Claude Code, Codex, and GitHub Copilot — with auto-detection, interactive prompts, and dry-run previews.
+Install Scalekit auth extensions (and skills) into your AI coding tools — Cursor, Claude Code, Codex, GitHub Copilot, and others — with auto-detection, interactive prompts, and dry-run previews.
 
 ## Quick start
 
@@ -44,6 +44,13 @@ scalekit setup
 
 Auto-detects installed tools, lets you pick which ones to set up, and installs the auth extensions.
 
+You can also install Scalekit skills (for Cline, Windsurf, Aider, and other agents) from the unified Authstack:
+
+```bash
+scalekit setup          # choose "Scalekit skills" in the wizard
+scalekit setup --skip-skills   # stacks only
+```
+
 ### Direct install
 
 Skip the wizard and target a specific tool:
@@ -90,8 +97,9 @@ scalekit extension status            # check all versions
 
 ```
 scalekit                              show help
-scalekit setup                        interactive setup wizard
+scalekit setup                        interactive setup wizard (stacks + skills)
 scalekit setup <tool>                 set up a specific tool
+scalekit setup --skip-skills          stacks only, skip skills
 
 scalekit extension install <id>       install by id or alias    (alias: ext i)
 scalekit extension uninstall <id>     uninstall by id or alias  (alias: ext rm)

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@scalekit-inc/cli",
-	"version": "0.3.13",
+	"version": "0.3.16",
 	"description": "Scalekit CLI",
 	"type": "module",
 	"bin": {

src/commands/setup.ts

@@ -70,14 +70,12 @@ async function runSkillsInstall(): Promise<boolean> {
 	log.step("Installing skills...");
 	try {
 		await installSkills();
-		log.success("Skills installed.");
+		log.success("Skills installed from Authstack.");
 		return true;
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		log.error(`Skills installation failed: ${message}`);
-		log.info(
-			`You can install later: ${pc.cyan("npx skills add scalekit-inc/skills")}`,
-		);
+		log.info(`You can install later: ${pc.cyan(SKILLS_CMD)}`);
 		return false;
 	}
 }
@@ -86,7 +84,7 @@ async function interactiveSetup(opts: SetupOpts, cmd: Command) {
 	const json = isJson(cmd);
 	const nonInteractive = isNonInteractive(cmd);
 
-	if (!json) intro("ScaleKit Setup");
+	if (!json) intro("Scalekit Setup");
 
 	const detected = stacks.filter((s) => s.detect());
 
@@ -107,8 +105,8 @@ async function interactiveSetup(opts: SetupOpts, cmd: Command) {
 			: [
 					{
 						value: SKILLS_ID,
-						label: "Other agents",
-						hint: "Cline, Windsurf, Aider & more",
+						label: "Scalekit skills",
+						hint: "for Cline, Windsurf, Aider & more (via Authstack)",
 					},
 				];
 
@@ -155,7 +153,7 @@ async function interactiveSetup(opts: SetupOpts, cmd: Command) {
 			skillsInstalled = await runSkillsInstall();
 		} else {
 			const action = await select({
-				message: "How do you want to install skills?",
+				message: "How do you want to install Scalekit skills (from Authstack)?",
 				options: [
 					{
 						value: "auto",
@@ -174,8 +172,9 @@ async function interactiveSetup(opts: SetupOpts, cmd: Command) {
 				skillsInstalled = await runSkillsInstall();
 			} else {
 				log.info("");
-				log.info("Run this to install skills with the interactive wizard:");
-				log.info(`  ${pc.cyan("npx skills add scalekit-inc/skills")}`);
+				log.info("Run this to install Scalekit skills from Authstack:");
+				log.info(`  ${pc.cyan(SKILLS_CMD)}`);
+				log.info("  (This pulls skills like setup guidance; the content is maintained in the Authstack repo.)");
 				log.info("");
 			}
 		}
@@ -245,7 +244,7 @@ async function directSetup(stackId: string, opts: SetupOpts, cmd: Command) {
 	}
 
 	if (!isNonInteractive(cmd) && !opts.dryRun) {
-		intro("ScaleKit Setup");
+		intro("Scalekit Setup");
 		const ok = await confirm({
 			message: `Install ${stack.name} auth stack?`,
 		});
@@ -303,11 +302,11 @@ const setupExtensionShortcut = styledCommand("extension")
 	});
 
 export const setupCommand = styledCommand("setup")
-	.description("set up ScaleKit auth stacks for your coding agents")
+	.description("set up Scalekit auth stacks and skills for your coding agents")
 	.argument("[stack]", "cursor, claude, codex, copilot (or any alias)")
 	.option("-y, --yes", "skip confirmation prompts")
 	.option("--dry-run", "show commands without executing")
-	.option("--skip-skills", "skip Scalekit skills installation")
+	.option("--skip-skills", "skip Scalekit skills (from Authstack)")
 	.addCommand(setupExtensionShortcut)
 	.addHelpText(
 		"after",
@@ -318,7 +317,7 @@ Examples:
   $ scalekit setup extension cc shortcut → extension install claude
   $ scalekit setup codex -y     skip confirmation
   $ scalekit setup --dry-run    preview commands without running them
-  $ scalekit setup --skip-skills  set up agents only, skip skills`,
+  $ scalekit setup --skip-skills          stacks only (skip Scalekit skills)`,
 	)
 	.action(
 		async (stackId: string | undefined, opts: SetupOpts, cmd: Command) => {

src/core/authstack.ts

@@ -0,0 +1,30 @@
+export const AUTHSTACK_REPO = "scalekit-inc/authstack";
+export const AUTHSTACK_MARKETPLACE = "authstack";
+export const AUTHSTACK_KITS = ["agentkit", "saaskit"] as const;
+
+export const AUTHSTACK_URL =
+	`https://github.com/${AUTHSTACK_REPO}/archive/refs/heads/main.tar.gz`;
+
+export const AUTHSTACK_ARCHIVE_DIR = `${AUTHSTACK_REPO.split("/").pop()}-main`;
+
+export const CLI_PACKAGE = "@scalekit-inc/cli";
+
+export function getSetupCommand(stack: string) {
+	return `npx ${CLI_PACKAGE} setup ${stack}`;
+}
+
+export function getPluginMarketplaceCommands(tool: "claude" | "copilot") {
+	return [
+		`${tool} plugin marketplace add ${AUTHSTACK_REPO}`,
+		`${tool} plugin install agentkit@${AUTHSTACK_MARKETPLACE}`,
+		`${tool} plugin install saaskit@${AUTHSTACK_MARKETPLACE}`,
+	];
+}
+
+export function getPluginUninstallCommands(tool: "claude" | "copilot") {
+	return [
+		`${tool} plugin uninstall agentkit@${AUTHSTACK_MARKETPLACE}`,
+		`${tool} plugin uninstall saaskit@${AUTHSTACK_MARKETPLACE}`,
+		`${tool} plugin marketplace remove ${AUTHSTACK_MARKETPLACE}`,
+	];
+}

src/core/downloader.ts

@@ -2,8 +2,9 @@ import { execFileSync } from "node:child_process";
 import { access, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 
-export const AUTHSTACK_URL =
-	"https://github.com/scalekit-inc/authstack/archive/refs/heads/main.tar.gz";
+import { AUTHSTACK_ARCHIVE_DIR, AUTHSTACK_URL } from "./authstack.js";
+
+export { AUTHSTACK_URL };
 
 export async function downloadAuthstack(tmpDir: string): Promise<string> {
 	const sourceDir = process.env.AUTHSTACK_SOURCE_DIR;
@@ -19,7 +20,7 @@ export async function downloadAuthstack(tmpDir: string): Promise<string> {
 
 	execFileSync("tar", ["-xzf", archivePath, "-C", tmpDir]);
 
-	const root = join(tmpDir, "authstack-main");
+	const root = join(tmpDir, AUTHSTACK_ARCHIVE_DIR);
 	try {
 		await access(join(root, "kits"));
 	} catch {

src/core/skills.ts

@@ -1,6 +1,12 @@
 import { spawn } from "node:child_process";
 
-const SKILLS_REPO = "scalekit-inc/skills";
+import { AUTHSTACK_REPO } from "./authstack.js";
+
+// Skills (including setup guidance) are served from the same unified
+// scalekit-inc/authstack repo used for the editor stacks/plugins.
+// If the installed guidance references legacy split repos, that content
+// lives in the authstack repo itself and should be updated there.
+const SKILLS_REPO = AUTHSTACK_REPO;
 
 export const SKILLS_CMD = `npx skills add ${SKILLS_REPO} --all`;
 

src/index.ts

@@ -12,7 +12,7 @@ function showBanner() {
 		return;
 	}
 
-	cfonts.say("ScaleKit", {
+	cfonts.say("Scalekit", {
 		font: "chrome",
 		align: "left",
 		colors: ["cyan", "white", "blue"],
@@ -22,7 +22,7 @@ function showBanner() {
 }
 
 const program = styledCommand("scalekit")
-	.description("Auth stack for the agentic era")
+	.description("Authstack for devs building AI agents, MCP servers and SaaS apps")
 	.version(version)
 	.option("--plain", "disable colors and styling (also respects NO_COLOR env)")
 	.option("--json", "output machine-readable JSON")

src/stacks/claude.ts

@@ -4,21 +4,17 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import semver from "semver";
 import { runShellCommands } from "../core/shell.js";
+import {
+	AUTHSTACK_MARKETPLACE,
+	getPluginMarketplaceCommands,
+	getPluginUninstallCommands,
+} from "../core/authstack.js";
 import type { Stack, VersionStatus } from "./registry.js";
 
-const CMDS = [
-	"claude plugin marketplace add scalekit-inc/authstack",
-	"claude plugin install agentkit@authstack",
-	"claude plugin install saaskit@authstack",
-];
+const CMDS = getPluginMarketplaceCommands("claude");
+const UNINSTALL_CMDS = getPluginUninstallCommands("claude");
 
-const UNINSTALL_CMDS = [
-	"claude plugin uninstall agentkit@authstack",
-	"claude plugin uninstall saaskit@authstack",
-	"claude plugin marketplace remove authstack",
-];
-
-const MARKETPLACE_ID = "authstack";
+const MARKETPLACE_ID = AUTHSTACK_MARKETPLACE;
 const PLUGIN_NAME = "agentkit";
 const PLUGIN_DIR = join(
 	homedir(),
@@ -88,7 +84,7 @@ export const claudeStack: Stack = {
 	uninstallCommands: UNINSTALL_CMDS,
 	nextSteps: [
 		"Run `claude` to start a session",
-		"Enable auto-update: /plugins → Marketplace → authstack → Enable auto-update",
+		`Enable auto-update: /plugins → Marketplace → ${AUTHSTACK_MARKETPLACE} → Enable auto-update`,
 		'Try: "Connect my Gmail account using Scalekit"',
 	],
 	tryItNow: 'claude "Analyze my project and suggest how Scalekit can power it"',

src/stacks/codex.ts

@@ -3,9 +3,14 @@ import { cp, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
 import { downloadAuthstack } from "../core/downloader.js";
+import {
+	AUTHSTACK_KITS,
+	AUTHSTACK_MARKETPLACE,
+	getSetupCommand,
+} from "../core/authstack.js";
 import type { Stack } from "./registry.js";
 
-const MARKETPLACE_DIR = join(homedir(), ".codex", "marketplaces", "authstack");
+const MARKETPLACE_DIR = join(homedir(), ".codex", "marketplaces", AUTHSTACK_MARKETPLACE);
 const PERSONAL_MARKETPLACE = join(
 	homedir(),
 	".agents",
@@ -16,28 +21,17 @@ const PERSONAL_MARKETPLACE = join(
 function buildMarketplaceJson(marketplaceDir: string): string {
 	return JSON.stringify(
 		{
-			name: "authstack",
-			interface: { displayName: "Scalekit Auth Stack" },
-			plugins: [
-				{
-					name: "agentkit",
-					source: {
-						source: "local",
-						path: join(marketplaceDir, "kits", "agentkit"),
-					},
-					policy: { installation: "AVAILABLE", authentication: "ON_INSTALL" },
-					category: "Agent Auth",
+			name: AUTHSTACK_MARKETPLACE,
+			interface: { displayName: "Scalekit Authstack" },
+			plugins: AUTHSTACK_KITS.map((kit) => ({
+				name: kit,
+				source: {
+					source: "local",
+					path: join(marketplaceDir, "kits", kit),
 				},
-				{
-					name: "saaskit",
-					source: {
-						source: "local",
-						path: join(marketplaceDir, "kits", "saaskit"),
-					},
-					policy: { installation: "AVAILABLE", authentication: "ON_INSTALL" },
-					category: "Application Auth",
-				},
-			],
+				policy: { installation: "AVAILABLE", authentication: "ON_INSTALL" },
+				category: kit === "agentkit" ? "Agent Auth" : "Application Auth",
+			})),
 		},
 		null,
 		2,
@@ -68,7 +62,7 @@ export const codexStack: Stack = {
 	name: "Codex",
 	description: "Scalekit auth plugins for Codex / OpenCode",
 	aliases: ["opencode"],
-	commands: ["npx @scalekit-inc/cli setup codex"],
+	commands: [getSetupCommand("codex")],
 	uninstallCommands: [
 		`rm -rf ${MARKETPLACE_DIR}`,
 		`rm -f ${PERSONAL_MARKETPLACE}`,
@@ -77,6 +71,14 @@ export const codexStack: Stack = {
 	nextSteps: ["Run `codex mcp login scalekit` to authenticate"],
 	tryItNow: 'codex "Analyze my project and suggest how Scalekit can power it"',
 
+	async checkVersion() {
+		const detected = this.detect ? this.detect() : false;
+		if (!detected) {
+			return { installed: false, status: "not_installed" as const };
+		}
+		return { installed: true, status: "unknown" as const };
+	},
+
 	detect() {
 		try {
 			execFileSync(
@@ -102,7 +104,7 @@ export const codexStack: Stack = {
 			await cp(autostackRoot, MARKETPLACE_DIR, { recursive: true });
 
 			const existingName = await readMarketplaceName();
-			if (existingName === null || existingName === "authstack") {
+			if (existingName === null || existingName === AUTHSTACK_MARKETPLACE) {
 				await writePersonalMarketplace();
 			}
 		} finally {
@@ -113,7 +115,7 @@ export const codexStack: Stack = {
 	async uninstall() {
 		await rm(MARKETPLACE_DIR, { recursive: true, force: true });
 		const existingName = await readMarketplaceName();
-		if (existingName === "authstack") {
+		if (existingName === AUTHSTACK_MARKETPLACE) {
 			await rm(PERSONAL_MARKETPLACE, { force: true });
 		}
 	},