@theholocron/cli 3.26.0 → 3.28.0

package/dist/cli.mjs

@@ -257,6 +257,7 @@ function resolveConfig(raw) {
 		name: raw.name,
 		description: raw.description,
 		homepage,
+		org: raw.org,
 		repo: raw.repo,
 		workflows: raw.workflows,
 		providers,
@@ -333,6 +334,7 @@ async function runAuthSet(input) {
 	const print = input.print ?? ((l) => console.log(l));
 	const importer = input.importer ?? defaultImporter$1;
 	const { provider } = input;
+	const keyringKey = input.org ? `${provider}.${input.org}` : provider;
 	const token = resolveAuthSetToken({
 		provider,
 		positional: input.positional,
@@ -341,7 +343,7 @@ async function runAuthSet(input) {
 	const isFeatureKey = provider.includes(".");
 	const packageName = isFeatureKey ? null : resolvePluginPackage(provider);
 	if (!token) {
-		print(style.fail(`no token supplied for \`${provider}\`.`));
+		print(style.fail(`no token supplied for \`${keyringKey}\`.`));
 		print(style.hint(`  pass as positional arg: holocron auth set ${provider} <token>`));
 		if (!isFeatureKey) {
 			print(style.hint(`  or via env: HOLOCRON_${provider.toUpperCase()}_TOKEN / ${provider.toUpperCase()}_TOKEN`));
@@ -373,14 +375,14 @@ async function runAuthSet(input) {
 		print(style.warn(`cannot verify token — failed to load ${packageName}: ${msg}`));
 		print(style.hint(`  storing token anyway; run 'holocron auth check ${provider}' once the plugin is installed`));
 	}
-	if (!setToken(provider, token)) {
+	if (!setToken(keyringKey, token)) {
 		print(style.fail(`keyring unavailable — token not stored. Use env vars instead.`));
 		return {
 			status: "fail",
 			message: "keyring unavailable"
 		};
 	}
-	print(style.success(`stored ${provider} token${subject ? ` (${subject})` : ""}`));
+	print(style.success(`stored ${keyringKey} token${subject ? ` (${subject})` : ""}`));
 	return {
 		status: "ok",
 		...subject ? { message: subject } : {}
@@ -402,16 +404,17 @@ async function runAuthCheck(input) {
 	const print = input.print ?? ((l) => console.log(l));
 	const importer = input.importer ?? defaultImporter$1;
 	const { provider } = input;
-	const token = getToken(provider);
+	const keyringKey = input.org ? `${provider}.${input.org}` : provider;
+	const token = getToken(keyringKey);
 	if (!token) {
-		print(style.dim(`no stored token for ${provider}`));
+		print(style.dim(`no stored token for ${keyringKey}`));
 		return {
 			status: "skip",
 			message: "no stored token"
 		};
 	}
 	if (provider.includes(".")) {
-		print(style.success(`${provider}: token stored (feature key — no plugin verification)`));
+		print(style.success(`${keyringKey}: token stored (feature key — no plugin verification)`));
 		return {
 			status: "ok",
 			message: "stored"
@@ -421,22 +424,22 @@ async function runAuthCheck(input) {
 	try {
 		const module = await importer(packageName);
 		if (typeof module.verifyToken !== "function") {
-			print(style.warn(`${provider}: token stored (plugin has no verifyToken; can't confirm validity)`));
+			print(style.warn(`${keyringKey}: token stored (plugin has no verifyToken; can't confirm validity)`));
 			return {
 				status: "ok",
 				message: "stored, unverified"
 			};
 		}
 		const verify = () => module.verifyToken(token);
-		const verified = input.showSpinner !== false ? await withSpinner(`Verifying ${provider} token…`, verify) : await verify();
+		const verified = input.showSpinner !== false ? await withSpinner(`Verifying ${keyringKey} token…`, verify) : await verify();
 		if (verified.ok) {
-			print(style.success(`${provider}: ok — ${verified.subject}`));
+			print(style.success(`${keyringKey}: ok — ${verified.subject}`));
 			return {
 				status: "ok",
 				message: verified.subject
 			};
 		}
-		print(style.fail(`${provider}: rejected — ${verified.message}`));
+		print(style.fail(`${keyringKey}: rejected — ${verified.message}`));
 		if (module.AUTH_HINT) print(style.hint(`  hint: ${module.AUTH_HINT}`));
 		return {
 			status: "fail",
@@ -444,7 +447,7 @@ async function runAuthCheck(input) {
 		};
 	} catch (err) {
 		const msg = err instanceof Error ? err.message : String(err);
-		print(style.fail(`${provider}: cannot verify — ${msg}`));
+		print(style.fail(`${keyringKey}: cannot verify — ${msg}`));
 		return {
 			status: "fail",
 			message: msg
@@ -5192,6 +5195,15 @@ const resolveSyncToken = createFeatureResolver({
 	keyringKey: "github.sync"
 });
 const { version: CLI_VERSION } = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
+/**
+* Resolves the active org in priority order:
+*   1. `--org` CLI flag
+*   2. `HOLOCRON_ORG` env var
+*   3. `org` from `holocron.config.ts`
+*/
+function resolveOrg(argv, config) {
+	return argv.org ?? process.env["HOLOCRON_ORG"] ?? config.org;
+}
 /** Parses --token values and returns the context spread, or null on parse error (exits with code 1). */
 function tokenContext(rawTokens) {
 	if (!rawTokens?.length) return {};
@@ -5220,6 +5232,9 @@ try {
 		type: "string",
 		array: true,
 		describe: "Vendor token override for plugins. Bare form: --token <value> (fallback for all plugins, single-plugin commands). Keyed form: --token vendor=value (targets a specific provider; repeat for each). Example: --token github=ghp_xxx --token vercel=v_yyy"
+	}).option("org", {
+		type: "string",
+		describe: "Active org name for namespaced keyring lookup. Overrides HOLOCRON_ORG env var and the `org` field in holocron.config.ts. Example: --org theholocron"
 	}).option("cwd", {
 		type: "string",
 		default: process.cwd(),
@@ -5256,13 +5271,15 @@ try {
 	}), async (argv) => {
 		const tokens = tokenContext(argv.token);
 		if (!tokens) return;
+		const loaded = await loadConfig(argv.cwd);
 		if ((await runDoctor({
-			loaded: await loadConfig(argv.cwd),
+			loaded,
 			context: {
 				repoRoot: argv.cwd,
 				dryRun: argv.dryRun,
 				...argv.repo ? { repo: argv.repo } : {},
-				...tokens
+				...tokens,
+				org: resolveOrg(argv, loaded.resolved)
 			}
 		})).summary.fail > 0) process.exitCode = 1;
 	}).command("setup", "Apply infra setup actions across every configured capability", (y) => y.option("repo", {
@@ -5271,13 +5288,15 @@ try {
 	}), async (argv) => {
 		const tokens = tokenContext(argv.token);
 		if (!tokens) return;
+		const loaded = await loadConfig(argv.cwd);
 		if ((await runSetup({
-			loaded: await loadConfig(argv.cwd),
+			loaded,
 			context: {
 				repoRoot: argv.cwd,
 				dryRun: argv.dryRun,
 				...argv.repo ? { repo: argv.repo } : {},
-				...tokens
+				...tokens,
+				org: resolveOrg(argv, loaded.resolved)
 			}
 		})).summary.fail > 0) process.exitCode = 1;
 	}).command("skills", "Manage agent skills from the @theholocron/skills registry", (y) => y.command("install", "Copy skills from @theholocron/skills into .agents/ with agent symlinks", () => {}, async (argv) => {
@@ -5334,12 +5353,14 @@ try {
 		if (!tokens) return;
 		const scopeArg = argv.scope;
 		const scope = parseScope(scopeArg);
+		const loaded = await loadConfig(argv.cwd);
 		if ((await runSecretSet({
-			loaded: await loadConfig(argv.cwd),
+			loaded,
 			context: {
 				repoRoot: argv.cwd,
 				dryRun: argv.dryRun,
-				...tokens
+				...tokens,
+				org: resolveOrg(argv, loaded.resolved)
 			},
 			name: argv.name,
 			...argv.value ? { value: argv.value } : {},
@@ -5361,12 +5382,14 @@ try {
 	}), async (argv) => {
 		const tokens = tokenContext(argv.token);
 		if (!tokens) return;
+		const loaded = await loadConfig(argv.cwd);
 		if ((await runSecretsSync({
-			loaded: await loadConfig(argv.cwd),
+			loaded,
 			context: {
 				repoRoot: argv.cwd,
 				dryRun: argv.dryRun,
-				...tokens
+				...tokens,
+				org: resolveOrg(argv, loaded.resolved)
 			},
 			environmentId: argv.environmentId,
 			...argv.projectId ? { projectId: argv.projectId } : {},
@@ -5387,12 +5410,14 @@ try {
 	}), async (argv) => {
 		const tokens = tokenContext(argv.token);
 		if (!tokens) return;
+		const loaded = await loadConfig(argv.cwd);
 		if ((await runDeploy({
-			loaded: await loadConfig(argv.cwd),
+			loaded,
 			context: {
 				repoRoot: argv.cwd,
 				dryRun: argv.dryRun,
-				...tokens
+				...tokens,
+				org: resolveOrg(argv, loaded.resolved)
 			},
 			projectId: argv.projectId,
 			branch: argv.branch,
@@ -5432,13 +5457,15 @@ try {
 	}), async (argv) => {
 		const tokens = tokenContext(argv.token);
 		if (!tokens) return;
+		const loaded = await loadConfig(argv.cwd);
 		if ((await runSync({
-			loaded: await loadConfig(argv.cwd),
+			loaded,
 			context: {
 				repoRoot: argv.cwd,
 				dryRun: argv.dryRun,
 				...argv.repo ? { repo: argv.repo } : {},
-				...tokens
+				...tokens,
+				org: resolveOrg(argv, loaded.resolved)
 			},
 			...argv.steps && argv.steps.length > 0 ? { steps: argv.steps } : {}
 		})).summary.fail > 0) process.exitCode = 1;
@@ -5853,7 +5880,8 @@ try {
 	}).positional("value", { type: "string" }), async (argv) => {
 		if ((await runAuthSet({
 			provider: argv.provider,
-			...argv.value ? { positional: argv.value } : {}
+			...argv.value ? { positional: argv.value } : {},
+			...argv.org ? { org: argv.org } : {}
 		})).status === "fail") process.exitCode = 1;
 	}).command("unset <provider>", "Remove a stored bootstrap token", (yy) => yy.positional("provider", {
 		type: "string",
@@ -5864,7 +5892,10 @@ try {
 		type: "string",
 		demandOption: true
 	}), async (argv) => {
-		if ((await runAuthCheck({ provider: argv.provider })).status === "fail") process.exitCode = 1;
+		if ((await runAuthCheck({
+			provider: argv.provider,
+			...argv.org ? { org: argv.org } : {}
+		})).status === "fail") process.exitCode = 1;
 	}).command("list", "List every provider with a stored bootstrap token", () => {}, async () => {
 		await runAuthList();
 	}).demandCommand(1, "Run `holocron auth --help` to see available auth subcommands."), () => {}).demandCommand(1, "Run `holocron --help` to see available commands.").strict().help().parse();