@primitivedotdev/cli 0.29.0 → 0.30.0

package/dist/oclif/index.js

@@ -7375,8 +7375,11 @@ const operationManifest = [
 				"type": "string"
 			},
 			{
+				"default": 50,
 				"description": "Number of results per page",
 				"enum": null,
+				"maximum": 100,
+				"minimum": 1,
 				"name": "limit",
 				"required": false,
 				"type": "integer"
@@ -7645,13 +7648,17 @@ const operationManifest = [
 				"type": "string"
 			},
 			{
+				"default": 50,
 				"description": "Number of results per page",
 				"enum": null,
+				"maximum": 100,
+				"minimum": 1,
 				"name": "limit",
 				"required": false,
 				"type": "integer"
 			},
 			{
+				"default": "true",
 				"description": "Include subject/body highlight snippets when text search is active.",
 				"enum": ["true", "false"],
 				"name": "snippet",
@@ -7659,6 +7666,7 @@ const operationManifest = [
 				"type": "string"
 			},
 			{
+				"default": "true",
 				"description": "Include facet counts for sender, domain, status, and attachment presence.",
 				"enum": ["true", "false"],
 				"name": "include_facets",
@@ -9114,8 +9122,11 @@ const operationManifest = [
 			"type": "string"
 		}],
 		"queryParams": [{
+			"default": 50,
 			"description": "Maximum number of rows to return. Clamped to 1..200; default\n50.\n",
 			"enum": null,
+			"maximum": 200,
+			"minimum": 1,
 			"name": "limit",
 			"required": false,
 			"type": "integer"
@@ -9950,8 +9961,11 @@ const operationManifest = [
 				"type": "string"
 			},
 			{
+				"default": 50,
 				"description": "Number of results per page",
 				"enum": null,
+				"maximum": 100,
+				"minimum": 1,
 				"name": "limit",
 				"required": false,
 				"type": "integer"
@@ -10523,8 +10537,11 @@ const operationManifest = [
 				"type": "string"
 			},
 			{
+				"default": 50,
 				"description": "Number of results per page",
 				"enum": null,
+				"maximum": 100,
+				"minimum": 1,
 				"name": "limit",
 				"required": false,
 				"type": "integer"
@@ -10988,6 +11005,22 @@ function flagName(parameterName) {
 function flagDescription(parameter) {
 	return parameter.description ?? parameter.name;
 }
+const numberFlag = Flags.custom({ async parse(input, _context, options) {
+	const trimmed = input.trim();
+	if (trimmed === "") throw new Errors.CLIError(`Expected a number but received: ${input}`);
+	const value = Number(trimmed);
+	if (!Number.isFinite(value)) throw new Errors.CLIError(`Expected a number but received: ${input}`);
+	if (options.min !== void 0 && value < options.min) throw new Errors.CLIError(`Expected a number greater than or equal to ${options.min} but received: ${input}`);
+	if (options.max !== void 0 && value > options.max) throw new Errors.CLIError(`Expected a number less than or equal to ${options.max} but received: ${input}`);
+	return value;
+} });
+function numericFlagOptions(parameter) {
+	return {
+		...typeof parameter.default === "number" ? { default: parameter.default } : {},
+		...typeof parameter.maximum === "number" ? { max: parameter.maximum } : {},
+		...typeof parameter.minimum === "number" ? { min: parameter.minimum } : {}
+	};
+}
 function extractBodyFields(schema) {
 	if (!schema || typeof schema !== "object") return [];
 	const properties = schema.properties;
@@ -11003,7 +11036,8 @@ function extractBodyFields(schema) {
 		if (typeof t === "string") {
 			displayType = t;
 			if (t === "string") kind = "string";
-			else if (t === "integer" || t === "number") kind = "integer";
+			else if (t === "integer") kind = "integer";
+			else if (t === "number") kind = "number";
 			else if (t === "boolean") kind = "boolean";
 			else if (t === "array") {
 				const items = propSchema.items;
@@ -11019,7 +11053,8 @@ function extractBodyFields(schema) {
 				const single = nonNull[0];
 				displayType = `${single}?`;
 				if (single === "string") kind = "string";
-				else if (single === "integer" || single === "number") kind = "integer";
+				else if (single === "integer") kind = "integer";
+				else if (single === "number") kind = "number";
 				else if (single === "boolean") kind = "boolean";
 				else kind = "complex";
 			} else {
@@ -11036,7 +11071,9 @@ function extractBodyFields(schema) {
 			required: required.has(name),
 			displayType,
 			kind,
-			...enumValues && enumValues.length > 0 ? { enumValues } : {}
+			...enumValues && enumValues.length > 0 ? { enumValues } : {},
+			...typeof propSchema.maximum === "number" ? { maximum: propSchema.maximum } : {},
+			...typeof propSchema.minimum === "number" ? { minimum: propSchema.minimum } : {}
 		});
 	}
 	return fields.sort((a, b) => {
@@ -11084,7 +11121,14 @@ function flagForParameter(parameter) {
 		required: parameter.required
 	};
 	if (parameter.type === "boolean") return Flags.boolean(common);
-	if (parameter.type === "integer") return Flags.integer(common);
+	if (parameter.type === "integer") return Flags.integer({
+		...common,
+		...numericFlagOptions(parameter)
+	});
+	if (parameter.type === "number") return numberFlag({
+		...common,
+		...numericFlagOptions(parameter)
+	});
 	if (parameter.enum && parameter.enum.length > 0) return Flags.string({
 		...common,
 		options: parameter.enum
@@ -11234,12 +11278,20 @@ const RESERVED_FLAG_NAMES = new Set([
 	"api-base-url-2",
 	"raw-body",
 	"body-file",
+	"envelope",
 	"output"
 ]);
 function bodyFieldFlag(field) {
 	const common = { description: field.description || field.name };
 	if (field.kind === "boolean") return Flags.boolean(common);
-	if (field.kind === "integer") return Flags.integer(common);
+	if (field.kind === "integer") return Flags.integer({
+		...common,
+		...numericFlagOptions(field)
+	});
+	if (field.kind === "number") return numberFlag({
+		...common,
+		...numericFlagOptions(field)
+	});
 	if (field.enumValues) return Flags.string({
 		...common,
 		options: field.enumValues
@@ -11264,6 +11316,7 @@ function buildFlags(operation) {
 		}),
 		time: Flags.boolean({ description: TIME_FLAG_DESCRIPTION })
 	};
+	if (!operation.binaryResponse) flags.envelope = Flags.boolean({ description: "Print the full response envelope, including pagination metadata such as meta.cursor. Defaults to printing only the data payload for backward compatibility." });
 	for (const parameter of [...operation.pathParams, ...operation.queryParams]) flags[flagName(parameter.name)] = flagForParameter(parameter);
 	const bodyFieldFlagToProperty = /* @__PURE__ */ new Map();
 	if (operation.hasJsonBody) {
@@ -11302,6 +11355,9 @@ function collectValues(parameters, flags) {
 	}
 	return values;
 }
+function operationOutputPayload(envelope, includeEnvelope) {
+	return includeEnvelope ? envelope ?? null : envelope?.data ?? null;
+}
 const OPERATION_HINTS = {
 	createFunction: "Tip: prefer `primitive functions deploy --name <name> --file <bundle>` for file-input ergonomics. This raw command exists for callers passing JSON.",
 	updateFunction: "Tip: prefer `primitive functions redeploy --id <id> --file <bundle>` for file-input ergonomics. This raw command exists for callers passing JSON.",
@@ -11409,7 +11465,7 @@ function createOperationCommand(operation) {
 				writeIdempotentReplayBannerIfReplay(envelope?.data, { write: (chunk) => {
 					process.stderr.write(chunk);
 				} });
-				this.log(JSON.stringify(envelope?.data ?? null, null, 2));
+				this.log(JSON.stringify(operationOutputPayload(envelope, parsedFlags.envelope === true), null, 2));
 			});
 		}
 	}
@@ -12167,6 +12223,92 @@ var EmailsWatchCommand = class EmailsWatchCommand extends Command {
 	}
 };
 //#endregion
+//#region src/oclif/function-deploy-wait.ts
+function validateDeployWaitFlags(params) {
+	if (params.timeoutSeconds < 0) return "--timeout must be greater than or equal to 0.";
+	if (params.pollIntervalSeconds <= 0) return "--poll-interval must be greater than 0.";
+	return null;
+}
+function isTerminal(status) {
+	return status === "deployed" || status === "failed";
+}
+function resultForTerminal(snapshot) {
+	if (snapshot.deploy_status === "failed") return {
+		function: snapshot,
+		kind: "failed"
+	};
+	return {
+		function: snapshot,
+		kind: "ok"
+	};
+}
+function toDeployWaitSnapshot(value) {
+	return {
+		...value.created_at !== void 0 ? { created_at: value.created_at } : {},
+		...value.deploy_error !== void 0 ? { deploy_error: value.deploy_error } : {},
+		deploy_status: value.deploy_status,
+		...value.deployed_at !== void 0 ? { deployed_at: value.deployed_at } : {},
+		gateway_url: value.gateway_url,
+		id: value.id,
+		name: value.name,
+		...value.updated_at !== void 0 ? { updated_at: value.updated_at } : {}
+	};
+}
+function elapsedSeconds(startedAt, now) {
+	return Math.max(0, Math.round((now() - startedAt) / 1e3));
+}
+async function defaultSleep(ms) {
+	await new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function waitForFunctionDeploy(params) {
+	const now = params.now ?? Date.now;
+	const sleep = params.sleep ?? defaultSleep;
+	const writeStderr = params.writeStderr ?? ((chunk) => {
+		process.stderr.write(chunk);
+	});
+	const startedAt = now();
+	const timeoutMs = params.timeoutSeconds * 1e3;
+	const pollIntervalMs = params.pollIntervalSeconds * 1e3;
+	const hasTimeout = params.timeoutSeconds > 0;
+	let last = params.initial ? toDeployWaitSnapshot(params.initial) : null;
+	let lastStatus = last?.deploy_status ?? "unknown";
+	if (last && isTerminal(last.deploy_status)) return resultForTerminal(last);
+	writeStderr(`Waiting for function ${params.id} deploy to finish (current status: ${lastStatus})...\n`);
+	while (true) {
+		const elapsedMs = now() - startedAt;
+		if (hasTimeout && elapsedMs >= timeoutMs) return {
+			elapsedSeconds: elapsedSeconds(startedAt, now),
+			kind: "timeout",
+			lastFunction: last
+		};
+		await sleep(hasTimeout ? Math.min(pollIntervalMs, Math.max(0, timeoutMs - elapsedMs)) : pollIntervalMs);
+		if (hasTimeout && now() - startedAt >= timeoutMs) return {
+			elapsedSeconds: elapsedSeconds(startedAt, now),
+			kind: "timeout",
+			lastFunction: last
+		};
+		const result = await params.getFunction({ id: params.id });
+		if (result.error) return {
+			kind: "error",
+			payload: extractErrorPayload(result.error)
+		};
+		const fetched = result.data?.data;
+		if (!fetched) return {
+			kind: "error",
+			payload: {
+				code: "client_error",
+				message: "Get function returned no data while waiting for deploy"
+			}
+		};
+		last = toDeployWaitSnapshot(fetched);
+		if (last.deploy_status !== lastStatus) {
+			lastStatus = last.deploy_status;
+			writeStderr(`Function ${params.id} deploy status: ${last.deploy_status}\n`);
+		}
+		if (isTerminal(last.deploy_status)) return resultForTerminal(last);
+	}
+}
+//#endregion
 //#region src/oclif/lint/raw-send-mail-fetch.ts
 const RAW_SEND_MAIL_FETCH_REGEX = /fetch\s*\(\s*[`'"][^`'"]*primitive\.dev[^`'"]*\/send-mail(?![A-Za-z0-9_-])/g;
 const SNIPPET_PADDING = 60;
@@ -12208,8 +12350,8 @@ function resolveSecretFlags(input) {
 	const secrets = [];
 	const seenKeys = /* @__PURE__ */ new Set();
 	const env = input.env ?? process.env;
-	const readFile = input.readFile ?? defaultReadFile;
-	const readStdin = input.readStdin ?? defaultReadStdin;
+	const readFile = input.readFile ?? defaultReadFile$1;
+	const readStdin = input.readStdin ?? defaultReadStdin$1;
 	const envFileCache = /* @__PURE__ */ new Map();
 	const reserveSecretKey = (key, sourceLabel) => {
 		const keyError = validateKey(key, sourceLabel);
@@ -12291,6 +12433,8 @@ function resolveSecretFlags(input) {
 	};
 }
 function resolveSingleSecretValue(input) {
+	const keyError = validateKey(input.key, "--key");
+	if (keyError) return keyError;
 	if ([
 		input.value !== void 0 ? "--value" : null,
 		input.valueFromEnv !== void 0 ? "--value-from-env" : null,
@@ -12302,8 +12446,8 @@ function resolveSingleSecretValue(input) {
 		message: "Pass exactly one of --value, --value-from-env, --value-file, --value-from-env-file, or --stdin."
 	};
 	const env = input.env ?? process.env;
-	const readFile = input.readFile ?? defaultReadFile;
-	const readStdin = input.readStdin ?? defaultReadStdin;
+	const readFile = input.readFile ?? defaultReadFile$1;
+	const readStdin = input.readStdin ?? defaultReadStdin$1;
 	if (input.value !== void 0) return {
 		kind: "ok",
 		value: input.value
@@ -12341,10 +12485,10 @@ function resolveSingleSecretValue(input) {
 		message: "Pass exactly one of --value, --value-from-env, --value-file, --value-from-env-file, or --stdin."
 	};
 }
-function defaultReadFile(path) {
+function defaultReadFile$1(path) {
 	return readFileSync(path, "utf8");
 }
-function defaultReadStdin() {
+function defaultReadStdin$1() {
 	if (process.stdin.isTTY) throw new Error("stdin is a TTY; pipe a value into this command or pass a file/env source instead.");
 	return readFileSync(0, "utf8");
 }
@@ -12631,6 +12775,7 @@ var FunctionsDeployCommand = class FunctionsDeployCommand extends Command {
 	static summary = "Deploy a new function from a bundled handler file";
 	static examples = [
 		"<%= config.bin %> functions deploy --name forwarder --file ./bundle.js",
+		"<%= config.bin %> functions deploy --name forwarder --file ./bundle.js --wait",
 		"<%= config.bin %> functions deploy --name forwarder --file ./bundle.js --source-map-file ./bundle.js.map",
 		"<%= config.bin %> functions deploy --name forwarder --file ./bundle.js --secret OPENAI_KEY=sk-... --secret OWNER_EMAIL=me@example.com",
 		"<%= config.bin %> functions deploy --name forwarder --file ./bundle.js --secret-from-env OPENAI_KEY --secret-from-env-file .env.local:OWNER_EMAIL",
@@ -12677,11 +12822,29 @@ var FunctionsDeployCommand = class FunctionsDeployCommand extends Command {
 			multiple: true
 		}),
 		"secret-from-stdin": Flags.string({ description: "Secret KEY to read from stdin and seed on the deployed function. A single trailing line ending is stripped. Stdin is consumed once, so this flag is not repeatable." }),
+		wait: Flags.boolean({ description: "Wait until the function deploy reaches deployed or failed. Progress is written to stderr; stdout remains the final JSON payload." }),
+		timeout: Flags.integer({
+			default: 120,
+			description: "Seconds to wait when --wait is set before exiting non-zero. Use 0 to wait forever."
+		}),
+		"poll-interval": Flags.integer({
+			default: 2,
+			description: "Seconds between deploy-status polls when --wait is set."
+		}),
 		time: Flags.boolean({ description: TIME_FLAG_DESCRIPTION })
 	};
 	async run() {
 		const { flags } = await this.parse(FunctionsDeployCommand);
 		await runWithTiming(flags.time, async () => {
+			const waitFlagError = validateDeployWaitFlags({
+				pollIntervalSeconds: flags["poll-interval"],
+				timeoutSeconds: flags.timeout
+			});
+			if (waitFlagError) {
+				process.stderr.write(`${waitFlagError}\n`);
+				process.exitCode = 1;
+				return;
+			}
 			const parsedSecrets = resolveSecretFlags({
 				fromEnv: flags["secret-from-env"] ?? [],
 				fromEnvFile: flags["secret-from-env-file"] ?? [],
@@ -12767,6 +12930,42 @@ var FunctionsDeployCommand = class FunctionsDeployCommand extends Command {
 				return;
 			}
 			const payload = outcome.result.redeploy ?? outcome.result.created;
+			if (flags.wait) {
+				const waitResult = await waitForFunctionDeploy({
+					getFunction: (p) => getFunction({
+						client: apiClient.client,
+						path: { id: p.id },
+						responseStyle: "fields"
+					}),
+					id: payload.id,
+					initial: payload,
+					pollIntervalSeconds: flags["poll-interval"],
+					timeoutSeconds: flags.timeout,
+					writeStderr: (chunk) => process.stderr.write(chunk)
+				});
+				if (waitResult.kind === "error") {
+					writeErrorWithHints(waitResult.payload);
+					removeStaleSavedCredentialOnUnauthorized({
+						...authFailureContext,
+						payload: waitResult.payload
+					});
+					process.exitCode = 1;
+					return;
+				}
+				if (waitResult.kind === "timeout") {
+					const status = waitResult.lastFunction?.deploy_status ?? "unknown";
+					process.stderr.write(`Timed out after ${flags.timeout}s waiting for function ${payload.id} deploy to finish (last status: ${status}).\n`);
+					process.exitCode = 2;
+					return;
+				}
+				this.log(JSON.stringify(waitResult.function, null, 2));
+				if (waitResult.kind === "failed") {
+					const detail = waitResult.function.deploy_error ? `: ${waitResult.function.deploy_error}` : ".";
+					process.stderr.write(`Function ${payload.id} deploy failed${detail}\n`);
+					process.exitCode = 1;
+				}
+				return;
+			}
 			this.log(JSON.stringify(payload, null, 2));
 		});
 	}
@@ -12779,8 +12978,8 @@ const PRIMITIVE_TEAM_AUTHOR = {
 	name: "Primitive Team",
 	url: "https://primitive.dev"
 };
-const SDK_VERSION_RANGE = "^0.29.0";
-const CLI_VERSION_RANGE = "^0.29.0";
+const SDK_VERSION_RANGE = "^0.30.0";
+const CLI_VERSION_RANGE = "^0.30.0";
 const ESBUILD_VERSION_RANGE = "^0.27.0";
 function renderHandler() {
 	return `// env.PRIMITIVE_API_KEY is auto-injected by the Primitive Functions runtime.
@@ -13179,6 +13378,166 @@ var FunctionsInitCommand = class FunctionsInitCommand extends Command {
 	}
 };
 //#endregion
+//#region src/oclif/commands/functions-logs.ts
+const DEFAULT_LOG_LIMIT = 50;
+const DEFAULT_LOG_POLL_INTERVAL_SECONDS = 2;
+function levelLabel(level) {
+	return level.toUpperCase().padEnd(5);
+}
+function orderFunctionLogsForDisplay(rows) {
+	return [...rows].reverse();
+}
+function formatFunctionLogLine(row) {
+	const metadata = row.metadata && Object.keys(row.metadata).length > 0 ? ` ${JSON.stringify(row.metadata)}` : "";
+	return `${row.ts} ${levelLabel(row.level)} ${row.message}${metadata}`;
+}
+function collectFreshFunctionLogsFromPage(rows, seenIds) {
+	const freshNewestFirst = [];
+	let reachedSeen = false;
+	for (const row of rows) {
+		if (seenIds.has(row.id)) {
+			reachedSeen = true;
+			continue;
+		}
+		freshNewestFirst.push(row);
+		seenIds.add(row.id);
+	}
+	return {
+		freshNewestFirst,
+		reachedSeen
+	};
+}
+function emitLogRows(rows, jsonl) {
+	for (const row of rows) {
+		const line = jsonl ? JSON.stringify(row) : formatFunctionLogLine(row);
+		process.stdout.write(`${line}\n`);
+	}
+}
+var FunctionsLogsCommand = class FunctionsLogsCommand extends Command {
+	static description = "List or follow function execution logs. Defaults to compact text output; use --jsonl for one JSON object per log row.";
+	static summary = "List or follow a function's execution logs";
+	static examples = [
+		"<%= config.bin %> functions logs --id <fn-id>",
+		"<%= config.bin %> functions logs --id <fn-id> --jsonl",
+		"<%= config.bin %> functions logs --id <fn-id> --follow"
+	];
+	static flags = {
+		"api-key": Flags.string({
+			description: "Primitive API key (defaults to PRIMITIVE_API_KEY or saved `primitive login` credentials)",
+			env: "PRIMITIVE_API_KEY"
+		}),
+		"api-base-url-1": Flags.string({
+			description: "Override the primary API base URL. Internal testing only; not documented to customers.",
+			env: "PRIMITIVE_API_BASE_URL_1",
+			hidden: true
+		}),
+		"api-base-url-2": Flags.string({
+			description: "Override the attachments-supporting send host base URL. Internal testing only; not documented to customers.",
+			env: "PRIMITIVE_API_BASE_URL_2",
+			hidden: true
+		}),
+		id: Flags.string({
+			description: "Function id (UUID).",
+			required: true
+		}),
+		limit: Flags.integer({
+			default: DEFAULT_LOG_LIMIT,
+			description: "Maximum rows to fetch per poll. Server clamps to 1..200."
+		}),
+		cursor: Flags.string({ description: "Opaque pagination cursor from a previous logs response. Not supported with --follow." }),
+		follow: Flags.boolean({
+			char: "f",
+			description: "Keep polling the newest logs and print rows not seen yet."
+		}),
+		jsonl: Flags.boolean({ description: "Print one compact JSON object per log row." }),
+		"poll-interval": Flags.integer({
+			default: DEFAULT_LOG_POLL_INTERVAL_SECONDS,
+			description: "Seconds between polls when --follow is set."
+		}),
+		time: Flags.boolean({ description: TIME_FLAG_DESCRIPTION })
+	};
+	async run() {
+		const { flags } = await this.parse(FunctionsLogsCommand);
+		if (flags.limit <= 0) this.error("--limit must be greater than 0.", { exit: 2 });
+		if (flags["poll-interval"] <= 0) this.error("--poll-interval must be greater than 0.", { exit: 2 });
+		if (flags.follow && flags.cursor) this.error("--cursor cannot be combined with --follow.", { exit: 2 });
+		await runWithTiming(flags.time, async () => {
+			const baseUrlOverridden = flags["api-base-url-1"] !== void 0 || flags["api-base-url-2"] !== void 0;
+			const auth = resolveCliAuth({
+				apiKey: flags["api-key"],
+				apiBaseUrl1: flags["api-base-url-1"],
+				apiBaseUrl2: flags["api-base-url-2"],
+				configDir: this.config.configDir
+			});
+			const apiClient = new PrimitiveApiClient({
+				apiKey: auth.apiKey,
+				apiBaseUrl1: auth.apiBaseUrl1,
+				apiBaseUrl2: auth.apiBaseUrl2
+			});
+			const seenIds = /* @__PURE__ */ new Set();
+			let completedInitialFollowPoll = false;
+			let hasObservedLogs = false;
+			let wroteEmptyHint = false;
+			while (true) {
+				let cursor = flags.cursor;
+				let nextCursor = null;
+				let rows = [];
+				while (true) {
+					const result = await listFunctionLogs({
+						client: apiClient.client,
+						path: { id: flags.id },
+						query: {
+							...cursor ? { cursor } : {},
+							limit: flags.limit
+						},
+						responseStyle: "fields"
+					});
+					if (result.error) {
+						const errorPayload = extractErrorPayload(result.error);
+						writeErrorWithHints(errorPayload);
+						removeStaleSavedCredentialOnUnauthorized({
+							auth,
+							baseUrlOverridden,
+							configDir: this.config.configDir,
+							payload: errorPayload
+						});
+						process.exitCode = 1;
+						return;
+					}
+					const page = result.data?.data ?? {
+						items: [],
+						next_cursor: null
+					};
+					nextCursor = page.next_cursor;
+					if (!flags.follow) {
+						rows = orderFunctionLogsForDisplay(page.items);
+						break;
+					}
+					if (page.items.length > 0) hasObservedLogs = true;
+					const collected = collectFreshFunctionLogsFromPage(page.items, seenIds);
+					rows.push(...collected.freshNewestFirst);
+					if (!completedInitialFollowPoll || collected.reachedSeen || !page.next_cursor) {
+						rows = orderFunctionLogsForDisplay(rows);
+						break;
+					}
+					cursor = page.next_cursor;
+				}
+				if (rows.length === 0 && !wroteEmptyHint) {
+					process.stderr.write(flags.follow ? hasObservedLogs ? "Waiting for new function logs...\n" : "No function logs yet. Waiting for new rows...\n" : "No function logs yet. Trigger the function, then run this command again.\n");
+					wroteEmptyHint = true;
+				}
+				emitLogRows(rows, flags.jsonl);
+				if (!flags.follow) {
+					if (nextCursor) process.stderr.write(`next cursor: ${nextCursor}\n`);
+					return;
+				}
+				completedInitialFollowPoll = true;
+				await sleep$1(flags["poll-interval"] * 1e3);
+			}
+		});
+	}
+};
+//#endregion
 //#region src/oclif/commands/functions-redeploy.ts
 async function runRedeployWithSecrets(api, params) {
 	const writtenSecrets = [];
@@ -13260,6 +13619,7 @@ var FunctionsRedeployCommand = class FunctionsRedeployCommand extends Command {
 	static summary = "Redeploy a function from a bundled handler file";
 	static examples = [
 		"<%= config.bin %> functions redeploy --id <fn-id> --file ./bundle.js",
+		"<%= config.bin %> functions redeploy --id <fn-id> --file ./bundle.js --wait",
 		"<%= config.bin %> functions redeploy --id <fn-id> --file ./bundle.js --source-map-file ./bundle.js.map",
 		"<%= config.bin %> functions redeploy --id <fn-id> --file ./bundle.js --secret OPENAI_KEY=sk-... --secret OWNER_EMAIL=me@example.com",
 		"<%= config.bin %> functions redeploy --id <fn-id> --file ./bundle.js --secret-from-env OPENAI_KEY --secret-from-file PRIVATE_KEY=./private-key.pem",
@@ -13306,11 +13666,29 @@ var FunctionsRedeployCommand = class FunctionsRedeployCommand extends Command {
 			multiple: true
 		}),
 		"secret-from-stdin": Flags.string({ description: "Secret KEY to read from stdin and write before the redeploy. A single trailing line ending is stripped. Stdin is consumed once, so this flag is not repeatable." }),
+		wait: Flags.boolean({ description: "Wait until the function deploy reaches deployed or failed. Progress is written to stderr; stdout remains the final JSON payload." }),
+		timeout: Flags.integer({
+			default: 120,
+			description: "Seconds to wait when --wait is set before exiting non-zero. Use 0 to wait forever."
+		}),
+		"poll-interval": Flags.integer({
+			default: 2,
+			description: "Seconds between deploy-status polls when --wait is set."
+		}),
 		time: Flags.boolean({ description: TIME_FLAG_DESCRIPTION })
 	};
 	async run() {
 		const { flags } = await this.parse(FunctionsRedeployCommand);
 		await runWithTiming(flags.time, async () => {
+			const waitFlagError = validateDeployWaitFlags({
+				pollIntervalSeconds: flags["poll-interval"],
+				timeoutSeconds: flags.timeout
+			});
+			if (waitFlagError) {
+				process.stderr.write(`${waitFlagError}\n`);
+				process.exitCode = 1;
+				return;
+			}
 			const parsedSecrets = resolveSecretFlags({
 				fromEnv: flags["secret-from-env"] ?? [],
 				fromEnvFile: flags["secret-from-env-file"] ?? [],
@@ -13386,6 +13764,42 @@ var FunctionsRedeployCommand = class FunctionsRedeployCommand extends Command {
 				process.exitCode = 1;
 				return;
 			}
+			if (flags.wait) {
+				const waitResult = await waitForFunctionDeploy({
+					getFunction: (p) => getFunction({
+						client: apiClient.client,
+						path: { id: p.id },
+						responseStyle: "fields"
+					}),
+					id: outcome.result.redeploy.id,
+					initial: outcome.result.redeploy,
+					pollIntervalSeconds: flags["poll-interval"],
+					timeoutSeconds: flags.timeout,
+					writeStderr: (chunk) => process.stderr.write(chunk)
+				});
+				if (waitResult.kind === "error") {
+					writeErrorWithHints(waitResult.payload);
+					removeStaleSavedCredentialOnUnauthorized({
+						...authFailureContext,
+						payload: waitResult.payload
+					});
+					process.exitCode = 1;
+					return;
+				}
+				if (waitResult.kind === "timeout") {
+					const status = waitResult.lastFunction?.deploy_status ?? "unknown";
+					process.stderr.write(`Timed out after ${flags.timeout}s waiting for function ${outcome.result.redeploy.id} deploy to finish (last status: ${status}).\n`);
+					process.exitCode = 2;
+					return;
+				}
+				this.log(JSON.stringify(waitResult.function, null, 2));
+				if (waitResult.kind === "failed") {
+					const detail = waitResult.function.deploy_error ? `: ${waitResult.function.deploy_error}` : ".";
+					process.stderr.write(`Function ${outcome.result.redeploy.id} deploy failed${detail}\n`);
+					process.exitCode = 1;
+				}
+				return;
+			}
 			this.log(JSON.stringify(outcome.result.redeploy, null, 2));
 		});
 	}
@@ -13630,6 +14044,11 @@ function buildFunctionTestOutcome(params) {
 	if (params.showSends) outcome.sent_emails = params.detail.replies;
 	return outcome;
 }
+function writeFunctionTestProgress(message, writeStderr = (chunk) => {
+	process.stderr.write(chunk);
+}) {
+	writeStderr(`${message}\n`);
+}
 function stringOrNull(value) {
 	return typeof value === "string" && value.length > 0 ? value : null;
 }
@@ -13784,7 +14203,7 @@ var FunctionsTestFunctionCommand = class FunctionsTestFunctionCommand extends Co
 			const timeoutMs = flags.timeout * 1e3;
 			const pollIntervalMs = flags["poll-interval"] * 1e3;
 			const isExpired = () => flags.timeout > 0 && Date.now() - startedAt > timeoutMs;
-			this.log(`Waiting for test inbound to arrive at ${invocation.to}...`);
+			writeFunctionTestProgress(`Waiting for test inbound to arrive at ${invocation.to}...`);
 			let inboundId;
 			while (!isExpired()) {
 				const page = await fetchEmailSearchPage({
@@ -13813,7 +14232,7 @@ var FunctionsTestFunctionCommand = class FunctionsTestFunctionCommand extends Co
 				await sleep$1(pollIntervalMs);
 			}
 			if (!inboundId) this.error(`Timed out after ${flags.timeout}s waiting for test inbound ${invocation.to} to land. Browse ${invocation.watch_url} for the live view.`, { exit: 2 });
-			this.log(`Inbound landed (${inboundId}). Waiting for function to run...`);
+			writeFunctionTestProgress(`Inbound landed (${inboundId}). Waiting for function to run...`);
 			let detail;
 			while (!isExpired()) {
 				const result = await getEmail({
@@ -14116,6 +14535,106 @@ var LogoutCommand = class LogoutCommand extends Command {
 	}
 };
 //#endregion
+//#region src/oclif/message-body-sources.ts
+function defaultReadFile(path) {
+	return readFileSync(path, "utf8");
+}
+function defaultReadStdin() {
+	if (process.stdin.isTTY) throw new Error("stdin is a TTY; pipe a value into this command or pass a file/string source instead.");
+	return readFileSync(0, "utf8");
+}
+function selectedSources(sources) {
+	return sources.filter(([, selected]) => selected).map(([label]) => label);
+}
+function readTextFile(path, label, readFile) {
+	try {
+		return {
+			content: readFile(path),
+			kind: "ok"
+		};
+	} catch (error) {
+		return {
+			kind: "error",
+			message: `Could not read ${label} ${path}: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+}
+function readTextStdin(label, readStdin) {
+	try {
+		return {
+			content: readStdin(),
+			kind: "ok"
+		};
+	} catch (error) {
+		return {
+			kind: "error",
+			message: `Could not read ${label}: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+}
+function resolveMessageBodies(input) {
+	const bodySources = selectedSources([
+		["--body", input.body !== void 0],
+		["--body-file", input.bodyFile !== void 0],
+		["--body-stdin", input.bodyStdin === true]
+	]);
+	if (bodySources.length > 1) return {
+		kind: "error",
+		message: `Pass only one plain-text body source (got ${bodySources.join(", ")}).`
+	};
+	const htmlSources = selectedSources([
+		["--html", input.html !== void 0],
+		["--html-file", input.htmlFile !== void 0],
+		["--html-stdin", input.htmlStdin === true]
+	]);
+	if (htmlSources.length > 1) return {
+		kind: "error",
+		message: `Pass only one HTML body source (got ${htmlSources.join(", ")}).`
+	};
+	const stdinSources = selectedSources([["--body-stdin", input.bodyStdin === true], ["--html-stdin", input.htmlStdin === true]]);
+	if (stdinSources.length > 1) return {
+		kind: "error",
+		message: `Stdin can only be consumed once (got ${stdinSources.join(", ")}).`
+	};
+	if (bodySources.length === 0 && htmlSources.length === 0) return {
+		kind: "error",
+		message: "Either a plain-text body source or an HTML body source is required."
+	};
+	const readFile = input.readFile ?? defaultReadFile;
+	const readStdin = input.readStdin ?? defaultReadStdin;
+	let body = input.body;
+	let html = input.html;
+	if (input.bodyFile !== void 0) {
+		const result = readTextFile(input.bodyFile, "--body-file", readFile);
+		if (result.kind === "error") return result;
+		body = result.content;
+	}
+	if (input.bodyStdin === true) {
+		const result = readTextStdin("--body-stdin", readStdin);
+		if (result.kind === "error") return result;
+		body = result.content;
+	}
+	if (input.htmlFile !== void 0) {
+		const result = readTextFile(input.htmlFile, "--html-file", readFile);
+		if (result.kind === "error") return result;
+		html = result.content;
+	}
+	if (input.htmlStdin === true) {
+		const result = readTextStdin("--html-stdin", readStdin);
+		if (result.kind === "error") return result;
+		html = result.content;
+	}
+	if (!body && !html) return {
+		kind: "error",
+		message: "Either a non-empty plain-text body or a non-empty HTML body is required."
+	};
+	return {
+		...body !== void 0 ? { body } : {},
+		...html !== void 0 ? { html } : {},
+		kind: "ok"
+	};
+}
+//#endregion
 //#region src/oclif/commands/reply.ts
 var ReplyCommand = class ReplyCommand extends Command {
 	static description = `Reply to an inbound email.
@@ -14124,6 +14643,7 @@ var ReplyCommand = class ReplyCommand extends Command {
 	static summary = "Reply to an inbound email";
 	static examples = [
 		"<%= config.bin %> reply --id <inbound-email-id> --body 'Thanks, got it.'",
+		"<%= config.bin %> reply --id <inbound-email-id> --body-file ./reply.txt",
 		"<%= config.bin %> reply --id <inbound-email-id> --html '<p>Thanks, got it.</p>' --wait",
 		"<%= config.bin %> reply --id <inbound-email-id> --from 'Support <support@example.com>' --body 'Thanks!'"
 	];
@@ -14147,7 +14667,11 @@ var ReplyCommand = class ReplyCommand extends Command {
 			required: true
 		}),
 		body: Flags.string({ description: "Plain-text reply body. Either --body or --html (or both) is required." }),
+		"body-file": Flags.string({ description: "Read the plain-text reply body from a UTF-8 file. Mutually exclusive with --body and --body-stdin." }),
+		"body-stdin": Flags.boolean({ description: "Read the plain-text reply body from stdin. Mutually exclusive with --body and --body-file. Stdin can only be consumed once." }),
 		html: Flags.string({ description: "HTML reply body. Either --body or --html (or both) is required." }),
+		"html-file": Flags.string({ description: "Read the HTML reply body from a UTF-8 file. Mutually exclusive with --html and --html-stdin." }),
+		"html-stdin": Flags.boolean({ description: "Read the HTML reply body from stdin. Mutually exclusive with --html and --html-file. Stdin can only be consumed once." }),
 		from: Flags.string({ description: "Optional From header override. Defaults to the inbound recipient." }),
 		wait: Flags.boolean({ description: "Block until the receiving MTA returns an outcome. Without --wait, the call returns once Primitive has accepted the reply for delivery." }),
 		"wait-timeout-ms": Flags.integer({ description: "Maximum time to wait when --wait is set. Defaults to 30000ms." }),
@@ -14155,7 +14679,15 @@ var ReplyCommand = class ReplyCommand extends Command {
 	};
 	async run() {
 		const { flags } = await this.parse(ReplyCommand);
-		if (!flags.body && !flags.html) throw new Errors.CLIError("Either --body or --html (or both) is required.");
+		const bodies = resolveMessageBodies({
+			body: flags.body,
+			bodyFile: flags["body-file"],
+			bodyStdin: flags["body-stdin"],
+			html: flags.html,
+			htmlFile: flags["html-file"],
+			htmlStdin: flags["html-stdin"]
+		});
+		if (bodies.kind === "error") throw new Errors.CLIError(bodies.message);
 		await runWithTiming(flags.time, async () => {
 			const baseUrlOverridden = flags["api-base-url-1"] !== void 0 || flags["api-base-url-2"] !== void 0;
 			const auth = resolveCliAuth({
@@ -14171,8 +14703,8 @@ var ReplyCommand = class ReplyCommand extends Command {
 			});
 			const result = await replyToEmail({
 				body: {
-					...flags.body !== void 0 ? { body_text: flags.body } : {},
-					...flags.html !== void 0 ? { body_html: flags.html } : {},
+					...bodies.body !== void 0 ? { body_text: bodies.body } : {},
+					...bodies.html !== void 0 ? { body_html: bodies.html } : {},
 					...flags.from !== void 0 ? { from: flags.from } : {},
 					...flags.wait !== void 0 ? { wait: flags.wait } : {},
 					...flags["wait-timeout-ms"] !== void 0 ? { wait_timeout_ms: flags["wait-timeout-ms"] } : {}
@@ -14247,6 +14779,7 @@ var SendCommand = class SendCommand extends Command {
 	static summary = "Send an email (simplified, agent-friendly)";
 	static examples = [
 		"<%= config.bin %> send --to alice@example.com --body 'Hi Alice!'",
+		"<%= config.bin %> send --to alice@example.com --body-file ./message.txt",
 		"<%= config.bin %> send --to alice@example.com --from support@yourcompany.com --subject 'Quick question' --body 'Are you free Thursday?'",
 		"<%= config.bin %> send --to alice@example.com --html '<p>Hello!</p>'",
 		"<%= config.bin %> send --to alice@example.com --body 'Confirmed' --wait",
@@ -14274,7 +14807,11 @@ var SendCommand = class SendCommand extends Command {
 		from: Flags.string({ description: "Sender address. Defaults to agent@<your-first-verified-outbound-domain>." }),
 		subject: Flags.string({ description: "Subject line. Defaults to the first line of --body / --html when omitted." }),
 		body: Flags.string({ description: "Plain-text message body. Either --body or --html (or both) is required." }),
+		"body-file": Flags.string({ description: "Read the plain-text message body from a UTF-8 file. Mutually exclusive with --body and --body-stdin." }),
+		"body-stdin": Flags.boolean({ description: "Read the plain-text message body from stdin. Mutually exclusive with --body and --body-file. Stdin can only be consumed once." }),
 		html: Flags.string({ description: "HTML message body. Either --body or --html (or both) is required." }),
+		"html-file": Flags.string({ description: "Read the HTML message body from a UTF-8 file. Mutually exclusive with --html and --html-stdin." }),
+		"html-stdin": Flags.boolean({ description: "Read the HTML message body from stdin. Mutually exclusive with --html and --html-file. Stdin can only be consumed once." }),
 		"in-reply-to": Flags.string({ description: "Message-Id of the parent email when threading a reply on the wire. For replying to an inbound message you received, prefer `primitive reply --id <inbound-id>`." }),
 		wait: Flags.boolean({ description: "Block until the receiving MTA returns an outcome. Without --wait, the call returns once Primitive has accepted the message for delivery." }),
 		"wait-timeout-ms": Flags.integer({ description: "Maximum time to wait when --wait is set. Defaults to 30000ms." }),
@@ -14282,7 +14819,15 @@ var SendCommand = class SendCommand extends Command {
 	};
 	async run() {
 		const { flags } = await this.parse(SendCommand);
-		if (!flags.body && !flags.html) throw new Errors.CLIError("Either --body or --html (or both) is required.");
+		const bodies = resolveMessageBodies({
+			body: flags.body,
+			bodyFile: flags["body-file"],
+			bodyStdin: flags["body-stdin"],
+			html: flags.html,
+			htmlFile: flags["html-file"],
+			htmlStdin: flags["html-stdin"]
+		});
+		if (bodies.kind === "error") throw new Errors.CLIError(bodies.message);
 		await runWithTiming(flags.time, async () => {
 			const baseUrlOverridden = flags["api-base-url-1"] !== void 0 || flags["api-base-url-2"] !== void 0;
 			const auth = resolveCliAuth({
@@ -14302,14 +14847,14 @@ var SendCommand = class SendCommand extends Command {
 				configDir: this.config.configDir
 			};
 			const from = flags.from ?? await pickDefaultFromAddress(apiClient, authFailureContext);
-			const subject = flags.subject ?? (flags.body ? deriveSubject(flags.body) : "Message");
+			const subject = flags.subject ?? (bodies.body ? deriveSubject(bodies.body) : "Message");
 			const result = await sendEmail({
 				body: {
 					from,
 					to: flags.to,
 					subject,
-					...flags.body !== void 0 ? { body_text: flags.body } : {},
-					...flags.html !== void 0 ? { body_html: flags.html } : {},
+					...bodies.body !== void 0 ? { body_text: bodies.body } : {},
+					...bodies.html !== void 0 ? { body_html: bodies.html } : {},
 					...flags["in-reply-to"] !== void 0 ? { in_reply_to: flags["in-reply-to"] } : {},
 					...flags.wait !== void 0 ? { wait: flags.wait } : {},
 					...flags["wait-timeout-ms"] !== void 0 ? { wait_timeout_ms: flags["wait-timeout-ms"] } : {}
@@ -14849,6 +15394,7 @@ function renderFishCompletion(binName) {
 			lines.push(`complete -c ${binName} -f -n '__fish_${binName}_topic_needs_subcommand ${fishEscape(topic)}' -a '${fishEscape(operation.command)}' -d '${fishEscape(operation.summary ?? `${operation.method} ${operation.path}`)}'`);
 			for (const parameter of [...operation.pathParams, ...operation.queryParams]) lines.push(`complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l '${fishEscape(parameter.name.replace(/_/g, "-"))}' -r -d '${fishEscape(parameter.description ?? parameter.name)}'`);
 			lines.push(`complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l 'api-key' -r -d 'Primitive API key (defaults to PRIMITIVE_API_KEY or saved primitive login credentials)'`);
+			if (!operation.binaryResponse) lines.push(`complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l 'envelope' -d 'Print the full response envelope, including pagination metadata'`);
 			if (operation.hasJsonBody) lines.push(`complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l 'body' -r -d 'JSON request body'`, `complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l 'body-file' -r -d 'Path to a JSON file used as the request body'`);
 			if (operation.binaryResponse) lines.push(`complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l 'output' -r -d 'Write binary response bytes to a file'`);
 		}
@@ -14966,7 +15512,6 @@ const CANONICAL_OPERATION_ALIASES = {
 	"functions:get": "functions:get-function",
 	"functions:list": "functions:list-functions",
 	"functions:list-secrets": "functions:list-function-secrets",
-	"functions:logs": "functions:list-function-logs",
 	"sending:get": "sending:get-sent-email",
 	"sending:list": "sending:list-sent-emails",
 	"sending:permissions": "sending:get-send-permissions",
@@ -14979,6 +15524,7 @@ const CANONICAL_OPERATION_ALIASES = {
 };
 const DESCRIBE_OPERATION_ALIASES = {
 	...CANONICAL_OPERATION_ALIASES,
+	"functions:logs": "functions:list-function-logs",
 	reply: "sending:reply-to-email"
 };
 function resolveOperationAlias(id) {
@@ -15012,7 +15558,8 @@ const COMMANDS = {
 		if (!command) throw new Error(`Missing generated command target for alias ${alias}`);
 		return [alias, command];
 	})),
-	...generatedCommands
+	...generatedCommands,
+	"functions:logs": FunctionsLogsCommand
 };
 //#endregion
 export { CANONICAL_OPERATION_ALIASES, COMMANDS, lookupOperation };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primitivedotdev/cli",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "description": "Official Primitive CLI: deploy Primitive Functions, send and inspect mail, manage endpoints, all from the terminal. Wraps the @primitivedotdev/sdk runtime client with one-shot commands.",
   "type": "module",
   "sideEffects": false,