primcli 1.62.0 → 1.62.1

package/dist/oclif/index.js

@@ -42320,6 +42320,8 @@ const HEADER_FROM = /^\s*\*?From:\*?\s+\S/i;
 const HEADER_OTHER = /^\s*\*?(Sent|Date|To|Subject):\*?\s/i;
 const QUOTED_LINE = /^\s*>/;
 const FORWARDED = /^\s*(?:-{2,}\s*Forwarded message\s*-{2,}|Begin forwarded message:)\s*$/i;
+const FORWARD_SUBJECT = /^\s*(?:fwd?|wg|tr)\s*:/i;
+const ANSWERS_INLINE = /\b(?:in-?line|below|interleaved|in (?:red|blue|green|bold|caps|capitals))\b/i;
 /**
 * Whether line `i` opens a copied header block ("From:", then "Sent:" or
 * "Date:", "To:" and "Subject:" lines), the way Outlook introduces the message
@@ -42348,6 +42350,11 @@ function onlyQuotedAfter(lines, from) {
 	}
 	return true;
 }
+/** Whether line `i` is an "On <date>, <name> wrote:" line, on one line or two. */
+function isAttribution(lines, i) {
+	const line = lines[i] ?? "";
+	return WROTE_ONE_LINE.test(line) || WROTE_FIRST_LINE.test(line) && WROTE_LAST_LINE.test(lines[i + 1] ?? "");
+}
 /**
 * Index of the line where quoted history starts, or -1 when there is none.
 */
@@ -42369,25 +42376,35 @@ function quotedHistoryStart(lines) {
 * Remove the quoted history a reply carries below its new text: everything
 * from an attribution line, an "Original Message" rule or a copied header
 * block onward, and any run of ">" lines the message ends with. Quoted lines
-* with the sender's own text after them (an inline reply) are kept. A body
-* that forwards a message is returned whole, since the forwarded text is what
-* the sender wants read, and so is one where removing the history would leave
-* nothing.
+* with the sender's own text after them (an inline reply) are kept. A message
+* that forwards another (by its subject or a forwarding banner) is returned
+* whole, since the forwarded text is what the sender wants read, and so is
+* one where removing the history would leave nothing.
 */
-function stripQuotedHistory(body) {
+function stripQuotedHistory(body, subject) {
 	const original = body.replace(/\r\n?/g, "\n").trim();
 	let lines = original.split("\n");
-	if (lines.some((line) => FORWARDED.test(line))) return {
+	if (FORWARD_SUBJECT.test(subject ?? "") || lines.some((line) => FORWARDED.test(line))) return {
 		text: original,
 		removed: 0
 	};
 	const start = quotedHistoryStart(lines);
-	if (start !== -1) lines = lines.slice(0, start);
+	if (start !== -1) {
+		if (!isAttribution(lines, start) && ANSWERS_INLINE.test(lines.slice(0, start).join("\n"))) return {
+			text: original,
+			removed: 0
+		};
+		lines = lines.slice(0, start);
+	}
+	if (isInlineExchange(lines)) return finish(original, lines);
 	while (lines.length > 0) {
 		const last = lines[lines.length - 1] ?? "";
 		if (last.trim() !== "" && !QUOTED_LINE.test(last)) break;
 		lines.pop();
 	}
+	return finish(original, lines);
+}
+function finish(original, lines) {
 	const text = lines.join("\n").trim();
 	if (text === "") return {
 		text: original,
@@ -42398,6 +42415,13 @@ function stripQuotedHistory(body) {
 		removed: original.length - text.length
 	};
 }
+/** Whether a quoted line is followed, somewhere later, by the sender's own text. */
+function isInlineExchange(lines) {
+	let quoted = false;
+	for (const line of lines) if (QUOTED_LINE.test(line)) quoted = true;
+	else if (quoted && line.trim() !== "") return true;
+	return false;
+}
 const NAMED_ENTITIES = {
 	amp: "&",
 	lt: "<",
@@ -42432,8 +42456,8 @@ function removeAll(text, pattern, replacement = " ") {
 function htmlToText(html) {
 	let text = removeAll(html, /<!--[\s\S]*?-->/g);
 	text = removeAll(text, /<(script|style|head|title)\b[\s\S]*?<\/\1\s*>/gi);
-	text = text.replace(/<a\b[^>]*?\bhref\s*=\s*(?:"([^"]*)"|'([^']*)')[^>]*>([\s\S]*?)<\/a\s*>/gi, (_match, double, single, label) => {
-		const url = (double ?? single ?? "").trim();
+	text = text.replace(/<a\b[^>]*?\shref\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>"']+))[^>]*>([\s\S]*?)<\/a\s*>/gi, (_match, double, single, bare, label) => {
+		const url = (double ?? single ?? bare ?? "").trim();
 		const shown = removeAll(label, /<[^>]*>/g, "").trim();
 		if (!/^(https?:|mailto:)/i.test(url)) return label;
 		if (shown === url || `mailto:${shown}` === url) return label;
@@ -42453,7 +42477,7 @@ function buildEmailCompact(detail) {
 	const text = detail.body_text?.trim() ? detail.body_text : null;
 	const html = text === null && detail.body_html?.trim() ? detail.body_html : null;
 	const source = text !== null ? "text" : html !== null ? "html" : "none";
-	const stripped = stripQuotedHistory(text ?? (html !== null ? htmlToText(html) : ""));
+	const stripped = stripQuotedHistory(text ?? (html !== null ? htmlToText(html) : ""), detail.subject);
 	return {
 		id: detail.id,
 		thread_id: detail.thread_id ?? null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primcli",
-  "version": "1.62.0",
+  "version": "1.62.1",
   "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,