@keystrokehq/cli 0.1.60 → 0.1.62

package/dist/index.mjs

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
-import { $ as CredentialInstanceListResponseSchema, $n as WorkspaceTriggerDetailSchema, $t as ProjectResponseSchema, A as ConfirmCheckoutResponseSchema, An as UpdateOrganizationRequestSchema, At as ListOrganizationsResponseSchema, B as CreateCustomAppRequestSchema, Bn as UserPreferencesPatchSchema, Bt as PROJECT_PULL_STATE_RELATIVE_PATH, C as ChannelAccountListResponseSchema, Cn as TriggerRunListResponseSchema, Ct as ListAgentMemoryFilesResponseSchema, D as ChannelPlatformSchema, Dn as UpdateCredentialRequestSchema, Dt as ListCredentialsResponseSchema, E as ChannelDirectoryListResponseSchema, En as UpdateCredentialInstanceBodySchema, Et as ListAppsResponseSchema, F as CreateBillingPortalRequestSchema, Fn as UploadProjectSourceManifestRequestSchema, Ft as ListProjectsResponseSchema, G as CreateProjectRequestSchema, Gn as WorkflowRunDetailResponseSchema, Gt as PresignOrgLogoRequestSchema, H as CreateOrganizationRequestSchema, Hn as WorkflowCanvasCredentialBindingsSchema, Ht as PollRunResponseSchema, I as CreateCredentialInstanceBodySchema, In as UploadProjectSourceResponseSchema, It as McpDiscoverResponseSchema, J as CredentialAssignmentListQuerySchema, Jn as WorkflowRunInputsSchema, Jt as PresignProjectSourceResponseSchema, K as CreateProjectResponseSchema, Kn as WorkflowRunHooksResponseSchema, Kt as PresignOrgLogoResponseSchema, L as CreateCredentialsRequestSchema, Ln as UpsertGatewayAttachmentBodySchema, Lt as OpenApiDiscoverResponseSchema, M as ConnectProvidersResponseSchema, Mn as UpdateProjectMemberResponseSchema, Mt as ListProjectFilesResponseSchema, N as CreateApiKeyRequestSchema, Nn as UpdateProjectRequestSchema, Nt as ListProjectMembersResponseSchema, O as CompleteProjectArtifactResponseSchema, On as UpdateOrganizationMemberRequestSchema, Ot as ListOrganizationInvitationsResponseSchema, P as CreateApiKeyResponseSchema, Pn as UpdateProjectSettingsRequestSchema, Pt as ListProjectMetricsResponseSchema, Q as CredentialConsumerListResponseSchema, Qn as WorkflowSummaryListResponseSchema, Qt as ProjectReachabilityResponseSchema, R as CreateCredentialsResponseSchema, Rn as UserAvatarPatchSchema, Rt as OrganizationSidebarBrandingPatchSchema, S as CatalogAppsPageResponseSchema, Sn as TriggerRunDetailResponseSchema, T as ChannelConnectionSchema, Tn as UpdateChannelBindingBodySchema, Tt as ListApiKeysResponseSchema, U as CreateOrganizationResponseSchema, Un as WorkflowCanvasRunSchema, Ut as PresignChatAttachmentRequestSchema, V as CreateCustomAppResponseSchema, Vn as UserPreferencesSchema, Vt as PROJECT_REACHABILITY_REQUEST_TIMEOUT_MS, W as CreateProjectArtifactResponseSchema, Wn as WorkflowCanvasSchema, Wt as PresignChatAttachmentResponseSchema, X as CredentialAssignmentRecordSchema, Xn as WorkflowRunResponseSchema, Xt as PresignUserAvatarResponseSchema, Y as CredentialAssignmentListResponseSchema, Yn as WorkflowRunListResponseSchema, Yt as PresignUserAvatarRequestSchema, Z as CredentialConsumerListQuerySchema, Zn as WorkflowSummaryDetailResponseSchema, Zt as ProjectPullStateSchema, _ as BillingUsageResponseSchema, _n as StartOAuthConnectionResultSchema, _r as resolveConnectAppSlug, _t as HistoryRunListResponseSchema, a as AgentSessionDetailResponseSchema, an as QueuedAgentPromptResponseSchema, ar as buildConnectDeeplink, at as DownloadActiveProjectArtifactResponseSchema, b as CatalogActionsPageResponseSchema, bn as TriggerDetailResponseSchema, br as slugifyAppName, bt as InviteProjectMembersRequestSchema, c as AgentSummaryListResponseSchema, cn as RecentResourceListResponseSchema, cr as detectProjectPackageManagerFromSnapshot, ct as ExecuteKeystrokeToolRequestSchema, d as AssignCredentialBodySchema, dn as SlugAvailabilityResponseSchema, dt as GetCustomAppResponseSchema, en as ProjectSettingsResponseSchema, er as WorkspaceTriggerFileSchema, et as CredentialInstanceRecordSchema, f as AutoTopupSummarySchema, fn as StartKeystrokeConnectionInputSchema, ft as GraphqlDiscoverResponseSchema, g as BillingSummaryResponseSchema, gn as StartOAuthConnectionInputSchema, gt as HistoryRunListQuerySchema, h as BillingRedirectResponseSchema, hn as StartMcpOAuthConnectionResultSchema, ht as HistoryRunDetailResponseSchema, i as AgentSessionChatStateResponseSchema, ir as WorkspaceWorkflowOverviewSchema, it as DeclineOrganizationInvitationResponseSchema, j as ConnectAuthorizeUrlResponseSchema, jn as UpdateProjectMemberRequestSchema, jt as ListProjectDeploymentsResponseSchema, k as ConfirmCheckoutRequestSchema, kn as UpdateOrganizationMemberResponseSchema, kt as ListOrganizationMembersResponseSchema, l as AgentTriggerSummaryListResponseSchema, ln as SkillSummaryDetailResponseSchema, lr as isAcceptableInstallExit, lt as GatewayAttachmentRecordSchema, m as BillingInvoiceUrlResponseSchema, mn as StartMcpOAuthConnectionInputSchema, mr as parseErrorResponse, mt as HistoryRunCancelResponseSchema, n as AcceptOrganizationInvitationResponseSchema, nn as PromptInputSchema, nr as WorkspaceTriggerOverviewSchema, nt as DOCS_QUERY_TOOL, o as AgentSessionListResponseSchema, on as QueuedRunResponseSchema, ot as DownloadActiveProjectSourceResponseSchema, p as BillingActivityResponseSchema, pn as StartKeystrokeConnectionResultSchema, pr as parseAppSlug, pt as HealthResponseSchema, q as CreateSubscriptionCheckoutRequestSchema, qn as WorkflowRunInputsPutBodySchema, qt as PresignProjectSourceRequestSchema, r as ActiveOrganizationResponseSchema, rn as PromptResponseSchema, rr as WorkspaceTriggerRunListResponseSchema, rt as DOCS_SEARCH_TOOL, s as AgentSummaryDetailResponseSchema, sr as deriveCustomAppDisplay, st as ErrorResponseSchema, t as ACTIVE_ORG_HEADER, tn as ProjectSlugAvailabilityResponseSchema, tr as WorkspaceTriggerListResponseSchema, u as AppSlugAvailabilityResponseSchema, un as SkillSummaryListResponseSchema, ur as listenPortFromPublicUrl, ut as GetCredentialResponseSchema, v as BindChannelBodySchema, vn as SubmitMarketingContactRequestSchema, vr as resolveDocsMcpUrl, vt as InviteOrganizationMembersRequestSchema, w as ChannelConnectionListResponseSchema, wn as UpdateAutoTopupRequestSchema, wt as ListAgentWorkspaceFilesResponseSchema, x as CatalogAppDetailResponseSchema, xn as TriggerListResponseSchema, xt as InviteProjectMembersResponseSchema, y as CatalogActionDetailResponseSchema, yn as SubmitTeamRequestRequestSchema, yr as resolvePublicPlatformOrigin, yt as InviteOrganizationMembersResponseSchema, z as CreateCreditsCheckoutRequestSchema, zn as UserAvatarSchema, zt as OrganizationSidebarBrandingSchema } from "./dist-BlTFBcc6.mjs";
-import { i as packProjectArtifact, n as withMcpReadClient, r as mergeFilteredArtifact, t as mapInParallelBatches } from "./dist-DJH7K67b.mjs";
-import { _ as getPlatformUrl, c as detectPackageManager, d as resolveGithubPackagesToken, f as resolvePackageManager, g as getEffectiveApiTarget, h as getConfigDir, i as isReleaseAgeBlock, l as installDependencies$1, m as getCliConfigDir, n as resolveCliRoot, o as detectManagerFromLockfile, p as createCliConfig, s as buildPlaygroundWorkspace, t as readCliVersion, u as installPlaygroundDependencies, v as getWebUrl, x as resolvePlatformUrlForWebUrl, y as DEFAULT_PLATFORM_URL } from "./version-DHhrzTCa.mjs";
+import { $ as CredentialInstanceListResponseSchema, $n as WorkspaceTriggerDetailSchema, $t as ProjectResponseSchema, A as ConfirmCheckoutResponseSchema, An as UpdateOrganizationRequestSchema, At as ListOrganizationsResponseSchema, B as CreateCustomAppRequestSchema, Bn as UserPreferencesPatchSchema, Bt as PROJECT_PULL_STATE_RELATIVE_PATH, C as ChannelAccountListResponseSchema, Cn as TriggerRunListResponseSchema, Ct as ListAgentMemoryFilesResponseSchema, D as ChannelPlatformSchema, Dn as UpdateCredentialRequestSchema, Dt as ListCredentialsResponseSchema, E as ChannelDirectoryListResponseSchema, En as UpdateCredentialInstanceBodySchema, Et as ListAppsResponseSchema, F as CreateBillingPortalRequestSchema, Fn as UploadProjectSourceManifestRequestSchema, Ft as ListProjectsResponseSchema, G as CreateProjectRequestSchema, Gn as WorkflowRunDetailResponseSchema, Gt as PresignOrgLogoRequestSchema, H as CreateOrganizationRequestSchema, Hn as WorkflowCanvasCredentialBindingsSchema, Ht as PollRunResponseSchema, I as CreateCredentialInstanceBodySchema, In as UploadProjectSourceResponseSchema, It as McpDiscoverResponseSchema, J as CredentialAssignmentListQuerySchema, Jn as WorkflowRunInputsSchema, Jt as PresignProjectSourceResponseSchema, K as CreateProjectResponseSchema, Kn as WorkflowRunHooksResponseSchema, Kt as PresignOrgLogoResponseSchema, L as CreateCredentialsRequestSchema, Ln as UpsertGatewayAttachmentBodySchema, Lt as OpenApiDiscoverResponseSchema, M as ConnectProvidersResponseSchema, Mn as UpdateProjectMemberResponseSchema, Mt as ListProjectFilesResponseSchema, N as CreateApiKeyRequestSchema, Nn as UpdateProjectRequestSchema, Nt as ListProjectMembersResponseSchema, O as CompleteProjectArtifactResponseSchema, On as UpdateOrganizationMemberRequestSchema, Ot as ListOrganizationInvitationsResponseSchema, P as CreateApiKeyResponseSchema, Pn as UpdateProjectSettingsRequestSchema, Pt as ListProjectMetricsResponseSchema, Q as CredentialConsumerListResponseSchema, Qn as WorkflowSummaryListResponseSchema, Qt as ProjectReachabilityResponseSchema, R as CreateCredentialsResponseSchema, Rn as UserAvatarPatchSchema, Rt as OrganizationSidebarBrandingPatchSchema, S as CatalogAppsPageResponseSchema, Sn as TriggerRunDetailResponseSchema, T as ChannelConnectionSchema, Tn as UpdateChannelBindingBodySchema, Tt as ListApiKeysResponseSchema, U as CreateOrganizationResponseSchema, Un as WorkflowCanvasRunSchema, Ut as PresignChatAttachmentRequestSchema, V as CreateCustomAppResponseSchema, Vn as UserPreferencesSchema, Vt as PROJECT_REACHABILITY_REQUEST_TIMEOUT_MS, W as CreateProjectArtifactResponseSchema, Wn as WorkflowCanvasSchema, Wt as PresignChatAttachmentResponseSchema, X as CredentialAssignmentRecordSchema, Xn as WorkflowRunResponseSchema, Xt as PresignUserAvatarResponseSchema, Y as CredentialAssignmentListResponseSchema, Yn as WorkflowRunListResponseSchema, Yt as PresignUserAvatarRequestSchema, Z as CredentialConsumerListQuerySchema, Zn as WorkflowSummaryDetailResponseSchema, Zt as ProjectPullStateSchema, _ as BillingUsageResponseSchema, _n as StartOAuthConnectionResultSchema, _r as resolveConnectAppSlug, _t as HistoryRunListResponseSchema, a as AgentSessionDetailResponseSchema, an as QueuedAgentPromptResponseSchema, ar as buildConnectDeeplink, at as DownloadActiveProjectArtifactResponseSchema, b as CatalogActionsPageResponseSchema, bn as TriggerDetailResponseSchema, br as slugifyAppName, bt as InviteProjectMembersRequestSchema, c as AgentSummaryListResponseSchema, cn as RecentResourceListResponseSchema, cr as detectProjectPackageManagerFromSnapshot, ct as ExecuteKeystrokeToolRequestSchema, d as AssignCredentialBodySchema, dn as SlugAvailabilityResponseSchema, dt as GetCustomAppResponseSchema, en as ProjectSettingsResponseSchema, er as WorkspaceTriggerFileSchema, et as CredentialInstanceRecordSchema, f as AutoTopupSummarySchema, fn as StartKeystrokeConnectionInputSchema, ft as GraphqlDiscoverResponseSchema, g as BillingSummaryResponseSchema, gn as StartOAuthConnectionInputSchema, gt as HistoryRunListQuerySchema, h as BillingRedirectResponseSchema, hn as StartMcpOAuthConnectionResultSchema, ht as HistoryRunDetailResponseSchema, i as AgentSessionChatStateResponseSchema, ir as WorkspaceWorkflowOverviewSchema, it as DeclineOrganizationInvitationResponseSchema, j as ConnectAuthorizeUrlResponseSchema, jn as UpdateProjectMemberRequestSchema, jt as ListProjectDeploymentsResponseSchema, k as ConfirmCheckoutRequestSchema, kn as UpdateOrganizationMemberResponseSchema, kt as ListOrganizationMembersResponseSchema, l as AgentTriggerSummaryListResponseSchema, ln as SkillSummaryDetailResponseSchema, lr as isAcceptableInstallExit, lt as GatewayAttachmentRecordSchema, m as BillingInvoiceUrlResponseSchema, mn as StartMcpOAuthConnectionInputSchema, mr as parseErrorResponse, mt as HistoryRunCancelResponseSchema, n as AcceptOrganizationInvitationResponseSchema, nn as PromptInputSchema, nr as WorkspaceTriggerOverviewSchema, nt as DOCS_QUERY_TOOL, o as AgentSessionListResponseSchema, on as QueuedRunResponseSchema, ot as DownloadActiveProjectSourceResponseSchema, p as BillingActivityResponseSchema, pn as StartKeystrokeConnectionResultSchema, pr as parseAppSlug, pt as HealthResponseSchema, q as CreateSubscriptionCheckoutRequestSchema, qn as WorkflowRunInputsPutBodySchema, qt as PresignProjectSourceRequestSchema, r as ActiveOrganizationResponseSchema, rn as PromptResponseSchema, rr as WorkspaceTriggerRunListResponseSchema, rt as DOCS_SEARCH_TOOL, s as AgentSummaryDetailResponseSchema, sr as deriveCustomAppDisplay, st as ErrorResponseSchema, t as ACTIVE_ORG_HEADER, tn as ProjectSlugAvailabilityResponseSchema, tr as WorkspaceTriggerListResponseSchema, u as AppSlugAvailabilityResponseSchema, un as SkillSummaryListResponseSchema, ur as listenPortFromPublicUrl, ut as GetCredentialResponseSchema, v as BindChannelBodySchema, vn as SubmitMarketingContactRequestSchema, vr as resolveDocsMcpUrl, vt as InviteOrganizationMembersRequestSchema, w as ChannelConnectionListResponseSchema, wn as UpdateAutoTopupRequestSchema, wt as ListAgentWorkspaceFilesResponseSchema, x as CatalogAppDetailResponseSchema, xn as TriggerListResponseSchema, xt as InviteProjectMembersResponseSchema, y as CatalogActionDetailResponseSchema, yn as SubmitTeamRequestRequestSchema, yr as resolvePublicPlatformOrigin, yt as InviteOrganizationMembersResponseSchema, z as CreateCreditsCheckoutRequestSchema, zn as UserAvatarSchema, zt as OrganizationSidebarBrandingSchema } from "./dist-CnAsi0KI.mjs";
+import { i as packProjectArtifact, n as withMcpReadClient, r as mergeFilteredArtifact, t as mapInParallelBatches } from "./dist-qm-t5iv6.mjs";
+import { _ as getPlatformUrl, c as detectPackageManager, d as resolveGithubPackagesToken, f as resolvePackageManager, g as getEffectiveApiTarget, h as getConfigDir, i as isReleaseAgeBlock, l as installDependencies$1, m as getCliConfigDir, n as resolveCliRoot, o as detectManagerFromLockfile, p as createCliConfig, s as buildPlaygroundWorkspace, t as readCliVersion, u as installPlaygroundDependencies, v as getWebUrl, x as resolvePlatformUrlForWebUrl, y as DEFAULT_PLATFORM_URL } from "./version-DlVvrcdK.mjs";
 import { createRequire } from "node:module";
 import { Command } from "commander";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { Entry } from "@napi-rs/keyring";
-import { confirm, input, select } from "@inquirer/prompts";
 import { existsSync, lstatSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { access, lstat, mkdir, readFile, readdir, rm, stat, symlink, writeFile } from "node:fs/promises";
 import { spawn, spawnSync } from "node:child_process";
 import { pathToFileURL } from "node:url";
+import { confirm, input } from "@inquirer/prompts";
 //#region ../../node_modules/.pnpm/ky@2.0.2/node_modules/ky/distribution/errors/KyError.js
 /**
 Base class for all Ky-specific errors. `HTTPError`, `NetworkError`, `TimeoutError`, and `ForceRetryError` extend this class.
@@ -3360,12 +3360,29 @@ function resolveCliAuth(config) {
 	};
 }
 //#endregion
+//#region src/target-options.ts
+let targetOptions = {};
+let resolvedOrganizationId;
+function setCliTargetOptions(options) {
+	targetOptions = options;
+	resolvedOrganizationId = void 0;
+}
+function getCliTargetOptions() {
+	return targetOptions;
+}
+function setResolvedOrganizationId(organizationId) {
+	resolvedOrganizationId = organizationId;
+}
+function getResolvedOrganizationId() {
+	return resolvedOrganizationId;
+}
+//#endregion
 //#region src/client.ts
 function createCliClient(config, options) {
 	return createKeystrokeClient({
 		baseUrl: options.baseUrl,
 		auth: resolveCliAuth(config),
-		getActiveOrganizationId: options.platform ? () => config.get("activeOrganizationId") ?? null : void 0
+		getActiveOrganizationId: options.platform ? () => options.organizationId ?? getResolvedOrganizationId() ?? null : void 0
 	});
 }
 //#endregion
@@ -4793,6 +4810,7 @@ function createPlatformClient(options) {
 	const auth = options.auth ?? { type: "none" };
 	const base = normalizeBaseUrl(options.baseUrl);
 	let activeOrganizationId = options.getActiveOrganizationId?.() ?? null;
+	const resolveActiveOrganizationId = () => options.getActiveOrganizationId?.() ?? activeOrganizationId;
 	const setActiveOrganizationId = (organizationId) => {
 		activeOrganizationId = organizationId;
 		options.onActiveOrganizationChange?.(organizationId);
@@ -4802,7 +4820,7 @@ function createPlatformClient(options) {
 		credentials: "omit",
 		hooks: {
 			beforeRequest: [({ request }) => {
-				applyActiveOrganizationHeader(request, activeOrganizationId);
+				applyActiveOrganizationHeader(request, resolveActiveOrganizationId());
 				return applyAuthHeaders(request, auth);
 			}],
 			afterResponse: [async ({ request, response, retryCount }) => {
@@ -4825,7 +4843,7 @@ function createPlatformClient(options) {
 		health: createHealthResource(http),
 		organizations: createOrganizationsResource(http, {
 			onActiveOrganizationChange: setActiveOrganizationId,
-			getActiveOrganizationId: () => activeOrganizationId
+			getActiveOrganizationId: resolveActiveOrganizationId
 		}),
 		projects: createProjectsResource(http),
 		artifacts: createArtifactsResource(http),
@@ -4849,10 +4867,10 @@ function createPlatformClient(options) {
 		recents: createRecentsResource(http),
 		userPreferences: createUserPreferencesResource(http),
 		userAvatar: createUserAvatarResource(http),
-		organizationSidebarBranding: createOrganizationSidebarBrandingResource(http, { getActiveOrganizationId: () => activeOrganizationId }),
+		organizationSidebarBranding: createOrganizationSidebarBrandingResource(http, { getActiveOrganizationId: resolveActiveOrganizationId }),
 		teamRequests: createTeamRequestsResource(http),
 		marketingContact: createMarketingContactResource(http),
-		getActiveOrganizationId: () => activeOrganizationId,
+		getActiveOrganizationId: resolveActiveOrganizationId,
 		setActiveOrganizationId
 	};
 }
@@ -4866,17 +4884,13 @@ function toPlatformAuth(auth) {
 	};
 	return { type: "none" };
 }
-function createCliPlatformClient(config) {
+function createCliPlatformClient(config, options = {}) {
 	const platformUrl = getPlatformUrl(config);
 	return createPlatformClient({
 		baseUrl: platformUrl,
 		auth: toPlatformAuth(resolveCliAuth(config)),
 		refreshBearerToken: () => getCliJwt(platformUrl, true),
-		getActiveOrganizationId: () => config.get("activeOrganizationId") ?? null,
-		onActiveOrganizationChange: (organizationId) => {
-			if (organizationId) config.set("activeOrganizationId", organizationId);
-			else config.delete("activeOrganizationId");
-		}
+		getActiveOrganizationId: () => options.organizationId === void 0 ? getResolvedOrganizationId() ?? null : options.organizationId
 	});
 }
 //#endregion
@@ -4908,71 +4922,9 @@ function resolveOrganizationRef(organizations, ref) {
 }
 //#endregion
 //#region src/organization/active-organization.ts
-function formatOrganization(membership) {
-	return `${membership.organization.name} (${membership.role})`;
-}
 async function listOrganizations(config) {
 	return createCliPlatformClient(config).organizations.list();
 }
-async function activateOrganization(config, organizationId) {
-	const platform = createCliPlatformClient(config);
-	const membership = await platform.organizations.setActive({ 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) {
-		const names = organizations.map((entry) => entry.organization.slug).join(", ");
-		throw new Error(`Multiple organizations found. Run \`keystroke config use org <slug>\`. Options: ${names}`);
-	}
-	return activateOrganization(config, await select({
-		message: "Select an organization",
-		choices: organizations.map((entry) => ({
-			name: formatOrganization(entry),
-			value: entry.organization.id
-		}))
-	}));
-}
-async function selectActiveOrganization(config, options = {}) {
-	const organizations = await listOrganizations(config);
-	if (organizations.length === 0) throw new Error(`No organization found — create one at ${getWebUrl(config)}`);
-	if (organizations.length === 1) return activateOrganization(config, organizations[0].organization.id);
-	return pickOrganization(config, organizations, options.organizationRef ?? options.organizationId);
-}
-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)}`);
-	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 && organizations.some((entry) => entry.organization.id === storedId)) {
-		await activateOrganization(config, storedId);
-		return;
-	}
-	if (organizations.length === 1) {
-		await activateOrganization(config, organizations[0].organization.id);
-		return;
-	}
-	throw new Error("No active organization. Run `keystroke auth login` or `keystroke config use org`.");
-}
 //#endregion
 //#region src/project/resolve-keystroke-config-root.ts
 const KEYSTROKE_CONFIG$2 = "keystroke.config.ts";
@@ -4987,6 +4939,71 @@ function resolveKeystrokeConfigRoot(fromDir = process.cwd()) {
 	return null;
 }
 //#endregion
+//#region src/project/read-project-config.ts
+const KEYSTROKE_CONFIG$1 = "keystroke.config.ts";
+/** Remove line and block comments before scanning config literals. */
+function stripConfigComments(source) {
+	return source.replace(/\/\/[^\n]*/g, "").replace(/\/\*[\s\S]*?\*\//g, "");
+}
+/** Mask comments while preserving string length so match indices stay aligned. */
+function stripConfigCommentsPreservingLength(source) {
+	return source.replace(/\/\/[^\n]*/g, (match) => " ".repeat(match.length)).replace(/\/\*[\s\S]*?\*\//g, (match) => " ".repeat(match.length));
+}
+function readStringLiteral(source, key) {
+	const stripped = stripConfigComments(source);
+	const pattern = new RegExp(`\\b${key}\\s*:\\s*(['"])([^'"]*)\\1`);
+	return stripped.match(pattern)?.[2]?.trim() || void 0;
+}
+function parseLinkedProjectConfig(source) {
+	const project = readStringLiteral(source, "project");
+	const organization = readStringLiteral(source, "organization");
+	return {
+		...project ? { project } : {},
+		...organization ? { organization } : {}
+	};
+}
+/** Read optional project/organization slugs from keystroke.config.ts without executing it. */
+function readLinkedProjectConfig(fromDir = process.cwd()) {
+	const root = resolveKeystrokeConfigRoot(fromDir);
+	if (!root) return {};
+	return parseLinkedProjectConfig(readFileSync(join(root, KEYSTROKE_CONFIG$1), "utf8"));
+}
+//#endregion
+//#region src/target-hints.ts
+function missingOrganizationRefMessage() {
+	return "No organization selected. Pass `--organization <slug>` or set `organization` in keystroke.config.ts (via `keystroke projects link --project <slug>`).";
+}
+function missingProjectRefMessage() {
+	return "No project selected. Pass `--project <slug>` or set `project` in keystroke.config.ts (via `keystroke projects link --project <slug>`).";
+}
+function missingOrganizationRefError() {
+	return new Error(missingOrganizationRefMessage());
+}
+function missingProjectRefError() {
+	return new Error(missingProjectRefMessage());
+}
+//#endregion
+//#region src/resolve-organization-target.ts
+/**
+* The active organization reference for the current command: the explicit global
+* `--organization` flag when set, otherwise the `organization` recorded in
+* keystroke.config.ts. Single source of truth for "which organization" across
+* every CLI command — commands should never read the flag or linked config directly.
+*/
+function resolveActiveOrganizationRef(fromDir = process.cwd()) {
+	return (getCliTargetOptions().organizationRef ?? readLinkedProjectConfig(fromDir).organization)?.trim() || void 0;
+}
+/** Resolve the active organization slug to a membership and cache its id for platform requests. */
+async function resolveActiveOrganization(config, fromDir = process.cwd()) {
+	const ref = resolveActiveOrganizationRef(fromDir);
+	if (!ref) throw missingOrganizationRefError();
+	const organizations = await listOrganizations(config);
+	if (organizations.length === 0) throw new Error(`No organization found — create one at ${getWebUrl(config)}`);
+	const membership = resolveOrganizationRef(organizations, ref);
+	setResolvedOrganizationId(membership.organization.id);
+	return membership;
+}
+//#endregion
 //#region src/project/resolve-project-root.ts
 function resolveProjectRoot(fromDir = process.cwd()) {
 	const root = resolveKeystrokeConfigRoot(fromDir);
@@ -5060,71 +5077,6 @@ function readDevSession(configDir = getCliConfigDir()) {
 	}
 }
 //#endregion
-//#region src/project/read-project-config.ts
-const KEYSTROKE_CONFIG$1 = "keystroke.config.ts";
-/** Remove line and block comments before scanning config literals. */
-function stripConfigComments(source) {
-	return source.replace(/\/\/[^\n]*/g, "").replace(/\/\*[\s\S]*?\*\//g, "");
-}
-/** Mask comments while preserving string length so match indices stay aligned. */
-function stripConfigCommentsPreservingLength(source) {
-	return source.replace(/\/\/[^\n]*/g, (match) => " ".repeat(match.length)).replace(/\/\*[\s\S]*?\*\//g, (match) => " ".repeat(match.length));
-}
-function readStringLiteral(source, key) {
-	const stripped = stripConfigComments(source);
-	const pattern = new RegExp(`\\b${key}\\s*:\\s*(['"])([^'"]*)\\1`);
-	return stripped.match(pattern)?.[2]?.trim() || void 0;
-}
-function parseLinkedProjectConfig(source) {
-	const project = readStringLiteral(source, "project");
-	const organization = readStringLiteral(source, "organization");
-	return {
-		...project ? { project } : {},
-		...organization ? { organization } : {}
-	};
-}
-/** Read optional project/organization slugs from keystroke.config.ts without executing it. */
-function readLinkedProjectConfig(fromDir = process.cwd()) {
-	const root = resolveKeystrokeConfigRoot(fromDir);
-	if (!root) return {};
-	return parseLinkedProjectConfig(readFileSync(join(root, KEYSTROKE_CONFIG$1), "utf8"));
-}
-//#endregion
-//#region src/target-options.ts
-let targetOptions = {};
-function setCliTargetOptions(options) {
-	targetOptions = options;
-}
-function getCliTargetOptions() {
-	return targetOptions;
-}
-//#endregion
-//#region src/resolve-project-target.ts
-/**
-* The active project reference for the current command: the explicit global
-* `--project` flag when set, otherwise the `project` recorded in
-* keystroke.config.ts. Single source of truth for "which project" across every
-* CLI command — commands should never read the flag or linked config directly.
-*/
-function resolveActiveProjectRef(fromDir = process.cwd()) {
-	return (getCliTargetOptions().projectId ?? readLinkedProjectConfig(fromDir).project)?.trim() || void 0;
-}
-/** Activate the organization slug from keystroke.config.ts when present. */
-async function ensureLinkedOrganization(config, fromDir = process.cwd()) {
-	const linked = readLinkedProjectConfig(fromDir);
-	if (!linked.organization) return;
-	await activateOrganization(config, resolveOrganizationRef(await listOrganizations(config), linked.organization).organization.id);
-}
-async function resolveActiveProject(config, platform, fromDir = process.cwd()) {
-	const ref = resolveActiveProjectRef(fromDir);
-	if (!ref) return;
-	await ensureLinkedOrganization(config, fromDir);
-	return resolveProjectRef(platform ?? createCliPlatformClient(config), ref);
-}
-async function resolveActiveProjectId(config, fromDir = process.cwd()) {
-	return (await resolveActiveProject(config, void 0, fromDir))?.id;
-}
-//#endregion
 //#region src/resolve-api-target.ts
 /** Standalone local server default project id — keep in sync with @keystrokehq/database. */
 const DEFAULT_LOCAL_PROJECT_ID = "default";
@@ -5157,7 +5109,7 @@ function resolveOrgPlatformTarget(config) {
 	};
 }
 async function resolvePlatformTarget(config, projectRef) {
-	await ensureLinkedOrganization(config);
+	await resolveActiveOrganization(config);
 	const platform = createCliPlatformClient(config);
 	let project;
 	try {
@@ -5186,7 +5138,7 @@ async function resolveApiTarget(config, options = {}) {
 	if (getEffectiveApiTarget(config) === "local") return resolveLocalTarget(options);
 	if (!options.projectScoped) return resolveOrgPlatformTarget(config);
 	const projectRef = options.projectId ?? readLinkedProjectConfig().project;
-	if (!projectRef) throw new Error("No project selected. Pass `--project <slug>` or run `keystroke projects link --project <slug>`.");
+	if (!projectRef) throw missingProjectRefError();
 	return resolvePlatformTarget(config, projectRef);
 }
 //#endregion
@@ -5284,7 +5236,7 @@ function formatCliError(error, fallback, context) {
 //#region src/errors/run-command.ts
 /**
 * Run a command that needs no project/org target or auth (e.g. public docs).
-* Builds config and formats errors, but skips `resolveApiTarget` / `ensureActiveOrganization`,
+* Builds config and formats errors, but skips `resolveApiTarget` / organization resolution,
 * so it works logged-out from any directory.
 */
 async function runStandaloneCliCommand(fallback, fn, errorContext) {
@@ -5311,12 +5263,14 @@ async function runCliCommand(fallback, fn, errorContext, targetOptions = {}) {
 		...getCliTargetOptions(),
 		...targetOptions
 	});
-	if (target.mode === "platform") await ensureActiveOrganization(config);
+	let organizationId;
+	if (target.mode === "platform") organizationId = (await resolveActiveOrganization(config)).organization.id;
 	const ctx = {
 		config,
 		client: createCliClient(config, {
 			baseUrl: target.baseUrl,
-			platform: target.mode === "platform"
+			platform: target.mode === "platform",
+			organizationId
 		}),
 		serverUrl: target.baseUrl,
 		webUrl: getWebUrl(config),
@@ -5354,9 +5308,28 @@ function parseJsonOption(value, flag) {
 //#endregion
 //#region src/organization/require-admin-role.ts
 async function requireAdminRole(config) {
-	await ensureActiveOrganization(config);
-	const active = await createCliPlatformClient(config).organizations.getActive();
-	if (!active || active.role !== "owner" && active.role !== "admin") throw new Error("--admin requires org owner or admin");
+	const membership = await resolveActiveOrganization(config);
+	if (membership.role !== "owner" && membership.role !== "admin") throw new Error("--admin requires org owner or admin");
+}
+//#endregion
+//#region src/resolve-project-target.ts
+/**
+* The active project reference for the current command: the explicit global
+* `--project` flag when set, otherwise the `project` recorded in
+* keystroke.config.ts. Single source of truth for "which project" across every
+* CLI command — commands should never read the flag or linked config directly.
+*/
+function resolveActiveProjectRef(fromDir = process.cwd()) {
+	return (getCliTargetOptions().projectId ?? readLinkedProjectConfig(fromDir).project)?.trim() || void 0;
+}
+async function resolveActiveProject(config, platform, fromDir = process.cwd()) {
+	const ref = resolveActiveProjectRef(fromDir);
+	if (!ref) return;
+	await resolveActiveOrganization(config, fromDir);
+	return resolveProjectRef(platform ?? createCliPlatformClient(config), ref);
+}
+async function resolveActiveProjectId(config, fromDir = process.cwd()) {
+	return (await resolveActiveProject(config, void 0, fromDir))?.id;
 }
 //#endregion
 //#region src/commands/agents/list.ts
@@ -5364,7 +5337,7 @@ function registerAgentListCommand(agent) {
 	agent.command("list").description("List agents in the active organization").option("--admin", "List all org resources (org owner or admin only)").action((options) => runCliCommand("List agents failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		if (options.admin) await requireAdminRole(config);
 		const projectId = await resolveActiveProjectId(config);
 		const result = await client.agents.list({
@@ -5387,13 +5360,9 @@ function registerAgentPromptCommand(agent) {
 }
 //#endregion
 //#region src/commands/projects/run-project.ts
-async function withActivePlatformClient(config, fn, fromDir = process.cwd(), applyLinkedOrganization = true) {
-	if (applyLinkedOrganization) await ensureLinkedOrganization(config, fromDir);
-	const platform = createCliPlatformClient(config);
-	let active = await platform.organizations.getActive();
-	if (!active) active = await selectActiveOrganization(config);
-	platform.setActiveOrganizationId(active.organization.id);
-	await fn(platform);
+async function withActivePlatformClient(config, fn, fromDir = process.cwd()) {
+	await resolveActiveOrganization(config, fromDir);
+	await fn(createCliPlatformClient(config));
 }
 function writeInactiveDeployHints(projects) {
 	const bin = cliBinaryName();
@@ -5574,15 +5543,49 @@ function actionExportName(app, tool) {
 function actionImportHint(app, tool) {
 	return `import { ${actionExportName(app, tool)} } from "@keystrokehq/${app.toLowerCase()}/actions"`;
 }
+function placeholderValue(prop) {
+	if (prop.default !== void 0) return JSON.stringify(prop.default);
+	if (prop.enum?.length) return JSON.stringify(prop.enum[0]);
+	switch (prop.type) {
+		case "number":
+		case "integer": return "0";
+		case "boolean": return "false";
+		case "array": return "[]";
+		case "object": return "{}";
+		default: return "\"\"";
+	}
+}
+function propertyKey(key) {
+	return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(key) ? key : JSON.stringify(key);
+}
+/**
+* Example typed `run()` call built from the action's input JSON Schema. Lists fields the
+* call type requires — schema-required fields plus defaulted ones (a `.default()` input
+* is still required at the `run()` call site) — and counts the rest as optional.
+*/
+function actionRunSnippet(app, tool, inputParameters) {
+	const schema = inputParameters ?? {};
+	const properties = schema.properties ?? {};
+	const required = new Set(schema.required ?? []);
+	const included = Object.entries(properties).filter(([key, prop]) => required.has(key) || prop.default !== void 0);
+	const optionalCount = Object.keys(properties).length - included.length;
+	const fieldLines = included.map(([key, prop]) => {
+		const comments = [prop.type ?? "unknown", prop.default !== void 0 ? "has default" : ""];
+		return `  ${propertyKey(key)}: ${placeholderValue(prop)}, // ${comments.filter(Boolean).join(", ")}`;
+	});
+	if (optionalCount > 0) fieldLines.push(`  // +${optionalCount} optional field${optionalCount === 1 ? "" : "s"}`);
+	const args = fieldLines.length > 0 ? `{\n${fieldLines.join("\n")}\n}` : "{}";
+	return `${actionImportHint(app, tool)};\n\nconst result = await ${actionExportName(app, tool)}.run(${args});`;
+}
 /** Next-step hint printed after listing an app's actions. */
 function listActionsHint(app) {
 	const bin = cliBinaryName();
 	return `\nNext steps:\n  Inspect a tool:  ${bin} apps actions get ${app} <TOOL_SLUG>\n  Run a tool:      ${bin} apps execute ${app} <TOOL_SLUG> --input '{...}'\n`;
 }
 /** Next-step hint printed after showing one action's schema. */
-function showActionHint(app, tool) {
+function showActionHint(app, tool, inputParameters) {
 	const bin = cliBinaryName();
-	return `\nNext steps:\n  Run ad-hoc:    ${bin} apps execute ${app} ${tool} --input '{...}'\n  Use in code:   ${actionImportHint(app, tool)}\n  Not connected? ${bin} connect ${app}\n`;
+	return `\nNext steps:\n  Run ad-hoc:    ${bin} apps execute ${app} ${tool} --input '{...}'\n  Not connected? ${bin} connect ${app}\n\nUse in code:\n\n${actionRunSnippet(app, tool, inputParameters)}\n`;
 }
 //#endregion
 //#region src/commands/apps/run-app-catalog.ts
@@ -5628,7 +5631,7 @@ function registerAppActionsCommands(app) {
 	actions.command("list").description("List or search a catalog app's actions").argument("[slug]", "App slug (omit for cross-app search with --search)").option("--search <query>", "Search actions within the app or across all apps").option("--limit <n>", "Page size", (value) => Number.parseInt(value, 10)).option("--cursor <cursor>", "Pagination cursor").action((slug, options) => runCliCommand("App actions list failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		const result = await runAppActions(client, {
 			slug,
 			...options
@@ -5639,10 +5642,10 @@ function registerAppActionsCommands(app) {
 	actions.command("get").description("Get a catalog action schema, plus how to run and import it").argument("<app>", "App slug (e.g. github)").argument("<tool>", "Tool slug (e.g. github_create_an_issue)").action((appSlug, toolSlug) => runCliCommand("App action get failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		const result = await runAppAction(client, toolSlug);
 		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-		process.stderr.write(showActionHint(appSlug.trim().toLowerCase(), toolSlug.trim().toUpperCase()));
+		process.stderr.write(showActionHint(appSlug.trim().toLowerCase(), toolSlug.trim().toUpperCase(), result.inputParameters));
 	}, void 0, { orgScoped: true }));
 }
 //#endregion
@@ -5761,7 +5764,7 @@ function registerAppCreateCommand(app) {
 	app.command("create").description("Create a custom org app").option("--name <name>", "App display name").option("--slug <slug>", "App slug segment (defaults from name)").option("--description <description>", "App description").option("--field <field>", "Credential field as key, key:secret, key:optional, or key:secret:optional (repeatable)", collectValues$1, []).option("--mcp <url>", "Create from an MCP server URL (auto-detect auth)").option("--openapi <url>", "Create from an OpenAPI spec URL (auto-detect auth)").option("--graphql <url>", "Create from a GraphQL endpoint URL (auto-detect auth)").option("--auth <kind>", "Override detected auth: oauth or api_key (MCP only)").option("--preview", "Show the request that would be created without creating").action((options) => runCliCommand("Create app failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		const discovery = resolveDiscoverSource(options);
 		if (discovery) {
 			const result = await runAppCreateFromUrl(client, {
@@ -5837,7 +5840,7 @@ Examples:
 `).action((appSlug, toolSlug, options) => runCliCommand("App execute failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		const input = parseJsonOption(options.input, "--input");
 		const project = await resolveActiveProject(config, client);
 		const result = await runAppExecute(client, appSlug, toolSlug, {
@@ -5858,7 +5861,7 @@ function registerAppGetCommand(app) {
 	app.command("get").description("Get a Composio app from the live catalog").argument("<slug>", "App slug").action((slug) => runCliCommand("App get failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		const result = await runAppShow(client, slug);
 		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
 	}, void 0, { orgScoped: true }));
@@ -5874,7 +5877,7 @@ function registerAppListCommand(app) {
 	app.command("list").description("List connectable apps in the active organization").action(() => runCliCommand("List apps failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		const apps = await runAppList(client);
 		process.stdout.write(`${JSON.stringify(apps, null, 2)}\n`);
 	}, void 0, { orgScoped: true }));
@@ -5885,7 +5888,7 @@ function registerAppSearchCommand(app) {
 	app.command("search").description("Search the Composio app catalog (live)").argument("<query>", "Search query").option("--category <category>", "Filter by category").option("--limit <n>", "Page size", (value) => Number.parseInt(value, 10)).option("--cursor <cursor>", "Pagination cursor").action((query, options) => runCliCommand("App search failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		const result = await runAppSearch(client, query, options);
 		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
 	}, void 0, { orgScoped: true }));
@@ -5941,7 +5944,7 @@ function registerAppSyncCommand(app) {
 	app.command("sync").description("Sync a custom app credential template into src/apps/<name>/app.ts").argument("<slug>", "App slug, e.g. acme/internal-api").option("--dir <dir>", "Project root (defaults to cwd)").action((slug, options) => runCliCommand("Sync app failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		const result = await runAppSync({
 			client,
 			slug,
@@ -5993,15 +5996,11 @@ async function runConnect(options) {
 function registerConnectCommand(program) {
 	program.command("connect <slug>").description("Open the web app to connect an integration by catalog slug").option("--print-url", "Print the connect URL and exit without opening the browser").action((slug, options) => runCliCommand("Connect failed", async () => {
 		const config = createCliConfig();
-		await ensureActiveOrganization(config);
-		const organizations = await listOrganizations(config);
-		const activeOrganizationId = config.get("activeOrganizationId");
-		const activeOrg = organizations.find((entry) => entry.organization.id === activeOrganizationId);
-		if (!activeOrg) throw new Error("No active organization. Run `keystroke auth login` or `keystroke config use org`.");
+		const membership = await resolveActiveOrganization(config);
 		await runConnect({
 			platform: createCliPlatformClient(config),
 			webUrl: getWebUrl(config),
-			orgSlug: activeOrg.organization.slug,
+			orgSlug: membership.organization.slug,
 			slug,
 			printUrl: options.printUrl
 		});
@@ -6470,7 +6469,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 (overrides browser default)").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)").action(async (options) => {
 		const config = createCliConfig();
 		const { webUrl, platformUrl } = resolveAuthLoginTargets(options, config);
 		config.set("webUrl", webUrl);
@@ -6483,12 +6482,8 @@ function registerAuthLoginCommand(auth) {
 			});
 			setAccessToken(platformUrl, result.accessToken);
 			const user = await getSessionWithBearer(platformUrl, result.accessToken);
-			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`);
+			if (user) process.stdout.write(`Logged in as ${user.name} (${user.email})\n`);
+			else process.stdout.write(`Logged in to ${webUrl}\n`);
 		} catch (error) {
 			process.stderr.write(`${formatCliError(error, "Login failed", {
 				webUrl,
@@ -6532,14 +6527,15 @@ function registerAuthStatusCommand(auth) {
 		try {
 			const user = await getSessionWithBearer(platformUrl, token);
 			const organizations = user ? await listOrganizations(config).catch(() => []) : [];
-			const activeOrganizationId = config.get("activeOrganizationId");
-			const activeOrganization = activeOrganizationId ? organizations.find((entry) => entry.organization.id === activeOrganizationId) : void 0;
 			process.stdout.write(`${JSON.stringify({
 				authenticated: user !== null,
 				webUrl,
 				user,
-				activeOrganizationId: activeOrganizationId ?? null,
-				activeOrganization: activeOrganization?.organization.name ?? null
+				organizations: organizations.map((entry) => ({
+					slug: entry.organization.slug,
+					name: entry.organization.name,
+					role: entry.role
+				}))
 			})}\n`);
 			if (!user) process.exitCode = 1;
 		} catch (error) {
@@ -6654,7 +6650,7 @@ function registerBuildCommand(program) {
 		try {
 			const root = resolveProjectRoot(options.dir);
 			ensureSdkCurrent(root);
-			const { buildApp } = await import("./dist-ID6Kg1Wi.mjs");
+			const { buildApp } = await import("./dist-DqFY1hVs.mjs");
 			await buildApp({ root });
 			process.stdout.write(`Built ${root}\n`);
 		} catch (error) {
@@ -6777,7 +6773,7 @@ async function sleep(ms) {
 }
 async function buildDeployArchive(client, root, projectId, filter) {
 	if (filter?.length) {
-		const { buildFilteredApp } = await import("./dist-ID6Kg1Wi.mjs");
+		const { buildFilteredApp } = await import("./dist-DqFY1hVs.mjs");
 		const filtered = await buildFilteredApp({
 			root,
 			filter,
@@ -6799,7 +6795,7 @@ async function buildDeployArchive(client, root, projectId, filter) {
 			sourceFiles: filtered.sourceFiles
 		};
 	}
-	const { buildApp } = await import("./dist-ID6Kg1Wi.mjs");
+	const { buildApp } = await import("./dist-DqFY1hVs.mjs");
 	const { sourceFiles } = await buildApp({
 		root,
 		collectSources: true,
@@ -6817,11 +6813,8 @@ async function runDeploy(options) {
 	if (await runLint(root) !== 0) throw new Error("lint failed");
 	if (await runTypecheck(root) !== 0) throw new Error("typecheck failed");
 	const config = createCliConfig();
+	await resolveActiveOrganization(config, root);
 	const client = createCliPlatformClient(config);
-	await ensureLinkedOrganization(config, root);
-	let active = await client.organizations.getActive();
-	if (!active) active = await selectActiveOrganization(config);
-	client.setActiveOrganizationId(active.organization.id);
 	const project = await client.projects.get(options.projectId);
 	const { archive, sourceFiles } = await buildDeployArchive(client, root, project.id, options.filter);
 	const created = await client.artifacts.create(project.id);
@@ -6859,7 +6852,7 @@ function registerDeployCommand(program) {
 			config = createCliConfig();
 			const root = resolveProjectRoot(options.dir);
 			const projectId = await resolveActiveProjectId(config, root);
-			if (!projectId) throw new Error("Usage: keystroke deploy --project <slug> (or run `keystroke projects link --project <slug>`)");
+			if (!projectId) throw missingProjectRefError();
 			await runDeploy({
 				dir: options.dir,
 				projectId,
@@ -6924,7 +6917,7 @@ function runtimeChildEnv(parentEnv, overrides) {
 //#region src/project/bootstrap-run.ts
 /** Node args + env for `@keystrokehq/build` bootstrap (shared by start + dev). */
 async function resolveBootstrapRun(options) {
-	const { resolveRuntimeBuildArtifact } = await import("./dist-ID6Kg1Wi.mjs");
+	const { resolveRuntimeBuildArtifact } = await import("./dist-DqFY1hVs.mjs");
 	const loader = pathToFileURL(resolveRuntimeBuildArtifact(options.runtimeNodeModules, "dist/runtime-loader.mjs")).href;
 	const bootstrap = resolveRuntimeBuildArtifact(options.runtimeNodeModules, "dist/standalone-bootstrap.mjs");
 	const args = [`--import=${loader}`];
@@ -7073,7 +7066,7 @@ async function runDev(options) {
 	process.on("SIGINT", shutdown);
 	process.on("SIGTERM", shutdown);
 	try {
-		const { watchApp } = await import("./dist-ID6Kg1Wi.mjs");
+		const { watchApp } = await import("./dist-DqFY1hVs.mjs");
 		await watchApp({
 			root,
 			clean: false,
@@ -7651,8 +7644,6 @@ async function runOrganizationLeave(config) {
 	if (!user) throw new Error("Session expired. Run `keystroke auth login` again.");
 	await withActivePlatformClient(config, async (platform) => {
 		await platform.members.removeOrganizationMember(user.id);
-		platform.setActiveOrganizationId(null);
-		config.delete("activeOrganizationId");
 		process.stdout.write(`${JSON.stringify({ left: user.id }, null, 2)}\n`);
 	});
 }
@@ -7736,13 +7727,13 @@ async function runProjectLink(config, projectRef, fromDir = process.cwd()) {
 			organization: membership.organization.slug
 		}, fromDir);
 		process.stdout.write(`Linked ${configPath} to ${membership.organization.slug}/${formatProjectLabel(project)}\nDeploy with: ${cliBinaryName()} deploy\n`);
-	}, fromDir, false);
+	}, fromDir);
 }
 //#endregion
 //#region src/commands/projects/run-project-members.ts
 async function resolveMembersProject(platform) {
 	const ref = resolveActiveProjectRef();
-	if (!ref) throw new Error("Usage: keystroke --project <slug> project members <command>");
+	if (!ref) throw missingProjectRefError();
 	return resolveProjectRef(platform, ref);
 }
 async function runProjectMembersList(config) {
@@ -7849,7 +7840,7 @@ function registerProjectMembersCommand(project) {
 //#region src/commands/projects/run-project-settings.ts
 async function resolveSettingsProject(platform) {
 	const ref = resolveActiveProjectRef();
-	if (!ref) throw new Error("Usage: keystroke --project <slug> project settings <command>");
+	if (!ref) throw missingProjectRefError();
 	return resolveProjectRef(platform, ref);
 }
 async function runProjectSettingsGet(config) {
@@ -7944,7 +7935,7 @@ function registerProjectsCommand(program) {
 		const config = createCliConfig();
 		try {
 			const projectRef = resolveActiveProjectRef();
-			if (!projectRef) throw new Error("Usage: keystroke projects deployments list --project <slug> (or run `keystroke projects link`)");
+			if (!projectRef) throw missingProjectRefError();
 			await runProjectDeploymentsList(config, { projectRef });
 		} catch (error) {
 			process.stderr.write(`${formatCliError(error, "List deployments failed", {
@@ -7958,7 +7949,7 @@ function registerProjectsCommand(program) {
 		const config = createCliConfig();
 		try {
 			const projectRef = resolveActiveProjectRef(options.dir);
-			if (!projectRef) throw new Error("Usage: keystroke projects link --project <slug> (see: keystroke projects list)");
+			if (!projectRef) throw missingProjectRefError();
 			await runProjectLink(config, projectRef, options.dir);
 		} catch (error) {
 			process.stderr.write(`${formatCliError(error, "Link project failed", {
@@ -7987,7 +7978,7 @@ function registerProjectsCommand(program) {
 		const config = createCliConfig();
 		try {
 			const projectId = await resolveActiveProjectId(config);
-			if (!projectId) throw new Error("Usage: keystroke --project <slug> projects update --name <name>");
+			if (!projectId) throw missingProjectRefError();
 			if (!options.name && options.description === void 0) throw new Error("At least one of --name or --description is required");
 			await runProjectUpdate(config, {
 				projectId,
@@ -8006,7 +7997,7 @@ function registerProjectsCommand(program) {
 		const config = createCliConfig();
 		try {
 			const projectId = await resolveActiveProjectId(config);
-			if (!projectId) throw new Error("Usage: keystroke --project <slug> projects delete");
+			if (!projectId) throw missingProjectRefError();
 			if (!options.yes) throw new Error("Pass --yes to confirm project deletion");
 			await runProjectDelete(config, projectId);
 		} catch (error) {
@@ -8084,7 +8075,7 @@ function registerPullCommand(program) {
 	program.command("pull").description("Download the active deploy source snapshot into a local directory").option("--dir <path>", "Target directory", process.cwd()).option("--force", "Overwrite an existing local project tree").action(async (options) => runCliCommand("Pull failed", async () => {
 		const config = createCliConfig();
 		const projectId = await resolveActiveProjectId(config, options.dir);
-		if (!projectId) throw new Error("Usage: keystroke pull --project <slug>");
+		if (!projectId) throw missingProjectRefError();
 		await runPull({
 			client: createCliPlatformClient(config),
 			projectId,
@@ -8106,7 +8097,7 @@ async function runStart(options) {
 	const apiPort = Number(new URL(serverUrl).port || 80);
 	const runtimeNodeModules = resolveCliRuntimeNodeModules(resolveCliRoot(import.meta.url));
 	ensureNativeDeps(runtimeNodeModules);
-	const { buildApp } = await import("./dist-ID6Kg1Wi.mjs");
+	const { buildApp } = await import("./dist-DqFY1hVs.mjs");
 	await buildApp({
 		root,
 		clean: false
@@ -8341,7 +8332,7 @@ function registerWorkflowListCommand(workflow) {
 	workflow.command("list").description("List workflows in the active organization").option("--admin", "List all org resources (org owner or admin only)").action((options) => runCliCommand("List workflows failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		if (options.admin) await requireAdminRole(config);
 		const projectId = await resolveActiveProjectId(config);
 		const result = await client.workflows.list({
@@ -8447,7 +8438,7 @@ function registerChannelPlatformsCommand(channel) {
 	channel.command("platforms").description("Browse gateway-enabled apps").command("list").description("List apps that support agent external channels").action(() => runCliCommand("List channel platforms failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
+		await resolveActiveOrganization(config);
 		const platforms = await runChannelPlatformsList(client);
 		process.stdout.write(`${JSON.stringify({ platforms }, null, 2)}\n`);
 	}, void 0, { orgScoped: true }));
@@ -8455,11 +8446,10 @@ function registerChannelPlatformsCommand(channel) {
 //#endregion
 //#region src/commands/channels/resolve-channel-project.ts
 async function resolveChannelProjectId(config) {
+	await resolveActiveOrganization(config);
 	const platform = createCliPlatformClient(config);
-	await ensureLinkedOrganization(config);
-	await ensureActiveOrganization(config);
 	const ref = resolveActiveProjectRef();
-	if (!ref) throw new Error("Project is required. Pass --project <slug> or run `keystroke projects link --project <slug>`.");
+	if (!ref) throw missingProjectRefError();
 	return (await resolveProjectRef(platform, ref)).id;
 }
 //#endregion
@@ -8468,9 +8458,7 @@ function registerChannelAccountsCommand(channel) {
 	channel.command("accounts").description("List available workspace accounts for a platform").requiredOption("--platform <key>", "Platform key (slack)").action(async (options) => runCliCommand("List channel accounts failed", async () => {
 		const config = createCliConfig();
 		const projectId = await resolveChannelProjectId(config);
-		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
-		const accounts = await runChannelAccounts(client, projectId, options.platform);
+		const accounts = await runChannelAccounts(createCliPlatformClient(config), projectId, options.platform);
 		process.stdout.write(`${JSON.stringify({ accounts }, null, 2)}\n`);
 	}));
 }
@@ -8478,9 +8466,7 @@ function registerChannelListCommand(channel) {
 	channel.command("list").description("List channel bindings for an agent").requiredOption("--agent <id>", "Agent id").action(async (options) => runCliCommand("List agent channels failed", async () => {
 		const config = createCliConfig();
 		const projectId = await resolveChannelProjectId(config);
-		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
-		const connections = await runChannelList(client, projectId, options.agent);
+		const connections = await runChannelList(createCliPlatformClient(config), projectId, options.agent);
 		process.stdout.write(`${JSON.stringify({ connections }, null, 2)}\n`);
 	}));
 }
@@ -8488,9 +8474,7 @@ function registerChannelDirectoryCommand(channel) {
 	channel.command("directory").description("List channels available to bind from a platform directory").requiredOption("--platform <key>", "Platform key (slack)").requiredOption("--account <id>", "Workspace account id (team id)").action(async (options) => runCliCommand("List channel directory failed", async () => {
 		const config = createCliConfig();
 		const projectId = await resolveChannelProjectId(config);
-		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
-		const channels = await runChannelDirectory(client, projectId, options.platform, options.account);
+		const channels = await runChannelDirectory(createCliPlatformClient(config), projectId, options.platform, options.account);
 		process.stdout.write(`${JSON.stringify({ channels }, null, 2)}\n`);
 	}));
 }
@@ -8498,9 +8482,7 @@ function registerChannelBindCommand(channel) {
 	channel.command("bind").description("Bind an agent to a channel").argument("<agent>", "Agent id or slug").requiredOption("--platform <key>", "Platform key (slack)").requiredOption("--account <id>", "Workspace account id (team id)").requiredOption("--channel <id>", "Provider channel id").option("--channel-name <name>", "Provider channel name").option("--mode <mode>", "Listen mode (mention, all, dm)", "mention").action(async (agent, options) => runCliCommand("Bind channel failed", async () => {
 		const config = createCliConfig();
 		const projectId = await resolveChannelProjectId(config);
-		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
-		const connection = await runChannelBind(client, projectId, {
+		const connection = await runChannelBind(createCliPlatformClient(config), projectId, {
 			agentId: agent,
 			platform: options.platform,
 			accountId: options.account,
@@ -8518,9 +8500,7 @@ function registerChannelUnbindCommand(channel) {
 	channel.command("unbind").description("Remove a channel binding from an agent").requiredOption("--agent <id>", "Agent id").requiredOption("--binding <id>", "Binding id").action(async (options) => runCliCommand("Unbind channel failed", async () => {
 		const config = createCliConfig();
 		const projectId = await resolveChannelProjectId(config);
-		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
-		const connection = await runChannelUnbind(client, projectId, {
+		const connection = await runChannelUnbind(createCliPlatformClient(config), projectId, {
 			agentId: options.agent,
 			bindingId: options.binding
 		});
@@ -8532,7 +8512,6 @@ function registerChannelUpdateBindingCommand(channel) {
 		const config = createCliConfig();
 		const projectId = await resolveChannelProjectId(config);
 		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
 		const patch = {};
 		if (options.mode) patch.mode = options.mode;
 		if (options.threads !== void 0) patch.subscribeOnMention = options.threads;
@@ -8615,31 +8594,25 @@ function registerConfigCommand(program) {
 			webUrl: cliConfig.get("webUrl"),
 			platformUrl: getPlatformUrl(cliConfig),
 			localApiUrl: resolveLocalApiOrigin(process.cwd()),
-			activeOrganizationId: cliConfig.get("activeOrganizationId"),
 			linkedProject: linked.project ?? null,
 			linkedOrganization: linked.organization ?? null,
 			apiTarget: getEffectiveApiTarget(cliConfig),
 			devSession: readDevSession(configDir) ?? null
 		}, null, 2)}\n`);
 	});
-	config.command("use").description("Switch API target (local/cloud) or active organization").argument("[mode]", "local, cloud, or org").argument("[id]", "Organization slug when switching org").action(async (mode, id) => {
+	config.command("use").description("Switch API target (local or cloud)").argument("[mode]", "local or cloud").action(async (mode) => {
 		const cliConfig = createCliConfig();
 		if (!mode || mode === "local") {
 			cliConfig.set("apiTarget", "local");
 			process.stdout.write("Using local keystroke server\n");
 			return;
 		}
-		if (mode === "org") {
-			const membership = await selectActiveOrganization(cliConfig, { organizationRef: id });
-			process.stdout.write(`Using organization ${membership.organization.name}\n`);
-			return;
-		}
 		if (mode === "cloud") {
 			cliConfig.set("apiTarget", "platform");
 			process.stdout.write("Using platform API\n");
 			return;
 		}
-		throw new Error("Usage: keystroke config use [local|cloud|org [slug]]");
+		throw new Error("Usage: keystroke config use [local|cloud]");
 	});
 	config.command("org").description("List organizations you belong to").action(async () => {
 		const organizations = await listOrganizations(createCliConfig());
@@ -8682,10 +8655,11 @@ async function syncAgentsGuide(command) {
 //#endregion
 //#region src/program.ts
 function createProgram() {
-	const program = new Command().name("keystroke").description("Build, run, and manage keystroke projects").version(readCliVersion()).option("--project <slug>", "Platform project slug (deploy target or one-off API target)").option("--local", "Force local keystroke server URL").hook("preAction", async (thisCommand, actionCommand) => {
+	const program = new Command().name("keystroke").description("Build, run, and manage keystroke projects").version(readCliVersion()).option("--project <slug>", "Platform project slug (deploy target or one-off API target)").option("--organization <slug>", "Platform organization slug (org-scoped API target)").option("--local", "Force local keystroke server URL").hook("preAction", async (thisCommand, actionCommand) => {
 		const opts = thisCommand.opts();
 		setCliTargetOptions({
 			projectId: opts.project,
+			organizationRef: opts.organization,
 			local: opts.local
 		});
 		await syncAgentsGuide(actionCommand);
@@ -8717,7 +8691,7 @@ function createProgram() {
 	return program;
 }
 async function runCli(argv) {
-	const { maybeAutoUpdate } = await import("./maybe-auto-update-kkHn69Yu.mjs");
+	const { maybeAutoUpdate } = await import("./maybe-auto-update-gui95aub.mjs");
 	await maybeAutoUpdate(argv);
 	createProgram().parse(argv);
 }