@keystrokehq/cli 0.0.134 → 0.0.137

package/dist/index.mjs

@@ -2105,7 +2105,6 @@ const UserOrganizationSchema = object({
 });
 const ActiveOrganizationResponseSchema = object({ organization: UserOrganizationSchema.nullable() });
 const ListOrganizationsResponseSchema = object({ organizations: array(UserOrganizationSchema) });
-const SetActiveOrganizationRequestSchema = object({ organizationId: string().min(1) });
 const CreateOrganizationRequestSchema = object({
 	name: string().trim().min(1),
 	/** Format-only at the wire boundary; reserved-name checks run in platform-database. */
@@ -4782,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;
@@ -5071,10 +5072,22 @@ function createHealthResource(http) {
 	} };
 }
 function createOrganizationsResource(http, options = {}) {
+	async function get(organizationId) {
+		try {
+			const data = await http.get(`/api/organizations/${organizationId}`).json();
+			const organization = ActiveOrganizationResponseSchema.parse(data).organization;
+			if (!organization) throw new Error("Organization was not returned");
+			return organization;
+		} catch (error) {
+			throw await toPlatformError(error);
+		}
+	}
 	async function update(input) {
 		const body = UpdateOrganizationRequestSchema.parse(input);
+		const organizationId = options.getActiveOrganizationId?.();
+		if (!organizationId) throw new Error("No active organization");
 		try {
-			const data = await http.patch("/api/organizations/active", { json: body }).json();
+			const data = await http.patch(`/api/organizations/${organizationId}`, { json: body }).json();
 			const organization = ActiveOrganizationResponseSchema.parse(data).organization;
 			if (!organization) throw new Error("Active organization was not returned");
 			return organization;
@@ -5091,34 +5104,27 @@ function createOrganizationsResource(http, options = {}) {
 				throw await toPlatformError(error);
 			}
 		},
+		get,
 		async getActive() {
+			const organizationId = options.getActiveOrganizationId?.();
+			if (!organizationId) return null;
 			try {
-				const data = await http.get("/api/organizations/active").json();
-				return ActiveOrganizationResponseSchema.parse(data).organization;
+				return await get(organizationId);
 			} catch (error) {
-				if (isHTTPError(error) && error.response.status === 401) return null;
-				throw await toPlatformError(error);
+				if (error instanceof PlatformError && (error.status === 401 || error.status === 403)) return null;
+				if (isHTTPError(error) && (error.response.status === 401 || error.response.status === 403)) return null;
+				throw error instanceof PlatformError ? error : await toPlatformError(error);
 			}
 		},
 		async setActive(input) {
-			const body = SetActiveOrganizationRequestSchema.parse(input);
-			try {
-				const data = await http.post("/api/organizations/active", { json: body }).json();
-				const organization = ActiveOrganizationResponseSchema.parse(data).organization;
-				if (!organization) throw new Error("Active organization was not returned");
-				options.onActiveOrganizationChange?.(organization.organization.id);
-				return organization;
-			} catch (error) {
-				throw await toPlatformError(error);
-			}
+			const organizationId = input.organizationId.trim();
+			if (!organizationId) throw new Error("Organization id is required");
+			const membership = await get(organizationId);
+			options.onActiveOrganizationChange?.(organizationId);
+			return membership;
 		},
 		async clearActive() {
-			try {
-				await http.delete("/api/organizations/active");
-				options.onActiveOrganizationChange?.(null);
-			} catch (error) {
-				throw await toPlatformError(error);
-			}
+			options.onActiveOrganizationChange?.(null);
 		},
 		update,
 		async create(input) {
@@ -5130,9 +5136,9 @@ function createOrganizationsResource(http, options = {}) {
 				throw await toPlatformError(error);
 			}
 		},
-		async checkSlug(slug, options = {}) {
+		async checkSlug(slug, slugOptions = {}) {
 			const searchParams = new URLSearchParams({ slug });
-			if (options.excludeOrganizationId) searchParams.set("excludeOrganizationId", options.excludeOrganizationId);
+			if (slugOptions.excludeOrganizationId) searchParams.set("excludeOrganizationId", slugOptions.excludeOrganizationId);
 			try {
 				const data = await http.get(`/api/organizations/slug-available?${searchParams}`).json();
 				return SlugAvailabilityResponseSchema.parse(data);
@@ -7740,19 +7746,24 @@ async function presignPutAndFinalize(input) {
 		throw await input.toPlatformError(error);
 	}
 }
-function createOrganizationSidebarBrandingResource(http) {
+function createOrganizationSidebarBrandingResource(http, options = {}) {
+	function brandingPath() {
+		const organizationId = options.getActiveOrganizationId?.();
+		if (!organizationId) throw new Error("No active organization");
+		return `/api/organizations/${organizationId}/branding`;
+	}
 	async function presignLogoUpload(variant, contentType) {
 		const body = PresignOrgLogoRequestSchema.parse({
 			variant,
 			contentType
 		});
-		const data = await http.post("/api/organizations/active/branding/logo/presign", { json: body }).json();
+		const data = await http.post(`${brandingPath()}/logo/presign`, { json: body }).json();
 		return PresignOrgLogoResponseSchema.parse(data);
 	}
 	return {
 		async get() {
 			try {
-				const data = await http.get("/api/organizations/active/branding").json();
+				const data = await http.get(brandingPath()).json();
 				return OrganizationSidebarBrandingSchema.parse(data);
 			} catch (error) {
 				throw await toPlatformError(error);
@@ -7779,7 +7790,7 @@ function createOrganizationSidebarBrandingResource(http) {
 		async update(patch) {
 			const body = OrganizationSidebarBrandingPatchSchema.parse(patch);
 			try {
-				const data = await http.patch("/api/organizations/active/branding", { json: body }).json();
+				const data = await http.patch(brandingPath(), { json: body }).json();
 				return OrganizationSidebarBrandingSchema.parse(data);
 			} catch (error) {
 				throw await toPlatformError(error);
@@ -8596,7 +8607,7 @@ function createPlatformClient(options) {
 		recents: createRecentsResource(http),
 		userPreferences: createUserPreferencesResource({ getCurrentUserId: options.getCurrentUserId }),
 		userAvatar: createUserAvatarResource(http),
-		organizationSidebarBranding: createOrganizationSidebarBrandingResource(http),
+		organizationSidebarBranding: createOrganizationSidebarBrandingResource(http, { getActiveOrganizationId: () => activeOrganizationId }),
 		getActiveOrganizationId: () => activeOrganizationId,
 		setActiveOrganizationId
 	};
@@ -8665,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) {
@@ -8688,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;
@@ -9290,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);
@@ -9303,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,