@primitivedotdev/cli 0.31.6 → 0.31.7

package/dist/oclif/index.js

@@ -13887,6 +13887,21 @@ function resolveChatResponseBody(reply) {
 function matchDescription(strategy) {
 	return strategy === "strict" ? "strict, matched by reply_to_sent_email_id" : "fallback, matched by sender/time window";
 }
+function normalizeEmailAddress(value) {
+	return value.trim().toLowerCase();
+}
+function derivedReplySubject(parent) {
+	const subject = parent.subject?.trim();
+	if (!subject) return "Re: (no subject)";
+	return /^re:/i.test(subject) ? subject : `Re: ${subject}`;
+}
+function assertParentMatchesRecipient(parent, recipient) {
+	if (normalizeEmailAddress(parent.from_email) === normalizeEmailAddress(recipient)) return;
+	throw cliError$6(`Inbound email ${parent.id} is from ${parent.from_email}, not ${recipient}. Use \`primitive chat ${parent.from_email} --reply <message> --reply-to-email-id ${parent.id}\` or omit --reply-to-email-id to continue the latest inbound from ${recipient}.`);
+}
+function emailDetailFromEnvelope(envelope) {
+	return envelope?.data ?? envelope ?? null;
+}
 function buildCommand(kind, description, argv, options = {}) {
 	const requiresMessage = options.requiresMessage ?? false;
 	return {
@@ -13907,15 +13922,15 @@ function buildChatFollowUpCommands(context) {
 		"primitive",
 		"chat",
 		context.recipient,
+		"--reply",
 		"<message>",
 		"--from",
 		context.from,
-		"--subject",
-		context.subject,
+		"--reply-to-email-id",
+		context.reply.id,
 		"--timeout",
 		String(context.timeoutSeconds)
 	];
-	if (context.reply.message_id) continueParts.push("--in-reply-to", context.reply.message_id);
 	if (context.json) continueParts.push("--json");
 	if (context.quiet) continueParts.push("--quiet");
 	if (context.strictOnly) continueParts.push("--strict-only");
@@ -14049,6 +14064,55 @@ function formatChatRecoveryContext(context) {
 	for (const { description, command } of buildChatRecoveryCommands(context)) lines.push(`  ${description}:`, `    ${command}`);
 	return lines.join("\n");
 }
+async function loadInboundEmailDetail(params) {
+	const result = await getEmail({
+		client: params.apiClient.client,
+		path: { id: params.id },
+		responseStyle: "fields"
+	});
+	if (result.error) {
+		const payload = extractErrorPayload(result.error);
+		writeErrorWithHints(payload);
+		surfaceUnauthorizedHint({
+			...params.authFailureContext,
+			payload
+		});
+		throw new Errors.CLIError(`Could not load inbound email ${params.id}.`, { exit: 1 });
+	}
+	const detail = emailDetailFromEnvelope(result.data);
+	if (!detail) throw new Errors.CLIError(`Could not load inbound email ${params.id}: the API returned no email body.`, { exit: 1 });
+	return detail;
+}
+async function findLatestInboundFromRecipient(params) {
+	const result = await searchEmails({
+		client: params.apiClient.client,
+		query: {
+			from: params.recipient,
+			to: params.from,
+			include_facets: "false",
+			limit: params.pageSize,
+			snippet: "false",
+			sort: "received_at_desc"
+		},
+		responseStyle: "fields"
+	});
+	if (result.error) {
+		const payload = extractErrorPayload(result.error);
+		writeErrorWithHints(payload);
+		surfaceUnauthorizedHint({
+			...params.authFailureContext,
+			payload
+		});
+		throw new Errors.CLIError("Could not find a prior chat reply.", { exit: 1 });
+	}
+	const row = (result.data?.data ?? []).find((email) => email.status === "accepted" || email.status === "completed");
+	if (!row) return null;
+	return loadInboundEmailDetail({
+		apiClient: params.apiClient,
+		authFailureContext: params.authFailureContext,
+		id: row.id
+	});
+}
 var ChatCommand = class ChatCommand extends Command {
 	static description = `Send a message to an address and wait for the reply.
 
@@ -14062,6 +14126,13 @@ var ChatCommand = class ChatCommand extends Command {
   follow-up commands as templates. The default transcript is for humans;
   agents and scripts should pass --json for parse-safe output.
 
+  To continue an existing chat, pass --reply '<message>'. By default,
+  the CLI replies to the latest inbound email from the recipient to
+  your sender address. For exact continuation, pass
+  --reply-to-email-id <inbound-email-id>. Reply mode uses Primitive's
+  reply endpoint, so the reply subject and threading headers are
+  derived from the inbound email instead of copied into CLI flags.
+
   --json emits a structured envelope with both sides of the exchange,
   a direct response_body field, match details, and follow-up command
   metadata such as kind, argv, placeholders, and requires_message.
@@ -14079,6 +14150,8 @@ var ChatCommand = class ChatCommand extends Command {
 	static examples = [
 		"<%= config.bin %> chat help@agent.acme.dev 'how do I rotate my API key?'",
 		"cat error.log | <%= config.bin %> chat help@agent.acme.dev --subject 'webhook 401s'",
+		"<%= config.bin %> chat help@agent.acme.dev --reply 'one more thing'",
+		"<%= config.bin %> chat help@agent.acme.dev --reply 'one more thing' --reply-to-email-id <inbound-email-id>",
 		"<%= config.bin %> chat help@agent.acme.dev 'follow up question' --json",
 		"<%= config.bin %> chat help@agent.acme.dev 'one more thing' --timeout 300"
 	];
@@ -14106,7 +14179,9 @@ var ChatCommand = class ChatCommand 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 the message when omitted." }),
-		"in-reply-to": Flags.string({ description: "Message-Id of the parent email to thread this against. Use when continuing a prior conversation from outside the CLI; for an inbound you received via Primitive, prefer `primitive reply --id <inbound-id>`." }),
+		reply: Flags.string({ description: "Reply body. Continues the latest inbound email from the recipient to your sender address; pass --reply-to-email-id for an exact thread." }),
+		"reply-to-email-id": Flags.string({ description: "Inbound email id to continue exactly. Uses Primitive's reply endpoint, so recipient, subject, and threading headers are derived from the inbound email." }),
+		"in-reply-to": Flags.string({ description: "Raw Message-Id of the parent email to thread a new send against. Prefer --reply-to-email-id with --reply when continuing an inbound email stored by Primitive." }),
 		json: Flags.boolean({ description: "Emit a structured JSON envelope { sent, reply, response_body, response_body_format, match, follow_up_commands } on stdout instead of the human-readable transcript." }),
 		quiet: Flags.boolean({ description: "Suppress stderr progress updates while sending and waiting. Errors and recovery commands are still written to stderr." }),
 		timeout: Flags.integer({
@@ -14136,8 +14211,12 @@ var ChatCommand = class ChatCommand extends Command {
 	};
 	async run() {
 		const { args, flags } = await this.parse(ChatCommand);
-		const message = args.message !== void 0 && args.message !== "" ? args.message : await readStdinToString();
-		if (!message.trim()) throw cliError$6("Message body is empty.");
+		const replyMode = flags.reply !== void 0 || flags["reply-to-email-id"] !== void 0;
+		if (flags.reply !== void 0 && args.message !== void 0 && args.message !== "") throw cliError$6("Pass the reply body either as --reply or as the positional message, not both.");
+		if (replyMode && flags.subject !== void 0) throw cliError$6("--subject is not used with --reply. Primitive derives the reply subject from the inbound email.");
+		if (replyMode && flags["in-reply-to"] !== void 0) throw cliError$6("Use --reply-to-email-id with --reply instead of raw --in-reply-to.");
+		const message = flags.reply !== void 0 ? flags.reply : args.message !== void 0 && args.message !== "" ? args.message : await readStdinToString();
+		if (!message.trim()) throw cliError$6(replyMode ? "Reply body is empty." : "Message body is empty.");
 		await runWithTiming(flags.time, async () => {
 			const { apiClient, auth, baseUrlOverridden } = await createAuthenticatedCliApiClient({
 				apiKey: flags["api-key"],
@@ -14150,12 +14229,71 @@ var ChatCommand = class ChatCommand extends Command {
 				baseUrlOverridden,
 				configDir: this.config.configDir
 			};
-			const from = flags.from ?? await pickDefaultFromAddress(apiClient, authFailureContext);
-			const subject = flags.subject ?? deriveSubject(message);
-			const sentAtIso = (/* @__PURE__ */ new Date()).toISOString();
 			const progress = flags.quiet ? null : new ChatProgressIndicator(process.stderr);
-			progress?.start(`Sending message to ${args.recipient}`);
-			const sendResult = await sendEmail({
+			let from;
+			let parentReply;
+			let subject;
+			if (replyMode) {
+				const replyContext = await (async () => {
+					let replyContextFailureMessage = "Could not load reply context.";
+					try {
+						if (flags["reply-to-email-id"] !== void 0) {
+							progress?.start(`Loading reply context for ${flags["reply-to-email-id"]}`);
+							const exactParentReply = await loadInboundEmailDetail({
+								apiClient,
+								authFailureContext,
+								id: flags["reply-to-email-id"]
+							});
+							replyContextFailureMessage = `Inbound email ${flags["reply-to-email-id"]} does not match recipient ${args.recipient}.`;
+							assertParentMatchesRecipient(exactParentReply, args.recipient);
+							return {
+								from: flags.from ?? exactParentReply.to_email,
+								parentReply: exactParentReply
+							};
+						}
+						const replyFrom = flags.from ?? await pickDefaultFromAddress(apiClient, authFailureContext);
+						progress?.start(`Finding latest inbound email from ${args.recipient}`);
+						const latestParentReply = await findLatestInboundFromRecipient({
+							apiClient,
+							authFailureContext,
+							from: replyFrom,
+							pageSize: flags["page-size"],
+							recipient: args.recipient
+						});
+						if (!latestParentReply) {
+							replyContextFailureMessage = "No prior inbound email found.";
+							throw cliError$6(`No prior inbound email from ${args.recipient} to ${replyFrom}. Start a new chat with \`primitive chat ${args.recipient} <message>\`, pass --from, or pass --reply-to-email-id <inbound-email-id>.`);
+						}
+						replyContextFailureMessage = `Inbound email ${latestParentReply.id} does not match recipient ${args.recipient}.`;
+						assertParentMatchesRecipient(latestParentReply, args.recipient);
+						return {
+							from: replyFrom,
+							parentReply: latestParentReply
+						};
+					} catch (error) {
+						progress?.fail(replyContextFailureMessage);
+						throw error;
+					}
+				})();
+				from = replyContext.from;
+				parentReply = replyContext.parentReply;
+				subject = derivedReplySubject(replyContext.parentReply);
+			} else {
+				from = flags.from ?? await pickDefaultFromAddress(apiClient, authFailureContext);
+				subject = flags.subject ?? deriveSubject(message);
+			}
+			const sentAtIso = (/* @__PURE__ */ new Date()).toISOString();
+			if (replyMode) progress?.update(`Sending reply to ${args.recipient}`);
+			else progress?.start(`Sending message to ${args.recipient}`);
+			const sendResult = parentReply !== void 0 ? await replyToEmail({
+				body: {
+					body_text: message,
+					from
+				},
+				client: apiClient.client,
+				path: { id: parentReply.id },
+				responseStyle: "fields"
+			}) : await sendEmail({
 				body: {
 					from,
 					to: args.recipient,
@@ -14167,7 +14305,7 @@ var ChatCommand = class ChatCommand extends Command {
 				responseStyle: "fields"
 			});
 			if (sendResult.error) {
-				progress?.fail("Message send failed.");
+				progress?.fail(replyMode ? "Reply send failed." : "Message send failed.");
 				const errorPayload = extractErrorPayload(sendResult.error);
 				writeErrorWithHints(errorPayload);
 				surfaceUnauthorizedHint({
@@ -14182,13 +14320,15 @@ var ChatCommand = class ChatCommand extends Command {
 				progress?.fail("Send succeeded but the API returned no data.");
 				throw cliError$6("Send succeeded but the API returned no data.");
 			}
-			progress?.update(`Message sent; waiting for reply from ${args.recipient}`, {
+			const replyAddress = sent.from || from;
+			progress?.update(`${replyMode ? "Reply" : "Message"} sent; waiting for reply from ${args.recipient}`, {
 				heartbeatMs: 15e3,
 				timeoutSeconds: flags.timeout
 			});
 			const baseContext = {
-				from,
+				from: replyAddress,
 				json: flags.json,
+				parentReply,
 				quiet: flags.quiet,
 				recipient: args.recipient,
 				sent,
@@ -14203,7 +14343,7 @@ var ChatCommand = class ChatCommand extends Command {
 				replyResult = await waitForReply({
 					apiClient,
 					authFailureContext,
-					from,
+					from: replyAddress,
 					interval: flags.interval,
 					notice: (message) => {
 						if (progress) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primitivedotdev/cli",
-  "version": "0.31.6",
+  "version": "0.31.7",
   "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,