@keystrokehq/cli 0.0.136 → 0.0.137

package/dist/index.mjs

@@ -4781,9 +4781,11 @@ async function runDeviceLogin(options) {
 		});
 		if (!tokenResult.error) {
 			const token = tokenResult.data;
+			const organizationId = token.scope?.trim();
 			return {
 				accessToken: token.access_token,
-				expiresIn: token.expires_in
+				expiresIn: token.expires_in,
+				organizationId: organizationId || void 0
 			};
 		}
 		const errorPayload = tokenResult.error;
@@ -8674,6 +8676,15 @@ async function activateOrganization(config, organizationId) {
 	platform.setActiveOrganizationId(membership.organization.id);
 	return membership;
 }
+function resolveOrganizationIdForLogin(organizations, options = {}) {
+	if (options.organizationRef ?? options.organizationId) return resolveOrganizationRef(organizations, options.organizationRef ?? options.organizationId).organization.id;
+	for (const candidateId of [options.deviceOrganizationId, options.storedOrganizationId]) {
+		const organizationId = candidateId?.trim();
+		if (organizationId && organizations.some((entry) => entry.organization.id === organizationId)) return organizationId;
+	}
+	if (organizations.length === 1) return organizations[0].organization.id;
+	return [...organizations].sort((left, right) => left.organization.slug.localeCompare(right.organization.slug))[0].organization.id;
+}
 async function pickOrganization(config, organizations, organizationRef) {
 	if (organizationRef) return activateOrganization(config, resolveOrganizationRef(organizations, organizationRef).organization.id);
 	if (!process.stdin.isTTY) {
@@ -8697,33 +8708,21 @@ async function selectActiveOrganization(config, options = {}) {
 async function syncActiveOrganizationAfterLogin(config, options = {}) {
 	const organizations = await listOrganizations(config);
 	if (organizations.length === 0) throw new Error(`No organization found — create one at ${getWebUrl(config)}`);
-	const storedId = config.get("activeOrganizationId");
-	if (storedId && organizations.some((entry) => entry.organization.id === storedId)) {
-		const membership = await activateOrganization(config, storedId);
-		process.stdout.write(`Using organization ${membership.organization.name}\n`);
-		return membership;
-	}
-	if (organizations.length === 1) {
-		const membership = await activateOrganization(config, organizations[0].organization.id);
-		process.stdout.write(`Using organization ${membership.organization.name}\n`);
-		return membership;
-	}
-	if (options.organizationRef ?? options.organizationId) {
-		const membership = await pickOrganization(config, organizations, options.organizationRef ?? options.organizationId);
-		process.stdout.write(`Using organization ${membership.organization.name}\n`);
-		return membership;
-	}
-	const membership = await pickOrganization(config, organizations);
-	process.stdout.write(`Using organization ${membership.organization.name}\n`);
-	return membership;
+	return activateOrganization(config, resolveOrganizationIdForLogin(organizations, {
+		organizationRef: options.organizationRef,
+		organizationId: options.organizationId,
+		deviceOrganizationId: options.deviceOrganizationId,
+		storedOrganizationId: config.get("activeOrganizationId")
+	}));
 }
 async function ensureActiveOrganization(config) {
+	const organizations = await listOrganizations(config);
+	if (organizations.length === 0) throw new Error("No organization found. Run `keystroke auth login` after creating one in the dashboard.");
 	const storedId = config.get("activeOrganizationId");
-	if (storedId) {
+	if (storedId && organizations.some((entry) => entry.organization.id === storedId)) {
 		await activateOrganization(config, storedId);
 		return;
 	}
-	const organizations = await listOrganizations(config);
 	if (organizations.length === 1) {
 		await activateOrganization(config, organizations[0].organization.id);
 		return;
@@ -9299,7 +9298,7 @@ function resolveAuthLoginTargets(options, config) {
 //#endregion
 //#region src/commands/auth/login.ts
 function registerAuthLoginCommand(auth) {
-	auth.command("login").description("Authenticate via browser device flow").option("--web-url <url>", "Web dashboard origin (omit to use production defaults; local dev: http://localhost:3000)").option("--platform-url <url>", "Platform API origin (derived from web URL when omitted)").option("--org <slug>", "Active organization slug (skips prompt when you belong to several)").action(async (options) => {
+	auth.command("login").description("Authenticate via browser device flow").option("--web-url <url>", "Web dashboard origin (omit to use production defaults; local dev: http://localhost:3000)").option("--platform-url <url>", "Platform API origin (derived from web URL when omitted)").option("--org <slug>", "Active organization slug (overrides browser default)").action(async (options) => {
 		const config = createCliConfig();
 		const { webUrl, platformUrl } = resolveAuthLoginTargets(options, config);
 		config.set("webUrl", webUrl);
@@ -9312,9 +9311,12 @@ function registerAuthLoginCommand(auth) {
 			});
 			setAccessToken(platformUrl, result.accessToken);
 			const user = await getSessionWithBearer(platformUrl, result.accessToken);
-			if (user) process.stdout.write(`Logged in as ${user.name} (${user.email})\n`);
-			else process.stdout.write(`Logged in to ${webUrl}\n`);
-			await syncActiveOrganizationAfterLogin(config, { organizationRef: options.org });
+			const membership = await syncActiveOrganizationAfterLogin(config, {
+				organizationRef: options.org,
+				deviceOrganizationId: result.organizationId
+			});
+			if (user) process.stdout.write(`Logged in as ${user.name} (${user.email}) — organization ${membership.organization.name}\n`);
+			else process.stdout.write(`Logged in to ${webUrl} — organization ${membership.organization.name}\n`);
 		} catch (error) {
 			process.stderr.write(`${formatCliError(error, "Login failed", {
 				webUrl,