npm - @anythingai/cli - Versions diffs - 0.0.3 → 0.1.1 - Mend

@anythingai/cli 0.0.3 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/js/bin.mjs +1013 -575
package/package.json +1 -1
package/skills/anything-cli/SKILL.md +5 -2

package/dist/js/bin.mjs CHANGED Viewed

@@ -3,7 +3,7 @@ import { createRequire } from "node:module";
 import { hideBin } from "yargs/helpers";
 import yargs from "yargs";
 import { exec, execSync, spawn } from "node:child_process";
-import fs, { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import fs, { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import path, { basename, dirname, extname, join, resolve } from "node:path";
 import Conf from "conf";
 import { err, ok } from "neverthrow";
@@ -3026,9 +3026,11 @@ const EXIT_CONFLICT = 5;
 const EXIT_TIMEOUT = 6;
 const EXIT_SERVER_ERROR = 7;
 const EXIT_RATE_LIMITED = 8;
+const EXIT_CREDIT_LIMIT = 9;
 function exitCodeFromHttpStatus(status) {
 	if (status === null) return EXIT_ERROR;
 	if (status === 401 || status === 403) return EXIT_AUTH_FAILURE;
+	if (status === 402) return EXIT_CREDIT_LIMIT;
 	if (status === 404) return EXIT_NOT_FOUND;
 	if (status === 409) return EXIT_CONFLICT;
 	if (status === 408 || status === 504) return EXIT_TIMEOUT;
@@ -3037,9 +3039,23 @@ function exitCodeFromHttpStatus(status) {
 	if (status === 422 || status === 400) return EXIT_INVALID_ARGS;
 	return EXIT_ERROR;
 }
+function errorCodeFromExitCode(exitCode) {
+	switch (exitCode) {
+		case EXIT_INVALID_ARGS: return "INVALID_ARGUMENTS";
+		case EXIT_NOT_FOUND: return "NOT_FOUND";
+		case EXIT_AUTH_FAILURE: return "AUTH_FAILURE";
+		case EXIT_CREDIT_LIMIT: return "CREDIT_LIMIT_REACHED";
+		case EXIT_CONFLICT: return "CONFLICT";
+		case EXIT_TIMEOUT: return "TIMEOUT";
+		case EXIT_SERVER_ERROR: return "SERVER_ERROR";
+		case EXIT_RATE_LIMITED: return "RATE_LIMITED";
+		default: return "ERROR";
+	}
+}
 function errorCodeFromHttpStatus(status) {
 	if (status === null) return "NETWORK_ERROR";
 	if (status === 401) return "AUTH_FAILURE";
+	if (status === 402) return "CREDIT_LIMIT_REACHED";
 	if (status === 403) return "FORBIDDEN";
 	if (status === 404) return "NOT_FOUND";
 	if (status === 409) return "CONFLICT";
@@ -3053,7 +3069,7 @@ function errorCodeFromHttpStatus(status) {
 //#endregion
 //#region package.json
-var version = "0.0.3";
+var version = "0.1.1";
 //#endregion
 //#region generated/core/bodySerializer.gen.ts
@@ -4315,14 +4331,23 @@ const USER_AGENT = `anything-cli/${version}`;
 const ErrorWithMessageSchema = z.object({ message: z.string().min(1) });
 const ErrorWithErrorStringSchema = z.object({ error: z.string().min(1) });
 const ErrorWithNestedMessageSchema = z.object({ error: z.object({ message: z.string() }) });
+const HTML_DOCUMENT = /<!doctype html|<html[\s>]/i;
+function summarizeErrorString(raw, status) {
+	const trimmed = raw.trim();
+	if (!HTML_DOCUMENT.test(trimmed)) return trimmed;
+	const pre = trimmed.match(/<pre[^>]*>([\s\S]*?)<\/pre>/i)?.[1];
+	const title = trimmed.match(/<title[^>]*>([\s\S]*?)<\/title>/i)?.[1];
+	const summary = (pre ?? title)?.replace(/<[^>]+>/g, "").replace(/\s+/g, " ").trim();
+	return summary && summary.length > 0 ? `API error (${status}): ${summary}` : `API error (${status})`;
+}
 function extractErrorMessage(status, details) {
 	const withMessage = ErrorWithMessageSchema.safeParse(details);
-	if (withMessage.success) return withMessage.data.message;
+	if (withMessage.success) return summarizeErrorString(withMessage.data.message, status);
 	const withErrorString = ErrorWithErrorStringSchema.safeParse(details);
-	if (withErrorString.success) return withErrorString.data.error;
+	if (withErrorString.success) return summarizeErrorString(withErrorString.data.error, status);
 	const withNested = ErrorWithNestedMessageSchema.safeParse(details);
-	if (withNested.success) return withNested.data.error.message;
-	if (typeof details === "string" && details.length > 0) return details;
+	if (withNested.success) return summarizeErrorString(withNested.data.error.message, status);
+	if (typeof details === "string" && details.length > 0) return summarizeErrorString(details, status);
 	return `API error (${status})`;
 }
 function parseRetryAfter(response) {
@@ -4365,29 +4390,49 @@ const RollbackResponseSchema = z.object({
 		status: z.string()
 	}).optional()
 });
+function wrapFetchWithTimeout(ms) {
+	return (input, init) => {
+		const signal = AbortSignal.timeout(ms);
+		if (input instanceof Request) return globalThis.fetch(new Request(input, { signal }));
+		return globalThis.fetch(input, {
+			...init,
+			signal
+		});
+	};
+}
 var AnythingApiClient = class {
 	client;
-	constructor(config) {
+	timeoutMs;
+	constructor(config, options) {
+		const apiUrl = config.apiUrl.replace(/\/$/, "");
+		this.timeoutMs = options?.timeoutMs ?? null;
 		this.client = createClient$1(createConfig({
-			baseUrl: config.apiUrl.replace(/\/$/, ""),
+			baseUrl: apiUrl,
 			headers: {
 				authorization: buildAuthHeader$1(config.apiKey),
 				"user-agent": USER_AGENT
-			}
+			},
+			...this.timeoutMs !== null ? { fetch: wrapFetchWithTimeout(this.timeoutMs) } : {}
 		}));
 	}
 	toResult(result) {
 		const { data, error, response } = result;
-		if (!response) return err({
-			message: `Network error: ${error instanceof Error ? error.message : String(error)}`,
-			status: null
-		});
+		if (!response) {
+			const isTimeout = error instanceof DOMException && error.name === "TimeoutError";
+			const timeoutSuffix = this.timeoutMs !== null ? ` after ${Math.round(this.timeoutMs / 1e3)}s` : "";
+			return err({
+				message: isTimeout ? `Request timed out${timeoutSuffix}. Use --timeout to increase.` : `Network error: ${error instanceof Error ? error.message : String(error)}`,
+				status: isTimeout ? 408 : null
+			});
+		}
 		if (!response.ok) {
 			const retryAfter = parseRetryAfter(response);
+			const hint = error && typeof error === "object" && "hint" in error && typeof error.hint === "string" ? error.hint : void 0;
 			return err({
 				message: extractErrorMessage(response.status, error),
 				status: response.status,
 				details: error,
+				...hint ? { hint } : {},
 				...retryAfter !== null ? { retryAfter } : {}
 			});
 		}
@@ -4810,10 +4855,6 @@ function printApiError(error) {
 	if (withErrors.success) for (const e of withErrors.data.errors) console.error(`  ${typeof e === "string" ? e : e.message}`);
 }
 function outputSuccess({ argv, command, data, primaryId, startTime }) {
-	if (argv.quiet) {
-		if (primaryId) console.log(primaryId);
-		return true;
-	}
 	if (argv.json) {
 		const envelope = {
 			ok: true,
@@ -4824,6 +4865,10 @@ function outputSuccess({ argv, command, data, primaryId, startTime }) {
 		console.log(JSON.stringify(envelope, null, 2));
 		return true;
 	}
+	if (argv.quiet) {
+		if (primaryId) console.log(primaryId);
+		return true;
+	}
 	return false;
 }
 const DetailsWithCodeSchema = z.object({ code: z.string() });
@@ -4835,8 +4880,9 @@ function outputError({ argv, command, error, hint, exitCode }) {
 	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 = extractErrorCode(details) ?? errorCodeFromHttpStatus(status);
+	const code = extractErrorCode(details) ?? (status === null && exitCode !== void 0 ? errorCodeFromExitCode(exitCode) : errorCodeFromHttpStatus(status));
 	if (argv.json || argv.quiet) {
 		console.error(JSON.stringify({
 			ok: false,
@@ -4844,7 +4890,7 @@ function outputError({ argv, command, error, hint, exitCode }) {
 			error: {
 				code,
 				message: error.message,
-				...hint ? { hint } : {},
+				...resolvedHint ? { hint: resolvedHint } : {},
 				...retryAfter !== null ? { retry_after_seconds: retryAfter } : {}
 			}
 		}, null, 2));
@@ -4856,7 +4902,7 @@ function outputError({ argv, command, error, hint, exitCode }) {
 		details
 	});
 	if (retryAfter !== null) console.error(`  ${styleText("dim", `Retry after ${retryAfter}s`)}`);
-	if (hint) console.error(`  ${styleText("dim", hint)}`);
+	if (resolvedHint) console.error(`  ${styleText("dim", resolvedHint)}`);
 }
 function outputValidationError({ argv, command, message, hint }) {
 	outputError({
@@ -4871,7 +4917,6 @@ function outputValidationError({ argv, command, message, hint }) {
 	});
 }
 function outputDryRun({ argv, command, plannedActions }) {
-	if (argv.quiet) return;
 	if (argv.json) {
 		console.log(JSON.stringify({
 			ok: true,
@@ -4881,6 +4926,7 @@ function outputDryRun({ argv, command, plannedActions }) {
 		}, null, 2));
 		return;
 	}
+	if (argv.quiet) return;
 	printSuccess("Dry run — no changes made.");
 	for (const action of plannedActions) {
 		printLabel("Action", action.action);
@@ -4958,6 +5004,19 @@ const upload = {
 			});
 			return;
 		}
+		if (argv["dry-run"]) {
+			outputDryRun({
+				argv,
+				command,
+				plannedActions: [{
+					action: "upload_asset",
+					projectGroupId: argv.projectId,
+					file: filePath,
+					...argv.name ? { name: argv.name } : {}
+				}]
+			});
+			return;
+		}
 		const config = resolveConfig({
 			dev: argv.dev,
 			apiUrl: argv.apiUrl
@@ -5097,6 +5156,18 @@ const remove$1 = {
 	}),
 	handler: async (argv) => {
 		const command = "assets remove";
+		if (argv["dry-run"]) {
+			outputDryRun({
+				argv,
+				command,
+				plannedActions: [{
+					action: "remove_asset",
+					projectGroupId: argv.projectId,
+					assetId: argv.assetId
+				}]
+			});
+			return;
+		}
 		const config = resolveConfig({
 			dev: argv.dev,
 			apiUrl: argv.apiUrl
@@ -5406,13 +5477,31 @@ const login = {
 		}).replace(/\/$/, "");
 		const nonInteractive = isNonInteractive(argv);
 		if (argv["api-key"]) {
+			const apiKey = argv["api-key"];
+			const probe = await new AnythingApiClient({
+				apiKey,
+				apiUrl
+			}).getMe();
+			if (probe.isErr()) {
+				outputError({
+					argv,
+					command: "auth login",
+					error: {
+						message: `API key was rejected: ${probe.error.message}`,
+						status: probe.error.status
+					},
+					hint: "Double-check the key and that it matches this API URL. Your existing login was left untouched.",
+					exitCode: 4
+				});
+				return;
+			}
 			saveConfig({
-				apiKey: argv["api-key"],
+				apiKey,
 				apiUrl
 			});
 			const org = await selectAndSetOrg({
 				config: {
-					apiKey: argv["api-key"],
+					apiKey,
 					apiUrl
 				},
 				json: argv.json,
@@ -5686,6 +5775,9 @@ const authCommand = {
 //#endregion
 //#region src/commands/database-connect.ts
 const COMMAND$25 = "databases connect";
+function maskConnectionString(connectionString) {
+	return connectionString.replace(/(\/\/[^:/?#@]+:)[^@/?#]*(@)/, "$1****$2");
+}
 const databaseConnectCommand = {
 	command: "connect <databaseId>",
 	describe: "Print the connection string for a database",
@@ -5693,7 +5785,11 @@ const databaseConnectCommand = {
 		type: "string",
 		demandOption: true,
 		describe: "The database ID"
-	}).example("anything databases connect db_123", "Print the connection string"),
+	}).option("mask", {
+		type: "boolean",
+		default: false,
+		describe: "Redact the password in the connection string"
+	}).example("anything databases connect db_123", "Print the connection string").example("anything databases connect db_123 --mask", "Print the connection string with the password redacted"),
 	handler: async (argv) => {
 		const config = resolveConfig({
 			dev: argv.dev,
@@ -5720,13 +5816,17 @@ const databaseConnectCommand = {
 			});
 			return;
 		}
+		const connectionString = argv.mask ? maskConnectionString(result.value.connectionString) : result.value.connectionString;
 		if (outputSuccess({
 			argv,
 			command: COMMAND$25,
-			data: result.value,
-			primaryId: result.value.connectionString
+			data: {
+				...result.value,
+				connectionString
+			},
+			primaryId: connectionString
 		})) return;
-		console.log(result.value.connectionString);
+		console.log(connectionString);
 	}
 };
@@ -5791,6 +5891,19 @@ const databaseCreateCommand = {
 		describe: "Database name"
 	}).example("anything databases create --project pg_123", "Create a database for a project"),
 	handler: async (argv) => {
+		const name = argv.name?.trim();
+		if (!name) {
+			outputError({
+				argv,
+				command: COMMAND$24,
+				error: {
+					message: "Database name is required. Pass --name <name>.",
+					status: null
+				},
+				exitCode: 2
+			});
+			return;
+		}
 		const config = resolveConfig({
 			dev: argv.dev,
 			apiUrl: argv.apiUrl
@@ -5831,8 +5944,8 @@ const databaseCreateCommand = {
 				plannedActions: [{
 					action: "create_database",
 					org: orgResult.orgId,
-					...argv.project ? { project: argv.project } : {},
-					...argv.name ? { name: argv.name } : {}
+					name,
+					...argv.project ? { project: argv.project } : {}
 				}]
 			});
 			return;
@@ -5840,7 +5953,7 @@ const databaseCreateCommand = {
 		const result = await new AnythingApiClient(config.value).createDatabase({
 			organizationId: orgResult.orgId,
 			projectGroupId: argv.project ?? null,
-			name: argv.name ?? null
+			name
 		});
 		if (result.isErr()) {
 			outputError({
@@ -6712,153 +6825,381 @@ const domainsCommand = {
 };
 //#endregion
-//#region src/commands/introspect.ts
-const commandTree = [
-	{
-		name: "auth login",
-		flags: [{
-			name: "--api-key",
-			type: "string",
-			required: false
-		}, {
-			name: "--dev",
-			type: "boolean",
-			required: false
-		}],
-		idempotent: true,
-		destructive: false
-	},
-	{
-		name: "auth logout",
-		flags: [],
-		idempotent: true,
-		destructive: true
-	},
-	{
-		name: "auth status",
-		flags: [],
-		idempotent: true,
-		destructive: false
-	},
-	{
-		name: "user",
-		flags: [],
-		idempotent: true,
-		destructive: false
-	},
-	{
-		name: "orgs list",
-		flags: [],
-		idempotent: true,
-		destructive: false
-	},
-	{
-		name: "orgs get",
-		flags: [{
-			name: "<organizationId>",
-			type: "string",
-			required: true
-		}],
-		idempotent: true,
-		destructive: false
-	},
-	{
-		name: "orgs set",
-		flags: [{
-			name: "<org-id>",
-			type: "string",
-			required: true
-		}],
-		idempotent: true,
-		destructive: false
-	},
-	{
-		name: "orgs unset",
-		flags: [],
-		idempotent: true,
-		destructive: false
-	},
-	{
-		name: "orgs members",
-		flags: [{
-			name: "<organizationId>",
-			type: "string",
-			required: true
-		}],
-		idempotent: true,
-		destructive: false
-	},
-	{
-		name: "projects list",
-		flags: [
-			{
-				name: "--org",
-				type: "string",
-				required: false
-			},
-			{
-				name: "--search",
-				type: "string",
-				required: false
-			},
-			{
-				name: "--limit",
-				type: "number",
-				required: false
-			}
-		],
-		idempotent: true,
-		destructive: false
-	},
-	{
-		name: "projects create",
-		flags: [
-			{
-				name: "--prompt",
-				type: "string",
-				required: true
-			},
-			{
-				name: "--org",
-				type: "string",
-				required: false
-			},
-			{
-				name: "--name",
-				type: "string",
-				required: false
-			}
-		],
-		idempotent: false,
-		destructive: false
-	},
-	{
-		name: "projects get",
-		flags: [{
-			name: "<projectId>",
-			type: "string",
-			required: true
-		}],
-		idempotent: true,
-		destructive: false
-	},
-	{
-		name: "projects generate",
-		flags: [
-			{
-				name: "<projectId>",
-				type: "string",
-				required: true
-			},
-			{
-				name: "--prompt",
-				type: "string",
-				required: true
+//#region src/commands/submit.ts
+const POLL_INTERVAL_MS$1 = 2e3;
+const POLL_TIMEOUT_MS = 6e4;
+const STORE_CHOICES = ["app-store", "play-store"];
+async function waitForSubmission({ client, projectGroupId, submission }) {
+	const deadline = Date.now() + POLL_TIMEOUT_MS;
+	let current = submission;
+	while (current.status === "PENDING" && Date.now() < deadline) {
+		const latestResult = await client.getProjectSubmission({
+			projectGroupId,
+			submissionId: current.id
+		});
+		if (latestResult.isErr()) return latestResult.map((value) => value.submission);
+		current = latestResult.value.submission;
+		if (current.status !== "PENDING") return latestResult.map((value) => value.submission);
+		await setTimeout$1(POLL_INTERVAL_MS$1);
+	}
+	return ok(current);
+}
+function printSubmissionResult({ argv, command, pendingMessage, submission }) {
+	const { projectGroupId: projectId, ...submissionRest } = submission;
+	const submissionOut = {
+		projectId,
+		...submissionRest
+	};
+	if (submission.status === "FAILED") {
+		printError(submission.errorMessage ?? "Submission failed.");
+		process.exitCode = 1;
+		return;
+	}
+	if (submission.status === "CREATED") {
+		if (outputSuccess({
+			argv,
+			command,
+			data: {
+				success: true,
+				submission: submissionOut
 			},
-			{
-				name: "--thread",
-				type: "string",
-				required: false
+			primaryId: submission.id
+		})) return;
+		printSuccess("App Store submission is ready.");
+		printLabel("Submission ID", submission.id);
+		printLabel("Launch URL", submission.launchUrl);
+		printLabel("Auth URL", submission.authUrl);
+		printLabel("Expires At", submission.expiresAt);
+		return;
+	}
+	if (outputSuccess({
+		argv,
+		command,
+		data: {
+			success: true,
+			submission
+		},
+		primaryId: submission.id
+	})) return;
+	printSuccess(pendingMessage);
+	printLabel("Submission ID", submission.id);
+	printLabel("Status", submission.status);
+	printLabel("Next step", "Expo is still preparing the launch flow. Run the command again in a moment.");
+}
+const submitStatusCommand = {
+	command: "status <projectId> <submissionId>",
+	describe: "Check the status of an App Store submission",
+	builder: (yargs) => yargs.positional("projectId", {
+		type: "string",
+		demandOption: true,
+		describe: "The project ID"
+	}).positional("submissionId", {
+		type: "string",
+		demandOption: true,
+		describe: "The submission ID"
+	}).example("anything projects submit status <project-id> <submission-id>", "Check a submission later").example("anything projects submit status <project-id> <submission-id> --json", "Return the submission status in JSON"),
+	handler: async (argv) => {
+		const command = "projects submit status";
+		const config = resolveConfig({
+			dev: argv.dev,
+			apiUrl: argv.apiUrl
+		});
+		if (config.isErr()) {
+			outputError({
+				argv,
+				command,
+				error: {
+					message: config.error.message,
+					status: null
+				},
+				exitCode: 4
+			});
+			return;
+		}
+		const result = await new AnythingApiClient(config.value).getProjectSubmission({
+			projectGroupId: argv.projectId,
+			submissionId: argv.submissionId
+		});
+		if (result.isErr()) {
+			outputError({
+				argv,
+				command,
+				error: result.error
+			});
+			return;
+		}
+		printSubmissionResult({
+			argv,
+			command,
+			pendingMessage: "Submission is still preparing.",
+			submission: result.value.submission
+		});
+	}
+};
+const submitCommand = {
+	command: "submit <projectId>",
+	describe: "Start an App Store submission for an app",
+	builder: (yargs) => yargs.command(submitStatusCommand).positional("projectId", {
+		type: "string",
+		demandOption: true,
+		describe: "The project ID"
+	}).option("store", {
+		type: "string",
+		choices: STORE_CHOICES,
+		describe: "Submission target store"
+	}).example("anything projects submit <project-id> --store app-store", "Start an App Store submission").example("anything projects submit <project-id> --store play-store", "Start a Play Store submission").example("anything projects submit <project-id> --store app-store --json", "Return the submission session in JSON").example("anything projects submit status <project-id> <submission-id>", "Check a submission later"),
+	handler: async (argv) => {
+		const command = "projects submit";
+		if (argv.store === void 0) {
+			outputError({
+				argv,
+				command,
+				error: {
+					message: "Missing required argument: store",
+					status: null
+				},
+				exitCode: 2
+			});
+			return;
+		}
+		const store = STORE_CHOICES.find((s) => s === argv.store);
+		if (!store) {
+			outputError({
+				argv,
+				command,
+				error: {
+					message: `Unsupported store: ${argv.store}`,
+					status: null
+				},
+				exitCode: 2
+			});
+			return;
+		}
+		if (argv["dry-run"]) {
+			outputDryRun({
+				argv,
+				command,
+				plannedActions: [{
+					action: "submit_project",
+					projectGroupId: argv.projectId,
+					store
+				}]
+			});
+			return;
+		}
+		const config = resolveConfig({
+			dev: argv.dev,
+			apiUrl: argv.apiUrl
+		});
+		if (config.isErr()) {
+			outputError({
+				argv,
+				command,
+				error: {
+					message: config.error.message,
+					status: null
+				},
+				exitCode: 4
+			});
+			return;
+		}
+		const client = new AnythingApiClient(config.value);
+		const startResult = await client.submitProject({
+			projectGroupId: argv.projectId,
+			store
+		});
+		if (startResult.isErr()) {
+			outputError({
+				argv,
+				command,
+				error: startResult.error
+			});
+			return;
+		}
+		const finalResult = await waitForSubmission({
+			client,
+			projectGroupId: argv.projectId,
+			submission: startResult.value.submission
+		});
+		if (finalResult.isErr()) {
+			outputError({
+				argv,
+				command,
+				error: finalResult.error
+			});
+			return;
+		}
+		printSubmissionResult({
+			argv,
+			command,
+			pendingMessage: "Submission started.",
+			submission: finalResult.value
+		});
+	}
+};
+//#endregion
+//#region src/commands/introspect.ts
+const commandTree = [
+	{
+		name: "auth login",
+		flags: [{
+			name: "--api-key",
+			type: "string",
+			required: false
+		}, {
+			name: "--dev",
+			type: "boolean",
+			required: false
+		}],
+		idempotent: true,
+		destructive: false
+	},
+	{
+		name: "auth logout",
+		flags: [],
+		idempotent: true,
+		destructive: true
+	},
+	{
+		name: "auth status",
+		flags: [],
+		idempotent: true,
+		destructive: false
+	},
+	{
+		name: "user",
+		flags: [{
+			name: "--brief",
+			type: "boolean",
+			required: false
+		}],
+		idempotent: true,
+		destructive: false
+	},
+	{
+		name: "orgs list",
+		flags: [],
+		idempotent: true,
+		destructive: false
+	},
+	{
+		name: "orgs get",
+		flags: [{
+			name: "<organizationId>",
+			type: "string",
+			required: true
+		}],
+		idempotent: true,
+		destructive: false
+	},
+	{
+		name: "orgs set",
+		flags: [{
+			name: "<org-id>",
+			type: "string",
+			required: true
+		}],
+		idempotent: true,
+		destructive: false
+	},
+	{
+		name: "orgs unset",
+		flags: [],
+		idempotent: true,
+		destructive: false
+	},
+	{
+		name: "orgs members",
+		flags: [{
+			name: "<organizationId>",
+			type: "string",
+			required: true
+		}],
+		idempotent: true,
+		destructive: false
+	},
+	{
+		name: "projects list",
+		flags: [
+			{
+				name: "--org",
+				type: "string",
+				required: false
+			},
+			{
+				name: "--search",
+				type: "string",
+				required: false
+			},
+			{
+				name: "--limit",
+				type: "number",
+				required: false
+			}
+		],
+		idempotent: true,
+		destructive: false
+	},
+	{
+		name: "projects create",
+		flags: [
+			{
+				name: "--prompt",
+				type: "string",
+				required: true
+			},
+			{
+				name: "--org",
+				type: "string",
+				required: false
+			},
+			{
+				name: "--name",
+				type: "string",
+				required: false
+			},
+			{
+				name: "--wait",
+				type: "boolean",
+				required: false
+			},
+			{
+				name: "--no-wait",
+				type: "boolean",
+				required: false
+			}
+		],
+		idempotent: false,
+		destructive: false
+	},
+	{
+		name: "projects get",
+		flags: [{
+			name: "<projectId>",
+			type: "string",
+			required: true
+		}],
+		idempotent: true,
+		destructive: false
+	},
+	{
+		name: "projects generate",
+		flags: [
+			{
+				name: "<projectId>",
+				type: "string",
+				required: true
+			},
+			{
+				name: "--prompt",
+				type: "string",
+				required: true
+			},
+			{
+				name: "--thread",
+				type: "string",
+				required: false
 			},
 			{
 				name: "--new-thread",
@@ -6931,7 +7272,7 @@ const commandTree = [
 			name: "--store",
 			type: "string",
 			required: true,
-			choices: ["app-store"]
+			choices: [...STORE_CHOICES]
 		}],
 		idempotent: false,
 		destructive: false
@@ -7171,7 +7512,12 @@ const commandTree = [
 			{
 				name: "--env",
 				type: "string",
-				required: false
+				required: false,
+				choices: [
+					"development",
+					"preview",
+					"production"
+				]
 			}
 		],
 		idempotent: false,
@@ -7291,7 +7637,7 @@ const commandTree = [
 			{
 				name: "--name",
 				type: "string",
-				required: false
+				required: true
 			}
 		],
 		idempotent: false,
@@ -7317,6 +7663,10 @@ const commandTree = [
 			name: "<databaseId>",
 			type: "string",
 			required: true
+		}, {
+			name: "--mask",
+			type: "boolean",
+			required: false
 		}],
 		idempotent: true,
 		destructive: false
@@ -7473,7 +7823,13 @@ const commandTree = [
 			{
 				name: "--role",
 				type: "string",
-				required: false
+				required: false,
+				choices: [
+					"owner",
+					"admin",
+					"editor",
+					"viewer"
+				]
 			}
 		],
 		idempotent: false,
@@ -7512,7 +7868,13 @@ const commandTree = [
 			{
 				name: "<role>",
 				type: "string",
-				required: true
+				required: true,
+				choices: [
+					"owner",
+					"admin",
+					"editor",
+					"viewer"
+				]
 			},
 			{
 				name: "--org",
@@ -7703,7 +8065,10 @@ function readLinkedProject() {
 	try {
 		const raw = readFileSync(filePath, "utf8");
 		const data = JSON.parse(raw);
-		if (data.orgId && data.projectId) return data;
+		if (typeof data.projectId === "string" && data.projectId.length > 0) return {
+			orgId: typeof data.orgId === "string" && data.orgId.length > 0 ? data.orgId : null,
+			projectId: data.projectId
+		};
 		return null;
 	} catch {
 		return null;
@@ -7756,7 +8121,7 @@ const linkCommand = {
 			});
 			return;
 		}
-		const orgId = getStoredOrgId() ?? "";
+		const orgId = getStoredOrgId() ?? null;
 		const dir = join(process.cwd(), ANYTHING_DIR$1);
 		mkdirSync(dir, { recursive: true });
 		writeFileSync(join(dir, PROJECT_FILE), JSON.stringify({
@@ -7785,19 +8150,23 @@ const unlinkCommand = {
 	handler: (argv) => {
 		const command = "unlink";
 		const dir = join(process.cwd(), ANYTHING_DIR$1);
-		if (!existsSync(dir)) {
+		const projectFile = getProjectFilePath();
+		if (!existsSync(projectFile)) {
 			outputError({
 				argv,
 				command,
 				error: {
-					message: "No .anything/ directory found in current directory.",
+					message: "No linked project found in current directory.",
 					status: null
 				},
 				exitCode: 3
 			});
 			return;
 		}
-		rmSync(dir, { recursive: true });
+		rmSync(projectFile);
+		try {
+			if (existsSync(dir) && readdirSync(dir).length === 0) rmSync(dir, { recursive: true });
+		} catch {}
 		if (outputSuccess({
 			argv,
 			command,
@@ -7999,12 +8368,19 @@ const llmContextCommand = {
 //#endregion
 //#region src/commands/members.ts
+const MEMBER_ROLE_CHOICES = [
+	"owner",
+	"admin",
+	"editor",
+	"viewer"
+];
+const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 const membersListCommand = {
 	command: "list",
 	describe: "List organization members and pending invites",
 	builder: (yargs) => yargs.option("org", {
 		type: "string",
-		describe: "Organization ID"
+		describe: "Organization ID (defaults to the active org)"
 	}).example("anything members list --org org_123", "List members"),
 	handler: async (argv) => {
 		const command = "members list";
@@ -8093,13 +8469,26 @@ const membersInviteCommand = {
 		describe: "Email address to invite"
 	}).option("org", {
 		type: "string",
-		describe: "Organization ID"
+		describe: "Organization ID (defaults to the active org)"
 	}).option("role", {
 		type: "string",
-		describe: "Role to assign (e.g. admin, member)"
+		choices: MEMBER_ROLE_CHOICES,
+		describe: "Role to assign: owner, admin, editor, or viewer"
 	}).example("anything members invite user@example.com --org org_123", "Invite a member"),
 	handler: async (argv) => {
 		const command = "members invite";
+		if (!EMAIL_PATTERN.test(argv.email)) {
+			outputError({
+				argv,
+				command,
+				error: {
+					message: `Invalid email address: "${argv.email}".`,
+					status: null
+				},
+				exitCode: 2
+			});
+			return;
+		}
 		const config = resolveConfig({
 			dev: argv.dev,
 			apiUrl: argv.apiUrl
@@ -8179,7 +8568,7 @@ const membersRemoveCommand = {
 		describe: "Email address of the member to remove"
 	}).option("org", {
 		type: "string",
-		describe: "Organization ID"
+		describe: "Organization ID (defaults to the active org)"
 	}).option("yes", {
 		type: "boolean",
 		default: false,
@@ -8277,10 +8666,11 @@ const membersRoleCommand = {
 	}).positional("role", {
 		type: "string",
 		demandOption: true,
-		describe: "New role (e.g. admin, member)"
+		choices: MEMBER_ROLE_CHOICES,
+		describe: "New role: owner, admin, editor, or viewer"
 	}).option("org", {
 		type: "string",
-		describe: "Organization ID"
+		describe: "Organization ID (defaults to the active org)"
 	}).example("anything members role user@example.com admin --org org_123", "Change role to admin"),
 	handler: async (argv) => {
 		const command = "members role";
@@ -8317,6 +8707,19 @@ const membersRoleCommand = {
 			});
 			return;
 		}
+		if (argv["dry-run"]) {
+			outputDryRun({
+				argv,
+				command,
+				plannedActions: [{
+					action: "update_member_role",
+					org: orgResult.orgId,
+					email: argv.email,
+					role: argv.role
+				}]
+			});
+			return;
+		}
 		const result = await new AnythingApiClient(config.value).updateMemberRole({
 			organizationId: orgResult.orgId,
 			email: argv.email,
@@ -8625,20 +9028,28 @@ const orgsCommand = {
 //#endregion
 //#region src/stream.ts
+function resultErrorMessage(error) {
+	if (error && typeof error === "object" && "message" in error && typeof error.message === "string") return error.message;
+	return "Operation failed";
+}
 function createEmitter(argv) {
 	if (argv.quiet) return (_event) => {};
 	if (argv.json) return (event) => {
 		printNdjson(event);
 	};
 	return (event) => {
-		if (event.type === "progress") printStreamMarker(event.status === "complete" ? "done" : "progress", event.message ?? `${event.step}...`);
+		if (event.type === "progress") {
+			printStreamMarker(event.status === "complete" ? "done" : "progress", event.message ?? `${event.step}...`);
+			return;
+		}
+		if (event.type === "result" && !event.ok) printError(`[error] ${resultErrorMessage(event.error)}`);
 	};
 }
 //#endregion
 //#region src/watch-generation.ts
 const TIMEOUT_MS = 300 * 1e3;
-const POLL_INTERVAL_MS$1 = 3e3;
+const POLL_INTERVAL_MS = 3e3;
 const TERMINAL_SUCCESS_STATUSES = new Set(["COMPLETED", "VALID"]);
 const TERMINAL_FAILURE_STATUSES = new Set([
 	"INVALID",
@@ -8762,7 +9173,7 @@ async function pollUntilTerminal({ client, projectGroupId, emit, sleepFn = sleep
 	while (Date.now() < deadlineMs) {
 		const result = await client.getProjectStatus({ projectGroupId });
 		if (result.isErr()) {
-			await sleepFn(POLL_INTERVAL_MS$1);
+			await sleepFn(POLL_INTERVAL_MS);
 			continue;
 		}
 		const { status } = result.value;
@@ -8786,7 +9197,7 @@ async function pollUntilTerminal({ client, projectGroupId, emit, sleepFn = sleep
 			});
 			return false;
 		}
-		await sleepFn(POLL_INTERVAL_MS$1);
+		await sleepFn(POLL_INTERVAL_MS);
 	}
 	emit({
 		type: "result",
@@ -8845,7 +9256,11 @@ const createCommand = {
 	}).option("name", {
 		type: "string",
 		describe: "App name (optional)"
-	}).example("anything projects create --prompt \"Build a todo app\"", "Create an app using your saved organization").example("anything projects create --org org_1 --prompt \"Build a todo app\"", "Create an app in a specific organization").example("cat prompt.txt | anything projects create", "Create an app from stdin"),
+	}).option("wait", {
+		type: "boolean",
+		default: true,
+		describe: "Wait for generation to complete (use --no-wait to skip)"
+	}).example("anything projects create --prompt \"Build a todo app\"", "Create an app using your saved organization").example("anything projects create --org org_1 --prompt \"Build a todo app\"", "Create an app in a specific organization").example("cat prompt.txt | anything projects create", "Create an app from stdin").example("anything projects create --prompt \"Build a todo app\" --no-wait --json", "Create an app and return immediately without streaming"),
 	handler: async (argv) => {
 		const config = resolveConfig({
 			dev: argv.dev,
@@ -8934,6 +9349,25 @@ const createCommand = {
 			status: "complete",
 			message: "Project created"
 		});
+		if (!argv.wait) {
+			if (argv.quiet) {
+				console.log(result.value.projectGroupId);
+				return;
+			}
+			if (argv.json) {
+				printNdjson({
+					type: "result",
+					ok: true,
+					data: result.value
+				});
+				return;
+			}
+			printStreamMarker("done", `project ${result.value.projectGroupId} created`);
+			printSuccess("App created! Generation enqueued.");
+			printLabel("Project Group ID", result.value.projectGroupId);
+			printLabel("Revision ID", result.value.revisionId);
+			return;
+		}
 		emit({
 			type: "progress",
 			step: "generating",
@@ -9055,7 +9489,10 @@ const publishStatusCommand = {
 	}).example("anything projects publish status <project-id> <deployment-id>", "Check a deployment later").example("anything projects publish status <project-id> <deployment-id> --json", "Return deployment status in JSON"),
 	handler: async (argv) => {
 		const command = "projects publish status";
-		const config = resolveConfig({ dev: argv.dev });
+		const config = resolveConfig({
+			dev: argv.dev,
+			apiUrl: argv.apiUrl
+		});
 		if (config.isErr()) {
 			outputError({
 				argv,
@@ -9079,14 +9516,23 @@ const publishStatusCommand = {
 		}
 		const { deployment } = result.value;
 		if (deployment.status === "FAILED") {
-			process.exitCode = 1;
-			if (outputSuccess({
+			const failure = getDeploymentError({
+				result: {
+					outcome: "completed",
+					deployment
+				},
+				statusCommand: `anything deployments logs ${argv.deploymentId}`
+			});
+			outputError({
 				argv,
 				command,
-				data: { deployment },
-				primaryId: deployment.id
-			})) return;
-			printError(deployment.buildLogs ?? "Deployment failed (no logs available).");
+				error: {
+					message: failure?.message ?? "Deployment failed (no logs available).",
+					status: null
+				},
+				hint: `Inspect the full build logs with: anything deployments logs ${argv.deploymentId}`,
+				exitCode: failure?.exitCode ?? 1
+			});
 			return;
 		}
 		if (outputSuccess({
@@ -9338,7 +9784,7 @@ const list$1 = {
 		describe: "The project ID"
 	}).example("anything projects files list <id>", "List the files available in a project"),
 	handler: async (argv) => {
-		const command = "files list";
+		const command = "projects files list";
 		const config = resolveConfig({
 			dev: argv.dev,
 			apiUrl: argv.apiUrl
@@ -9393,7 +9839,7 @@ const get$1 = {
 		describe: "The file path"
 	}).example("anything projects files get <id> app/page.tsx", "Print a file to stdout"),
 	handler: async (argv) => {
-		const command = "files get";
+		const command = "projects files get";
 		const config = resolveConfig({
 			dev: argv.dev,
 			apiUrl: argv.apiUrl
@@ -9731,7 +10177,10 @@ const infoCommand = {
 		printLabel("Published URL", latestPublishedUrl);
 		printLabel("Created", new Date(info.createdAt).toLocaleString());
 		printLabel("Updated", new Date(info.updatedAt).toLocaleString());
-		for (const url of info.publishedUrls) printLabel("Published URL", url);
+		for (const url of info.publishedUrls) {
+			if (url === latestPublishedUrl) continue;
+			printLabel("Other Published URL", url);
+		}
 		if (info.files.length > 0) {
 			console.log();
 			printTable({
@@ -10006,6 +10455,96 @@ const logsCommand = {
 	}
 };
+//#endregion
+//#region src/format-assistant-message.ts
+const NAMED_ENTITIES = {
+	"&quot;": "\"",
+	"&apos;": "'",
+	"&#39;": "'",
+	"&lt;": "<",
+	"&gt;": ">",
+	"&nbsp;": " "
+};
+function decodeEntities(input) {
+	return input.replace(/&(?:quot|apos|#39|lt|gt|nbsp);/g, (m) => NAMED_ENTITIES[m] ?? m).replace(/&amp;/g, "&");
+}
+function stripTags(input) {
+	return input.replace(/<[^>]+>/g, "");
+}
+function parseAttrs(attrString) {
+	const attrs = {};
+	const re = /([a-zA-Z][\w-]*)="([^"]*)"/g;
+	let match;
+	while ((match = re.exec(attrString)) !== null) {
+		const [, key, value] = match;
+		if (key !== void 0 && value !== void 0) attrs[key] = value;
+	}
+	return attrs;
+}
+function firstLine(text) {
+	return (text.split("\n").map((l) => l.trim()).find(Boolean) ?? "").replace(/\*\*/g, "");
+}
+function indent(text) {
+	return text.split("\n").map((l) => `  ${l}`).join("\n");
+}
+function parseTodos(raw) {
+	if (!raw) return [];
+	try {
+		const parsed = JSON.parse(decodeEntities(raw));
+		if (!Array.isArray(parsed)) return [];
+		return parsed.filter((t) => !!t && typeof t === "object" && typeof t.content === "string").map((t) => ({
+			content: t.content,
+			status: typeof t.status === "string" ? t.status : "pending"
+		}));
+	} catch {
+		return [];
+	}
+}
+function renderBlock(attrs) {
+	const uiType = attrs.uiType ?? "block";
+	const text = decodeEntities(attrs.text ?? "").trim();
+	const subtext = decodeEntities(attrs.subtext ?? "").trim();
+	if (uiType === "todo-list") {
+		const lines = [`[plan] ${text || "Plan"}${subtext ? ` — ${subtext}` : ""}`];
+		for (const todo of parseTodos(attrs.todos)) {
+			const box = todo.status === "completed" ? "[x]" : todo.status === "in_progress" ? "[~]" : "[ ]";
+			lines.push(`  ${box} ${todo.content}`);
+		}
+		return lines.join("\n");
+	}
+	if (uiType === "thinking") {
+		const summary = firstLine(subtext) || text;
+		return summary ? `[thinking] ${summary}` : null;
+	}
+	if (uiType === "database") {
+		const code = decodeEntities(attrs.code ?? "").trim();
+		const head = `[database] ${text || "change"}`;
+		return code ? `${head}\n${indent(code)}` : head;
+	}
+	const parts = [text, subtext].filter(Boolean);
+	if (parts.length === 0) return null;
+	return `[${uiType}] ${parts.join(" — ")}`;
+}
+function formatAssistantMessage(raw) {
+	const blockRe = /<file-based-block\b([^>]*)>([\s\S]*?)<\/file-based-block>/g;
+	const segments = [];
+	let lastIndex = 0;
+	let hadBlock = false;
+	let match;
+	while ((match = blockRe.exec(raw)) !== null) {
+		hadBlock = true;
+		const between = stripTags(raw.slice(lastIndex, match.index)).trim();
+		if (between) segments.push(decodeEntities(between));
+		const rendered = renderBlock(parseAttrs(match[1] ?? ""));
+		if (rendered) segments.push(rendered);
+		lastIndex = blockRe.lastIndex;
+	}
+	if (!hadBlock) return decodeEntities(stripTags(raw)).trim();
+	const tail = stripTags(raw.slice(lastIndex)).trim();
+	if (tail) segments.push(decodeEntities(tail));
+	return segments.filter(Boolean).join("\n");
+}
 //#endregion
 //#region src/commands/messages.ts
 const COMMAND$9 = "projects messages";
@@ -10014,7 +10553,13 @@ function formatMessage(msg) {
 	const status = msg.status === "VALID" ? styleText("green", msg.status) : msg.status === "BUILDING" ? styleText("yellow", msg.status) : styleText("red", msg.status);
 	console.log(styleText("dim", `─── ${time} ─── ${status} ───`));
 	if (msg.userMessage) console.log(styleText("bold", "You: ") + msg.userMessage);
-	if (msg.assistantMessage) console.log(styleText("bold", "Assistant: ") + msg.assistantMessage);
+	if (msg.assistantMessage) {
+		const text = formatAssistantMessage(msg.assistantMessage);
+		if (text) {
+			console.log(styleText("bold", "Assistant:"));
+			console.log(text);
+		}
+	}
 	console.log();
 }
 const messagesCommand = {
@@ -10061,12 +10606,15 @@ const messagesCommand = {
 			});
 			return;
 		}
+		const { messages } = result.value;
 		if (outputSuccess({
 			argv,
 			command: COMMAND$9,
-			data: result.value
+			data: { messages: messages.map((msg) => ({
+				...msg,
+				assistantText: msg.assistantMessage ? formatAssistantMessage(msg.assistantMessage) : null
+			})) }
 		})) return;
-		const { messages } = result.value;
 		if (messages.length === 0) {
 			console.log("No messages found.");
 			return;
@@ -10223,6 +10771,11 @@ const renameCommand = {
 //#endregion
 //#region src/commands/secrets.ts
+const secretEnvironmentChoices = [
+	"development",
+	"preview",
+	"production"
+];
 const add = {
 	command: "add <projectId>",
 	describe: "Add a secret to an app",
@@ -10239,10 +10792,11 @@ const add = {
 		describe: "Secret value. If omitted, reads stdin when piped."
 	}).option("env", {
 		type: "string",
-		describe: "Environment (development, preview, production)"
+		choices: secretEnvironmentChoices,
+		describe: "Target environment for the secret"
 	}).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 = "secrets add";
+		const command = "projects secrets add";
 		if (argv["dry-run"]) {
 			outputDryRun({
 				argv,
@@ -10251,7 +10805,7 @@ const add = {
 					action: "add_secret",
 					projectGroupId: argv.projectId,
 					name: argv.name,
-					...argv.env ? { environment: argv.env } : {}
+					...argv.env ? { environment: argv.env.toUpperCase() } : {}
 				}]
 			});
 			return;
@@ -10293,7 +10847,7 @@ const add = {
 			projectGroupId: argv.projectId,
 			displayName: argv.name,
 			value: valueResult.value,
-			environment: argv.env ?? null
+			environment: argv.env ? argv.env.toUpperCase() : null
 		});
 		if (result.isErr()) {
 			outputError({
@@ -10327,18 +10881,34 @@ const remove = {
 		type: "string",
 		demandOption: true,
 		describe: "The secret ID to remove"
-	}).example("anything projects secrets remove <project-id> <secret-id> --dry-run", "Preview a secret removal").example("anything projects secrets remove <project-id> <secret-id>", "Delete a secret"),
+	}).option("yes", {
+		type: "boolean",
+		default: false,
+		describe: "Skip confirmation"
+	}).example("anything projects secrets remove <project-id> <secret-id> --dry-run", "Preview a secret removal").example("anything projects secrets remove <project-id> <secret-id> --yes", "Delete a secret"),
 	handler: async (argv) => {
-		const command = "secrets remove";
+		const command = "projects secrets remove";
 		if (argv["dry-run"]) {
 			outputDryRun({
 				argv,
 				command,
-				plannedActions: [{
-					action: "remove_secret",
-					projectGroupId: argv.projectId,
-					secretId: argv.secretId
-				}]
+				plannedActions: [{
+					action: "remove_secret",
+					projectGroupId: argv.projectId,
+					secretId: argv.secretId
+				}]
+			});
+			return;
+		}
+		if (!argv.yes) {
+			outputError({
+				argv,
+				command,
+				error: {
+					message: "Removing a secret is destructive. Pass --yes to confirm.",
+					status: null
+				},
+				exitCode: 2
 			});
 			return;
 		}
@@ -10388,7 +10958,7 @@ const list = {
 		describe: "The project ID"
 	}).example("anything projects secrets list <project-id>", "List secrets for an app"),
 	handler: async (argv) => {
-		const command = "secrets list";
+		const command = "projects secrets list";
 		const config = resolveConfig({
 			dev: argv.dev,
 			apiUrl: argv.apiUrl
@@ -10515,272 +11085,41 @@ function parseSecrets({ secretArgs, environment }) {
 			environment
 		});
 	}
-	return {
-		ok: true,
-		value: secrets
-	};
-}
-function resolveSecretEnvironment(environment) {
-	switch (environment) {
-		case "development":
-		case "preview":
-		case "production": return environment;
-		default: return null;
-	}
-}
-const get = {
-	command: "get [projectId]",
-	describe: "Read project auth settings",
-	builder: (yargs) => yargs.positional("projectId", {
-		type: "string",
-		describe: "The project ID. Falls back to the current project set via `anything projects set`."
-	}).example("anything projects settings auth get <project-id>", "Inspect auth provider state for a project").example("anything projects settings auth get --json", "Return auth settings for the current project in JSON"),
-	handler: async (argv) => {
-		const command = "settings auth get";
-		const projectGroupId = resolveProjectGroupId(argv.projectId);
-		if (projectGroupId === null) {
-			outputError({
-				argv,
-				command,
-				error: {
-					message: "No project specified. Pass a project ID or run `anything projects set <project-id>`.",
-					status: null
-				},
-				exitCode: 2
-			});
-			return;
-		}
-		const config = resolveConfig({
-			dev: argv.dev,
-			apiUrl: argv.apiUrl
-		});
-		if (config.isErr()) {
-			outputError({
-				argv,
-				command,
-				error: {
-					message: config.error.message,
-					status: null
-				},
-				exitCode: 4
-			});
-			return;
-		}
-		const result = await new AnythingApiClient(config.value).getProjectAuthSettings({ projectGroupId });
-		if (result.isErr()) {
-			outputError({
-				argv,
-				command,
-				error: result.error
-			});
-			return;
-		}
-		if (outputSuccess({
-			argv,
-			command,
-			data: result.value
-		})) return;
-		printAuthSettings(result.value);
-	}
-};
-const set = {
-	command: "set [projectId]",
-	describe: "Update project auth settings for a provider",
-	builder: (yargs) => yargs.positional("projectId", {
-		type: "string",
-		describe: "The project ID. Falls back to the current project set via `anything projects set`."
-	}).option("provider", {
-		choices: authProviderChoices,
-		demandOption: true,
-		describe: "The auth provider to update"
-	}).option("enabled", {
-		type: "boolean",
-		demandOption: true,
-		describe: "Whether to enable the provider. Use --no-enabled to disable it."
-	}).option("secret", {
-		type: "string",
-		array: true,
-		describe: "Provider secret in ENV_KEY=VALUE format. Repeat for multiple secrets."
-	}).option("env", {
-		choices: authEnvironmentChoices,
-		default: "production",
-		describe: "Environment for secrets passed via --secret"
-	}).example("anything projects settings auth set <project-id> --provider google --enabled --secret GOOGLE_CLIENT_ID=abc --secret GOOGLE_CLIENT_SECRET=def", "Enable Google auth and store provider secrets").example("anything projects settings auth set <project-id> --provider email --no-enabled", "Disable email auth"),
-	handler: async (argv) => {
-		const command = "settings auth set";
-		const projectGroupId = resolveProjectGroupId(argv.projectId);
-		if (projectGroupId === null) {
-			outputError({
-				argv,
-				command,
-				error: {
-					message: "No project specified. Pass a project ID or run `anything projects set <project-id>`.",
-					status: null
-				},
-				exitCode: 2
-			});
-			return;
-		}
-		const secretEnvironment = resolveSecretEnvironment(argv.env);
-		if (secretEnvironment === null) {
-			outputError({
-				argv,
-				command,
-				error: {
-					message: `Invalid --env value "${argv.env}".`,
-					status: null
-				},
-				exitCode: 2
-			});
-			return;
-		}
-		const secretsResult = parseSecrets({
-			secretArgs: argv.secret ?? [],
-			environment: secretEnvironment
-		});
-		if (!secretsResult.ok) {
-			outputError({
-				argv,
-				command,
-				error: {
-					message: secretsResult.error,
-					status: null
-				},
-				exitCode: 2
-			});
-			return;
-		}
-		const config = resolveConfig({
-			dev: argv.dev,
-			apiUrl: argv.apiUrl
-		});
-		if (config.isErr()) {
-			outputError({
-				argv,
-				command,
-				error: {
-					message: config.error.message,
-					status: null
-				},
-				exitCode: 4
-			});
-			return;
-		}
-		const result = await new AnythingApiClient(config.value).updateProjectAuthSettings({
-			projectGroupId,
-			provider: argv.provider,
-			enabled: argv.enabled,
-			secrets: secretsResult.value,
-			enableForAllModules: false
-		});
-		if (result.isErr()) {
-			outputError({
-				argv,
-				command,
-				error: result.error
-			});
-			return;
-		}
-		if (outputSuccess({
-			argv,
-			command,
-			data: result.value
-		})) return;
-		printSuccess("Auth settings updated.");
-		printAuthSettings(result.value);
-	}
-};
-const authSettingsCommand = {
-	command: "auth <command>",
-	describe: "Manage auth-related project settings",
-	builder: (yargs) => yargs.command(get).command(set).demandCommand(),
-	handler: () => {}
-};
-//#endregion
-//#region src/commands/settings.ts
-const settingsCommand = {
-	command: "settings <command>",
-	describe: "Inspect and update project settings",
-	builder: (yargs) => yargs.command(authSettingsCommand).example("anything projects settings auth get <project-id>", "Inspect project auth settings").demandCommand(),
-	handler: () => {}
-};
-//#endregion
-//#region src/commands/submit.ts
-const POLL_INTERVAL_MS = 2e3;
-const POLL_TIMEOUT_MS = 6e4;
-async function waitForSubmission({ client, projectGroupId, submission }) {
-	const deadline = Date.now() + POLL_TIMEOUT_MS;
-	let current = submission;
-	while (current.status === "PENDING" && Date.now() < deadline) {
-		const latestResult = await client.getProjectSubmission({
-			projectGroupId,
-			submissionId: current.id
-		});
-		if (latestResult.isErr()) return latestResult.map((value) => value.submission);
-		current = latestResult.value.submission;
-		if (current.status !== "PENDING") return latestResult.map((value) => value.submission);
-		await setTimeout$1(POLL_INTERVAL_MS);
-	}
-	return ok(current);
-}
-function printSubmissionResult({ argv, command, pendingMessage, submission }) {
-	const { projectGroupId: projectId, ...submissionRest } = submission;
-	const submissionOut = {
-		projectId,
-		...submissionRest
-	};
-	if (submission.status === "FAILED") {
-		printError(submission.errorMessage ?? "Submission failed.");
-		process.exitCode = 1;
-		return;
-	}
-	if (submission.status === "CREATED") {
-		if (outputSuccess({
-			argv,
-			command,
-			data: {
-				success: true,
-				submission: submissionOut
-			},
-			primaryId: submission.id
-		})) return;
-		printSuccess("App Store submission is ready.");
-		printLabel("Submission ID", submission.id);
-		printLabel("Launch URL", submission.launchUrl);
-		printLabel("Auth URL", submission.authUrl);
-		printLabel("Expires At", submission.expiresAt);
-		return;
-	}
-	if (outputSuccess({
-		argv,
-		command,
-		data: {
-			success: true,
-			submission
-		},
-		primaryId: submission.id
-	})) return;
-	printSuccess(pendingMessage);
-	printLabel("Submission ID", submission.id);
-	printLabel("Status", submission.status);
-	printLabel("Next step", "Expo is still preparing the launch flow. Run the command again in a moment.");
+	return {
+		ok: true,
+		value: secrets
+	};
 }
-const submitStatusCommand = {
-	command: "status <projectId> <submissionId>",
-	describe: "Check the status of an App Store submission",
+function resolveSecretEnvironment(environment) {
+	switch (environment) {
+		case "development":
+		case "preview":
+		case "production": return environment;
+		default: return null;
+	}
+}
+const get = {
+	command: "get [projectId]",
+	describe: "Read project auth settings",
 	builder: (yargs) => yargs.positional("projectId", {
 		type: "string",
-		demandOption: true,
-		describe: "The project ID"
-	}).positional("submissionId", {
-		type: "string",
-		demandOption: true,
-		describe: "The submission ID"
-	}).example("anything projects submit status <project-id> <submission-id>", "Check a submission later").example("anything projects submit status <project-id> <submission-id> --json", "Return the submission status in JSON"),
+		describe: "The project ID. Falls back to the current project set via `anything projects set`."
+	}).example("anything projects settings auth get <project-id>", "Inspect auth provider state for a project").example("anything projects settings auth get --json", "Return auth settings for the current project in JSON"),
 	handler: async (argv) => {
-		const command = "projects submit status";
+		const command = "projects settings auth get";
+		const projectGroupId = resolveProjectGroupId(argv.projectId);
+		if (projectGroupId === null) {
+			outputError({
+				argv,
+				command,
+				error: {
+					message: "No project specified. Pass a project ID or run `anything projects set <project-id>`.",
+					status: null
+				},
+				exitCode: 2
+			});
+			return;
+		}
 		const config = resolveConfig({
 			dev: argv.dev,
 			apiUrl: argv.apiUrl
@@ -10797,10 +11136,7 @@ const submitStatusCommand = {
 			});
 			return;
 		}
-		const result = await new AnythingApiClient(config.value).getProjectSubmission({
-			projectGroupId: argv.projectId,
-			submissionId: argv.submissionId
-		});
+		const result = await new AnythingApiClient(config.value).getProjectAuthSettings({ projectGroupId });
 		if (result.isErr()) {
 			outputError({
 				argv,
@@ -10809,102 +11145,151 @@ const submitStatusCommand = {
 			});
 			return;
 		}
-		printSubmissionResult({
+		if (outputSuccess({
 			argv,
 			command,
-			pendingMessage: "Submission is still preparing.",
-			submission: result.value.submission
-		});
+			data: result.value
+		})) return;
+		printAuthSettings(result.value);
 	}
 };
-const submitCommand = {
-	command: "submit <projectId>",
-	describe: "Start an App Store submission for an app",
-	builder: (yargs) => yargs.command(submitStatusCommand).positional("projectId", {
+const set = {
+	command: "set [projectId]",
+	describe: "Update project auth settings for a provider",
+	builder: (yargs) => yargs.positional("projectId", {
 		type: "string",
+		describe: "The project ID. Falls back to the current project set via `anything projects set`."
+	}).option("provider", {
+		choices: authProviderChoices,
 		demandOption: true,
-		describe: "The project ID"
-	}).option("store", {
+		describe: "The auth provider to update"
+	}).option("enabled", {
+		type: "boolean",
+		demandOption: true,
+		describe: "Whether to enable the provider. Use --no-enabled to disable it."
+	}).option("secret", {
 		type: "string",
-		choices: ["app-store"],
-		describe: "Submission target store"
-	}).example("anything projects submit <project-id> --store app-store", "Start an App Store submission").example("anything projects submit <project-id> --store app-store --json", "Return the submission session in JSON").example("anything projects submit status <project-id> <submission-id>", "Check a submission later"),
+		array: true,
+		describe: "Provider secret in ENV_KEY=VALUE format. Repeat for multiple secrets."
+	}).option("env", {
+		choices: authEnvironmentChoices,
+		default: "production",
+		describe: "Environment for secrets passed via --secret"
+	}).example("anything projects settings auth set <project-id> --provider google --enabled --secret GOOGLE_CLIENT_ID=abc --secret GOOGLE_CLIENT_SECRET=def", "Enable Google auth and store provider secrets").example("anything projects settings auth set <project-id> --provider email --no-enabled", "Disable email auth"),
 	handler: async (argv) => {
-		const command = "projects submit";
-		if (argv.store === void 0) {
+		const command = "projects settings auth set";
+		const projectGroupId = resolveProjectGroupId(argv.projectId);
+		if (projectGroupId === null) {
 			outputError({
 				argv,
 				command,
 				error: {
-					message: "Missing required argument: store",
+					message: "No project specified. Pass a project ID or run `anything projects set <project-id>`.",
 					status: null
 				},
 				exitCode: 2
 			});
 			return;
 		}
-		if (argv.store !== "app-store") {
+		const secretEnvironment = resolveSecretEnvironment(argv.env);
+		if (secretEnvironment === null) {
 			outputError({
 				argv,
 				command,
 				error: {
-					message: "Unsupported store.",
+					message: `Invalid --env value "${argv.env}".`,
 					status: null
 				},
 				exitCode: 2
 			});
 			return;
 		}
-		const config = resolveConfig({
-			dev: argv.dev,
-			apiUrl: argv.apiUrl
+		const secretsResult = parseSecrets({
+			secretArgs: argv.secret ?? [],
+			environment: secretEnvironment
 		});
-		if (config.isErr()) {
+		if (!secretsResult.ok) {
 			outputError({
 				argv,
 				command,
 				error: {
-					message: config.error.message,
+					message: secretsResult.error,
 					status: null
 				},
-				exitCode: 4
+				exitCode: 2
 			});
 			return;
 		}
-		const client = new AnythingApiClient(config.value);
-		const startResult = await client.submitProject({
-			projectGroupId: argv.projectId,
-			store: argv.store
+		if (argv["dry-run"]) {
+			outputDryRun({
+				argv,
+				command,
+				plannedActions: [{
+					action: "update_auth_settings",
+					projectGroupId,
+					provider: argv.provider,
+					enabled: argv.enabled,
+					environment: secretEnvironment,
+					secretKeys: secretsResult.value.map((secret) => secret.envKey)
+				}]
+			});
+			return;
+		}
+		const config = resolveConfig({
+			dev: argv.dev,
+			apiUrl: argv.apiUrl
 		});
-		if (startResult.isErr()) {
+		if (config.isErr()) {
 			outputError({
 				argv,
 				command,
-				error: startResult.error
+				error: {
+					message: config.error.message,
+					status: null
+				},
+				exitCode: 4
 			});
 			return;
 		}
-		const finalResult = await waitForSubmission({
-			client,
-			projectGroupId: argv.projectId,
-			submission: startResult.value.submission
+		const result = await new AnythingApiClient(config.value).updateProjectAuthSettings({
+			projectGroupId,
+			provider: argv.provider,
+			enabled: argv.enabled,
+			secrets: secretsResult.value,
+			enableForAllModules: false
 		});
-		if (finalResult.isErr()) {
+		if (result.isErr()) {
 			outputError({
 				argv,
 				command,
-				error: finalResult.error
+				error: result.error
 			});
 			return;
 		}
-		printSubmissionResult({
+		if (outputSuccess({
 			argv,
 			command,
-			pendingMessage: "Submission started.",
-			submission: finalResult.value
-		});
+			data: result.value
+		})) return;
+		printSuccess("Auth settings updated.");
+		printAuthSettings(result.value);
 	}
 };
+const authSettingsCommand = {
+	command: "auth <command>",
+	describe: "Manage auth-related project settings",
+	builder: (yargs) => yargs.command(get).command(set).demandCommand(),
+	handler: () => {}
+};
+//#endregion
+//#region src/commands/settings.ts
+const settingsCommand = {
+	command: "settings <command>",
+	describe: "Inspect and update project settings",
+	builder: (yargs) => yargs.command(authSettingsCommand).example("anything projects settings auth get <project-id>", "Inspect project auth settings").demandCommand(),
+	handler: () => {}
+};
 //#endregion
 //#region src/commands/unpublish.ts
@@ -10922,6 +11307,17 @@ const unpublishCommand = {
 		describe: "Confirm unpublishing without prompting"
 	}).example("anything projects unpublish <project-id> --yes", "Remove a published app from production").example("anything projects unpublish <project-id> --json --yes", "Unpublish an app and capture the result in JSON"),
 	handler: async (argv) => {
+		if (argv["dry-run"]) {
+			outputDryRun({
+				argv,
+				command: COMMAND$6,
+				plannedActions: [{
+					action: "unpublish_project",
+					projectGroupId: argv.projectId
+				}]
+			});
+			return;
+		}
 		if (!argv.yes && !isNonInteractive(argv)) {
 			outputError({
 				argv,
@@ -10934,17 +11330,6 @@ const unpublishCommand = {
 			});
 			return;
 		}
-		if (argv["dry-run"]) {
-			outputDryRun({
-				argv,
-				command: COMMAND$6,
-				plannedActions: [{
-					action: "unpublish_project",
-					projectGroupId: argv.projectId
-				}]
-			});
-			return;
-		}
 		const config = resolveConfig({
 			dev: argv.dev,
 			apiUrl: argv.apiUrl
@@ -11002,6 +11387,17 @@ const deleteProjectCommand = {
 		describe: "Confirm deletion without prompting"
 	}).example("anything projects delete <project-id> --yes", "Delete a project permanently").example("anything projects delete <project-id> --yes --json", "Delete a project and capture the result in JSON"),
 	handler: async (argv) => {
+		if (argv["dry-run"]) {
+			outputDryRun({
+				argv,
+				command: COMMAND$5,
+				plannedActions: [{
+					action: "delete_project",
+					projectGroupId: argv.projectId
+				}]
+			});
+			return;
+		}
 		if (!argv.yes && !isNonInteractive(argv)) {
 			outputError({
 				argv,
@@ -11014,17 +11410,6 @@ const deleteProjectCommand = {
 			});
 			return;
 		}
-		if (argv["dry-run"]) {
-			outputDryRun({
-				argv,
-				command: COMMAND$5,
-				plannedActions: [{
-					action: "delete_project",
-					projectGroupId: argv.projectId
-				}]
-			});
-			return;
-		}
 		const config = resolveConfig({
 			dev: argv.dev,
 			apiUrl: argv.apiUrl
@@ -11044,10 +11429,12 @@ const deleteProjectCommand = {
 		const startTime = performance.now();
 		const result = await new AnythingApiClient(config.value).deleteProject({ projectGroupId: argv.projectId });
 		if (result.isErr()) {
+			const hint = result.error.status === 404 ? "If the project ID is correct, project deletion may not be enabled for your account." : void 0;
 			outputError({
 				argv,
 				command: COMMAND$5,
-				error: result.error
+				error: result.error,
+				hint
 			});
 			return;
 		}
@@ -11153,11 +11540,16 @@ const projectsSetCommand = {
 			return;
 		}
 		setStoredProjectGroupId(result.value.id);
-		if (argv.json) printJson({
-			projectId: result.value.id,
-			name: result.value.name
-		});
-		else printSuccess(`Current project set to ${result.value.name} (${result.value.id})`);
+		if (outputSuccess({
+			argv,
+			command: "projects set",
+			data: {
+				projectId: result.value.id,
+				name: result.value.name
+			},
+			primaryId: result.value.id
+		})) return;
+		printSuccess(`Current project set to ${result.value.name} (${result.value.id})`);
 	}
 };
 const projectsUnsetCommand = {
@@ -11166,8 +11558,12 @@ const projectsUnsetCommand = {
 	builder: (yargs) => yargs.example("anything projects unset", "Clear the saved project"),
 	handler: (argv) => {
 		clearStoredProjectGroupId();
-		if (argv.json) printJson({ projectId: null });
-		else printSuccess("Current project cleared.");
+		if (outputSuccess({
+			argv,
+			command: "projects unset",
+			data: { projectId: null }
+		})) return;
+		printSuccess("Current project cleared.");
 	}
 };
 const projectsCommand = {
@@ -11181,7 +11577,8 @@ const projectsCommand = {
 //#region src/commands/pull.ts
 const ANYTHING_DIR = ".anything";
 const FILES_DIR = "files";
-async function pullFiles({ client, projectGroupId }) {
+const DEFAULT_TIMEOUT_SECONDS = 60;
+async function pullFiles({ client, projectGroupId, argv }) {
 	const listResult = await client.listProjectFiles({ projectGroupId });
 	if (listResult.isErr()) {
 		printApiError(listResult.error);
@@ -11190,6 +11587,7 @@ async function pullFiles({ client, projectGroupId }) {
 	}
 	const filesDir = join(process.cwd(), ANYTHING_DIR, FILES_DIR);
 	if (!existsSync(filesDir)) mkdirSync(filesDir, { recursive: true });
+	const totalFiles = listResult.value.files.length;
 	const pulled = [];
 	for (const file of listResult.value.files) {
 		const fileResult = await client.getProjectFile({
@@ -11205,6 +11603,12 @@ async function pullFiles({ client, projectGroupId }) {
 		if (!existsSync(destDir)) mkdirSync(destDir, { recursive: true });
 		writeFileSync(destPath, fileResult.value.file.content);
 		pulled.push(file.path);
+		if (argv.json) printNdjson({
+			type: "progress",
+			file: file.path,
+			completed: pulled.length,
+			total: totalFiles
+		});
 	}
 	return pulled;
 }
@@ -11231,8 +11635,13 @@ const pullCommand = {
 	}).option("env", {
 		type: "boolean",
 		describe: "Write secret names to .env.example only"
+	}).option("timeout", {
+		type: "number",
+		default: DEFAULT_TIMEOUT_SECONDS,
+		describe: "Request timeout in seconds"
 	}).example("anything pull", "Pull files + secret names").example("anything pull --files", "Pull project files only").example("anything pull --env", "Write secret names to .env.example"),
 	handler: async (argv) => {
+		const startTime = performance.now();
 		const linked = readLinkedProject();
 		if (!linked) {
 			printError("No linked project. Run `anything link <project-id>` first.");
@@ -11248,7 +11657,8 @@ const pullCommand = {
 			process.exitCode = 1;
 			return;
 		}
-		const client = new AnythingApiClient(config.value);
+		const timeoutSeconds = argv.timeout ?? DEFAULT_TIMEOUT_SECONDS;
+		const client = new AnythingApiClient(config.value, { timeoutMs: timeoutSeconds * 1e3 });
 		const pullBoth = !argv.files && !argv.env;
 		const projectResult = await client.getProject({ projectGroupId: linked.projectId });
 		if (projectResult.isErr()) {
@@ -11261,7 +11671,8 @@ const pullCommand = {
 		if (pullBoth || argv.files) {
 			pulledFiles = await pullFiles({
 				client,
-				projectGroupId: linked.projectId
+				projectGroupId: linked.projectId,
+				argv
 			});
 			if (pulledFiles === null) return;
 		}
@@ -11276,6 +11687,7 @@ const pullCommand = {
 		if (outputSuccess({
 			argv,
 			command: "pull",
+			startTime,
 			data: {
 				projectId: linked.projectId,
 				projectName: projectResult.value.name,
@@ -11296,9 +11708,9 @@ const pullCommand = {
 //#region src/commands/ship.ts
 const COMMAND$4 = "ship";
 const shipCommand = {
-	command: "ship",
+	command: "ship [prompt]",
 	describe: "Create or update + generate + publish in one shot",
-	builder: (yargs) => yargs.option("prompt", {
+	builder: (yargs) => yargs.positional("prompt", {
 		type: "string",
 		describe: "What to build or change. Reads stdin if omitted."
 	}).option("project", {
@@ -11321,7 +11733,7 @@ const shipCommand = {
 		type: "boolean",
 		default: true,
 		describe: "Wait for deployment to complete (use --no-wait to skip)"
-	}).example("anything ship --prompt \"Build a todo app with auth\"", "Create, generate, and publish a new app").example("anything ship --project pg_123 --prompt \"Add a settings page\"", "Iterate on existing app and publish").example("anything ship --project pg_123 --skip-publish --prompt \"Add dark mode\"", "Generate changes without publishing").example("anything ship --no-wait --prompt \"Build a landing page\"", "Ship without waiting for deployment"),
+	}).example("anything ship \"Build a markdown viewer to review blog posts\"", "Create, generate, and publish a new app").example("anything ship --project pg_123 \"Add a settings page\"", "Iterate on existing app and publish").example("anything ship --project pg_123 --skip-publish \"Add dark mode\"", "Generate changes without publishing").example("anything ship --no-wait \"Build a landing page\"", "Ship without waiting for deployment"),
 	handler: async (argv) => {
 		const promptResult = await resolveTextInput({
 			value: argv.prompt ?? null,
@@ -11575,13 +11987,14 @@ const skillCommand = {
 	}),
 	handler: async (argv) => {
 		if (argv.path) {
-			if (argv.json) {
-				printJson({
+			if (outputSuccess({
+				argv,
+				command: "skill",
+				data: {
 					name: "anything-cli",
 					path: skillRootPath
-				});
-				return;
-			}
+				}
+			})) return;
 			console.log(skillRootPath);
 			return;
 		}
@@ -11594,15 +12007,16 @@ const skillCommand = {
 			process.exitCode = 1;
 			return;
 		}
-		if (argv.json) {
-			printJson({
+		if (outputSuccess({
+			argv,
+			command: "skill",
+			data: {
 				name: "anything-cli",
 				path: skillRootPath,
 				file: relativePath,
 				content
-			});
-			return;
-		}
+			}
+		})) return;
 		process.stdout.write(content);
 	}
 };
@@ -12090,6 +12504,11 @@ const userCommand = {
 	command: "user",
 	aliases: ["whoami"],
 	describe: "Show current user and organization context",
+	builder: (yargs) => yargs.option("brief", {
+		type: "boolean",
+		default: false,
+		describe: "Show only identity essentials (id, name, email, active org)"
+	}).example("anything user --brief", "Show just the current identity").example("anything whoami --brief --json", "Identity essentials as JSON"),
 	handler: async (argv) => {
 		const config = resolveConfig({
 			dev: argv.dev,
@@ -12128,10 +12547,29 @@ const userCommand = {
 			defaultOrganizationHasCredits: defaultOrganization !== null ? BigInt(defaultOrganization.creditBalance) > 0n : null
 		};
 		const activeOrg = activeOrgId ? result.value.organizations.find((o) => o.id === activeOrgId) ?? null : null;
-		if (argv.quiet) {
+		if (argv.quiet && !argv.json) {
 			console.log(result.value.id);
 			return;
 		}
+		if (argv.brief) {
+			const briefData = {
+				id: result.value.id,
+				name: result.value.name ?? null,
+				email: result.value.email ?? null,
+				activeOrgId: activeOrgId ?? null,
+				activeOrgName: activeOrg?.name ?? null
+			};
+			if (outputSuccess({
+				argv,
+				command: COMMAND,
+				data: briefData
+			})) return;
+			printLabel("Name", briefData.name);
+			printLabel("Email", briefData.email);
+			printLabel("User ID", briefData.id);
+			printLabel("Active Org", activeOrg ? `${activeOrg.name} (${activeOrgId})` : null);
+			return;
+		}
 		if (outputSuccess({
 			argv,
 			command: COMMAND,