@anythingai/cli 0.1.3 → 0.1.4

package/dist/js/bin.mjs

@@ -3069,7 +3069,7 @@ function errorCodeFromHttpStatus(status) {
 
 //#endregion
 //#region package.json
-var version = "0.1.3";
+var version = "0.1.4";
 
 //#endregion
 //#region generated/core/bodySerializer.gen.ts
@@ -4576,13 +4576,19 @@ var AnythingApiClient = class {
 		}));
 	}
 	async listProjectFiles({ projectGroupId }) {
-		return this.toResult(await getV0ApiProjectsByProjectGroupIdFiles({
-			client: this.client,
-			path: { projectGroupId }
-		})).andThen((data) => "files" in data ? ok(data) : err({
-			message: "Unexpected API response format",
-			status: 200
-		}));
+		const fetchOnce = async () => {
+			return this.toResult(await getV0ApiProjectsByProjectGroupIdFiles({
+				client: this.client,
+				path: { projectGroupId }
+			})).andThen((data) => "files" in data ? ok({ files: data.files ?? [] }) : err({
+				message: "Unexpected API response format",
+				status: 200
+			}));
+		};
+		const first = await fetchOnce();
+		if (first.isErr() || first.value.files.length > 0) return first;
+		await new Promise((resolve) => setTimeout(resolve, 750));
+		return fetchOnce();
 	}
 	async getProjectFile({ projectGroupId, path }) {
 		return this.toResult(await getV0ApiProjectsByProjectGroupIdFiles({
@@ -4905,13 +4911,56 @@ function extractErrorCode(details) {
 	const parsed = DetailsWithCodeSchema.safeParse(details);
 	return parsed.success ? parsed.data.code : null;
 }
+function resolveErrorCode({ error, exitCode, codeOverride }) {
+	const status = "status" in error ? error.status ?? null : null;
+	const details = "details" in error ? error.details : void 0;
+	return codeOverride ?? extractErrorCode(details) ?? (status === null && exitCode !== void 0 ? errorCodeFromExitCode(exitCode) : errorCodeFromHttpStatus(status));
+}
+function outputStreamError({ argv, command, error, hint, exitCode, buildLogs, code: codeOverride }) {
+	const status = "status" in error ? error.status ?? null : null;
+	process.exitCode = exitCode ?? exitCodeFromHttpStatus(status);
+	if (!argv.json && !argv.quiet) {
+		outputError({
+			argv,
+			command,
+			error,
+			hint,
+			exitCode,
+			buildLogs,
+			code: codeOverride
+		});
+		return;
+	}
+	const code = resolveErrorCode({
+		error,
+		exitCode,
+		codeOverride
+	});
+	const retryAfter = "retryAfter" in error && typeof error.retryAfter === "number" ? error.retryAfter : null;
+	const resolvedHint = hint ?? ("hint" in error && typeof error.hint === "string" ? error.hint : void 0);
+	printNdjson({
+		type: "result",
+		ok: false,
+		error: {
+			code,
+			message: error.message,
+			...resolvedHint ? { hint: resolvedHint } : {},
+			...retryAfter !== null ? { retry_after_seconds: retryAfter } : {},
+			...buildLogs ? { buildLogs: buildLogsToLines(buildLogs) } : {}
+		}
+	});
+}
 function outputError({ argv, command, error, hint, exitCode, buildLogs, code: codeOverride }) {
 	const status = "status" in error ? error.status ?? null : null;
 	const details = "details" in error ? error.details : void 0;
 	const retryAfter = "retryAfter" in error && typeof error.retryAfter === "number" ? error.retryAfter : null;
 	const resolvedHint = hint ?? ("hint" in error && typeof error.hint === "string" ? error.hint : void 0);
 	process.exitCode = exitCode ?? exitCodeFromHttpStatus(status);
-	const code = codeOverride ?? extractErrorCode(details) ?? (status === null && exitCode !== void 0 ? errorCodeFromExitCode(exitCode) : errorCodeFromHttpStatus(status));
+	const code = resolveErrorCode({
+		error,
+		exitCode,
+		codeOverride
+	});
 	if (argv.json || argv.quiet) {
 		console.log(JSON.stringify({
 			ok: false,
@@ -5378,7 +5427,7 @@ async function selectAndSetOrg({ config, json, nonInteractive }) {
 				return choice;
 			}
 		}
-		const recommended = orgs.find((org) => BigInt(org.creditBalance) > 0n) ?? orgs[0];
+		const recommended = orgs.find((org) => org.creditsBalance > 0) ?? orgs[0];
 		if (!recommended) return null;
 		if (!json) {
 			console.log();
@@ -8503,7 +8552,7 @@ const llmContextCommand = {
 					id: org.id,
 					name: org.name,
 					plan: org.plan,
-					hasCredits: BigInt(org.creditBalance) > 0n
+					hasCredits: org.creditsBalance > 0
 				}))
 			};
 		} catch {}
@@ -8925,18 +8974,6 @@ const membersCommand = {
 	handler: () => {}
 };
 
-//#endregion
-//#region src/format-credits.ts
-const HUMAN_READABLE_FACTOR = 10000000n;
-const formatter = Intl.NumberFormat("en", {
-	notation: "compact",
-	maximumSignificantDigits: 3
-});
-const humanizeCredits = (credits) => {
-	const normalized = BigInt(credits) * 100n / HUMAN_READABLE_FACTOR;
-	return formatter.format(Math.ceil(Number(normalized) / 100));
-};
-
 //#endregion
 //#region src/commands/org-members.ts
 const orgMembersCommand = {
@@ -9061,9 +9098,6 @@ async function loadOrganizations(argv, command) {
 	}
 	return result.value.organizations;
 }
-function formatCredits$1(creditBalance) {
-	return `${humanizeCredits(creditBalance)} credits`;
-}
 const getCommand = {
 	command: "get <organizationId>",
 	describe: "Inspect a single organization",
@@ -9099,7 +9133,7 @@ const getCommand = {
 		printLabel("ID", organization.id);
 		printLabel("Plan", organization.planDisplayName);
 		printLabel("Paid", organization.isPaid ? "yes" : "no");
-		printLabel("Credits", formatCredits$1(organization.creditBalance));
+		printLabel("Credits", `${organization.creditsBalance} credits`);
 		printLabel("Plan Code", organization.plan);
 	}
 };
@@ -9603,13 +9637,25 @@ const createCommand = {
 const DEPLOY_POLL_INTERVAL_MS = 3e3;
 const DEPLOY_POLL_TIMEOUT_MS = 6e5;
 const DEPLOY_JITTER_MS = 500;
+const MAX_CONSECUTIVE_POLL_ERRORS = 5;
 const TERMINAL_STATUSES = new Set(["SUCCESS", "FAILED"]);
 async function waitForDeployment({ client, deploymentId, emit }) {
 	const deadline = Date.now() + DEPLOY_POLL_TIMEOUT_MS;
 	let lastStatus = null;
+	let consecutiveErrors = 0;
 	while (Date.now() < deadline) {
 		const result = await client.getDeployment({ deploymentId });
-		if (result.isErr()) return err(result.error);
+		if (result.isErr()) {
+			consecutiveErrors += 1;
+			if (consecutiveErrors >= MAX_CONSECUTIVE_POLL_ERRORS) return ok({
+				outcome: "unconfirmed",
+				deploymentId,
+				reason: `Could not confirm deployment status after ${consecutiveErrors} consecutive polling errors (last: ${result.error.message}).`
+			});
+			await setTimeout$1(DEPLOY_POLL_INTERVAL_MS + Math.random() * DEPLOY_JITTER_MS);
+			continue;
+		}
+		consecutiveErrors = 0;
 		const { deployment } = result.value;
 		if (deployment.status !== lastStatus) {
 			lastStatus = deployment.status;
@@ -9636,10 +9682,12 @@ async function waitForDeployment({ client, deploymentId, emit }) {
 * error info if the deployment did not succeed, or null if it succeeded.
 */
 function getDeploymentError({ result, statusCommand }) {
-	if (result.outcome === "timeout") return {
-		message: `Deployment timed out. Check status with: ${statusCommand}`,
+	if (result.outcome === "timeout" || result.outcome === "unconfirmed") return {
+		message: `${result.outcome === "timeout" ? "Deployment did not reach a terminal status before the wait timed out" : result.reason} The deploy may still be in progress. Resume with: ${statusCommand}`,
 		exitCode: 6,
-		buildLogs: null
+		buildLogs: null,
+		deploymentId: result.deploymentId,
+		hint: `Resume with: ${statusCommand}`
 	};
 	if (result.deployment.status === "FAILED") {
 		const reason = result.deployment.failureReason ?? null;
@@ -9647,7 +9695,9 @@ function getDeploymentError({ result, statusCommand }) {
 		return {
 			message: reason ?? (logs ? "Deployment failed. See build logs for details." : "Deployment failed (no logs available)."),
 			exitCode: 1,
-			buildLogs: logs
+			buildLogs: logs,
+			deploymentId: result.deployment.id,
+			hint: null
 		};
 	}
 	return null;
@@ -9858,11 +9908,12 @@ const publishCommand = {
 				argv,
 				command: COMMAND$15,
 				error: {
-					message: deployError.message,
+					message: deployError.deploymentId ? `${deployError.message} (deploymentId: ${deployError.deploymentId})` : deployError.message,
 					status: null
 				},
 				exitCode: deployError.exitCode,
-				buildLogs: deployError.buildLogs ?? void 0
+				buildLogs: deployError.buildLogs ?? void 0,
+				hint: deployError.hint ?? void 0
 			});
 			return;
 		}
@@ -9993,20 +10044,24 @@ const list$1 = {
 			});
 			return;
 		}
+		const files = result.value.files;
 		if (argv.json && outputSuccess({
 			argv,
 			command,
-			data: result.value
+			data: {
+				files,
+				count: files.length
+			}
 		})) return;
 		if (argv.quiet) {
-			for (const file of result.value.files) console.log(file.path);
+			for (const file of files) console.log(file.path);
 			return;
 		}
-		if (result.value.files.length === 0) {
+		if (files.length === 0) {
 			console.log("No files found.");
 			return;
 		}
-		for (const file of result.value.files) console.log(file.path);
+		for (const file of files) console.log(file.path);
 	}
 };
 const get$1 = {
@@ -10958,7 +11013,11 @@ const secretEnvironmentChoices = [
 	"preview",
 	"production"
 ];
-const DEFAULT_SECRET_ENVIRONMENT = "DEVELOPMENT";
+const ALL_SECRET_ENVIRONMENTS = [
+	"DEVELOPMENT",
+	"PREVIEW",
+	"PRODUCTION"
+];
 const add = {
 	command: "add <projectId>",
 	describe: "Add a secret to an app",
@@ -10977,7 +11036,7 @@ const add = {
 		type: "string",
 		coerce: (value) => value.toLowerCase(),
 		choices: secretEnvironmentChoices,
-		describe: "Target environment for the secret"
+		describe: "Target a single environment. Omit to add the secret to all environments (development, preview, production) so it reaches the published app."
 	}).option("force", {
 		type: "boolean",
 		default: false,
@@ -10985,16 +11044,17 @@ const add = {
 	}).example("anything projects secrets add <id> --name KEY --value \"secret\"", "Add a secret from an inline value").example("cat secret.txt | anything projects secrets add <id> --name KEY", "Read a secret value from stdin"),
 	handler: async (argv) => {
 		const command = "projects secrets add";
+		const targetEnvironments = argv.env ? [argv.env.toUpperCase()] : [...ALL_SECRET_ENVIRONMENTS];
 		if (argv["dry-run"]) {
 			outputDryRun({
 				argv,
 				command,
-				plannedActions: [{
+				plannedActions: targetEnvironments.map((environment) => ({
 					action: "add_secret",
 					projectGroupId: argv.projectId,
 					name: argv.name,
-					...argv.env ? { environment: argv.env.toUpperCase() } : {}
-				}]
+					environment
+				}))
 			});
 			return;
 		}
@@ -11032,16 +11092,16 @@ const add = {
 			return;
 		}
 		const client = new AnythingApiClient(config.value);
-		const targetEnvironment = argv.env ? argv.env.toUpperCase() : DEFAULT_SECRET_ENVIRONMENT;
 		if (!argv.force) {
 			const existing = await client.listSecrets({ projectGroupId: argv.projectId });
 			if (existing.isOk()) {
-				if (existing.value.secrets.find((secret) => secret.displayName === argv.name && secret.environment === targetEnvironment)) {
+				const collisions = targetEnvironments.filter((environment) => existing.value.secrets.some((secret) => secret.displayName === argv.name && secret.environment === environment));
+				if (collisions.length > 0) {
 					outputError({
 						argv,
 						command,
 						error: {
-							message: `A secret named "${argv.name}" already exists in ${targetEnvironment}.`,
+							message: `A secret named "${argv.name}" already exists in ${collisions.join(", ")}.`,
 							status: 409
 						},
 						hint: "Remove the existing secret first, or pass --force to create a suffixed sibling."
@@ -11050,31 +11110,41 @@ const add = {
 				}
 			}
 		}
-		const result = await client.addSecret({
-			projectGroupId: argv.projectId,
-			displayName: argv.name,
-			value: valueResult.value,
-			environment: targetEnvironment
-		});
-		if (result.isErr()) {
-			outputError({
-				argv,
-				command,
-				error: result.error
+		const added = [];
+		for (const environment of targetEnvironments) {
+			const result = await client.addSecret({
+				projectGroupId: argv.projectId,
+				displayName: argv.name,
+				value: valueResult.value,
+				environment
+			});
+			if (result.isErr()) {
+				outputError({
+					argv,
+					command,
+					error: result.error
+				});
+				return;
+			}
+			added.push({
+				id: result.value.secret.id,
+				envKey: result.value.secret.envKey,
+				environment: result.value.secret.environment
 			});
-			return;
 		}
+		const environments = added.map((s) => s.environment);
 		if (outputSuccess({
 			argv,
 			command,
-			data: result.value,
-			primaryId: result.value.secret.id
+			data: {
+				secrets: added,
+				environments
+			},
+			primaryId: added[0]?.id
 		})) return;
-		const s = result.value.secret;
-		printSuccess("Secret added.");
-		printLabel("ID", s.id);
-		printLabel("Env Key", s.envKey);
-		printLabel("Environment", s.environment);
+		printSuccess(`Secret added to ${environments.join(", ")}.`);
+		printLabel("Env Key", added[0]?.envKey ?? argv.name);
+		for (const s of added) printLabel(`ID (${s.environment})`, s.id);
 	}
 };
 const remove = {
@@ -11961,7 +12031,7 @@ const shipCommand = {
 			apiUrl: argv.apiUrl
 		});
 		if (config.isErr()) {
-			outputError({
+			outputStreamError({
 				argv,
 				command: COMMAND$4,
 				error: {
@@ -11983,7 +12053,7 @@ const shipCommand = {
 				nonInteractive: isNonInteractive(argv)
 			});
 			if (!orgResult.ok) {
-				outputError({
+				outputStreamError({
 					argv,
 					command: COMMAND$4,
 					error: {
@@ -12006,7 +12076,7 @@ const shipCommand = {
 				name: argv.name ?? null
 			});
 			if (createResult.isErr()) {
-				outputError({
+				outputStreamError({
 					argv,
 					command: COMMAND$4,
 					error: createResult.error
@@ -12034,7 +12104,7 @@ const shipCommand = {
 				createNewThread: false
 			});
 			if (genResult.isErr()) {
-				outputError({
+				outputStreamError({
 					argv,
 					command: COMMAND$4,
 					error: genResult.error
@@ -12098,7 +12168,7 @@ const shipCommand = {
 			slug: argv.slug ?? null
 		});
 		if (publishResult.isErr()) {
-			outputError({
+			outputStreamError({
 				argv,
 				command: COMMAND$4,
 				error: publishResult.error
@@ -12113,7 +12183,7 @@ const shipCommand = {
 				emit
 			});
 			if (deployResult.isErr()) {
-				outputError({
+				outputStreamError({
 					argv,
 					command: COMMAND$4,
 					error: deployResult.error
@@ -12125,15 +12195,16 @@ const shipCommand = {
 				statusCommand: `anything projects publish status ${projectGroupId} ${deploymentId}`
 			});
 			if (deployError) {
-				outputError({
+				outputStreamError({
 					argv,
 					command: COMMAND$4,
 					error: {
-						message: deployError.message,
+						message: deployError.deploymentId ? `${deployError.message} (deploymentId: ${deployError.deploymentId})` : deployError.message,
 						status: null
 					},
 					exitCode: deployError.exitCode,
-					buildLogs: deployError.buildLogs ?? void 0
+					buildLogs: deployError.buildLogs ?? void 0,
+					hint: deployError.hint ?? void 0
 				});
 				return;
 			}
@@ -12799,9 +12870,6 @@ const updateCommand = {
 
 //#endregion
 //#region src/commands/user.ts
-function formatCredits(creditBalance) {
-	return `${humanizeCredits(creditBalance)} credits`;
-}
 const COMMAND = "user";
 const userCommand = {
 	command: "user",
@@ -12840,14 +12908,14 @@ const userCommand = {
 		}
 		const activeOrgId = getStoredOrgId();
 		const defaultOrganization = result.value.organizations[0] ?? null;
-		const organizationWithCredits = result.value.organizations.find((org) => BigInt(org.creditBalance) > 0n) ?? null;
-		const recommendedOrganization = defaultOrganization !== null && BigInt(defaultOrganization.creditBalance) > 0n ? defaultOrganization : organizationWithCredits;
+		const organizationWithCredits = result.value.organizations.find((org) => org.creditsBalance > 0) ?? null;
+		const recommendedOrganization = defaultOrganization !== null && defaultOrganization.creditsBalance > 0 ? defaultOrganization : organizationWithCredits;
 		const credentialSource = env.ANYTHING_API_KEY ? "env" : configExists() ? "config" : "unknown";
 		const checks = {
 			hasOrganizations: result.value.organizations.length > 0,
 			hasPaidOrganization: result.value.organizations.some((org) => org.isPaid),
 			hasCredits: organizationWithCredits !== null,
-			defaultOrganizationHasCredits: defaultOrganization !== null ? BigInt(defaultOrganization.creditBalance) > 0n : null
+			defaultOrganizationHasCredits: defaultOrganization !== null ? defaultOrganization.creditsBalance > 0 : null
 		};
 		const activeOrg = activeOrgId ? result.value.organizations.find((o) => o.id === activeOrgId) ?? null : null;
 		if (argv.quiet && !argv.json) {
@@ -12916,7 +12984,7 @@ const userCommand = {
 				org.id === activeOrgId ? "*" : "",
 				org.name,
 				org.planDisplayName,
-				formatCredits(org.creditBalance),
+				`${org.creditsBalance} credits`,
 				org.id
 			])
 		});
@@ -12928,7 +12996,7 @@ const userCommand = {
 		if (!activeOrgId && recommendedOrganization !== null) {
 			console.log();
 			console.log(`No active organization set. Run \`anything orgs set ${recommendedOrganization.id}\` to set one.`);
-		} else if (activeOrg !== null && BigInt(activeOrg.creditBalance) === 0n && recommendedOrganization !== null && recommendedOrganization.id !== activeOrg.id) {
+		} else if (activeOrg !== null && activeOrg.creditsBalance === 0 && recommendedOrganization !== null && recommendedOrganization.id !== activeOrg.id) {
 			console.log();
 			console.log(`Active organization has no credits. Run \`anything orgs set ${recommendedOrganization.id}\` to switch.`);
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anythingai/cli",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "homepage": "https://anything.com/",
   "license": "MIT",
   "bin": {