@rei-standard/amsg-server 2.5.0 → 2.5.1

package/dist/index.cjs

@@ -525,7 +525,7 @@ function readReasoningContent(llmResponse) {
   }
   const content = _optionalChain([message, 'optionalAccess', _5 => _5.content]);
   if (typeof content === "string") {
-    const match = content.match(/<(think|thinking|thought)>([\s\S]*?)<\/\1>/i);
+    const match = content.match(REASONING_TAG_RE);
     if (match) {
       const trimmed = match[2].trim();
       if (trimmed.length > 0) return trimmed;
@@ -533,6 +533,12 @@ function readReasoningContent(llmResponse) {
   }
   return null;
 }
+var REASONING_TAG_RE = /<(think|thinking|thought)>([\s\S]*?)<\/\1>/i;
+var REASONING_TAG_RE_G = /<(think|thinking|thought)>[\s\S]*?<\/\1>/gi;
+function stripReasoningTags(content) {
+  if (typeof content !== "string" || !content.includes("<")) return content;
+  return content.replace(REASONING_TAG_RE_G, "").trim();
+}
 async function processSingleMessage(task, ctx, providedMasterKey) {
   try {
     const masterKey = providedMasterKey || ctx.masterKey;
@@ -563,6 +569,10 @@ async function processSingleMessage(task, ctx, providedMasterKey) {
     } else {
       throw new Error("Invalid message configuration: no content source available");
     }
+    const reasoning = readReasoningContent(llmResponse);
+    if (reasoning) {
+      messageContent = stripReasoningTags(messageContent);
+    }
     const messages = splitMessageIntoSentences(messageContent, _nullishCoalesce(decryptedPayload.splitPattern, () => ( null)));
     if (!ctx.vapid.email || !ctx.vapid.publicKey || !ctx.vapid.privateKey) {
       throw new Error("VAPID configuration missing - push notifications cannot be sent");
@@ -574,7 +584,6 @@ async function processSingleMessage(task, ctx, providedMasterKey) {
     const avatarUrl = decryptedPayload.avatarUrl || null;
     const metadata = decryptedPayload.metadata || {};
     const messageIdBase = task.id != null ? `msg_task_${task.id}` : `msg_${_crypto.randomUUID.call(void 0, )}_instant`;
-    const reasoning = readReasoningContent(llmResponse);
     if (reasoning) {
       const reasoningPush = _amsgshared.buildReasoningPush.call(void 0, {
         messageType: decryptedPayload.messageType,

package/dist/index.d.cts

@@ -880,7 +880,7 @@ function readReasoningContent(llmResponse) {
   const choices = /** @type {{ choices?: unknown }} */ (llmResponse).choices;
   if (!Array.isArray(choices) || choices.length === 0) return null;
   const message = /** @type {{ message?: { reasoning_content?: unknown, content?: unknown } }} */ (choices[0])?.message;
-  
+
   const raw = message?.reasoning_content;
   if (typeof raw === 'string') {
     const trimmed = raw.trim();
@@ -889,7 +889,7 @@ function readReasoningContent(llmResponse) {
 
   const content = message?.content;
   if (typeof content === 'string') {
-    const match = content.match(/<(think|thinking|thought)>([\s\S]*?)<\/\1>/i);
+    const match = content.match(REASONING_TAG_RE);
     if (match) {
       const trimmed = match[2].trim();
       if (trimmed.length > 0) return trimmed;
@@ -899,6 +899,22 @@ function readReasoningContent(llmResponse) {
   return null;
 }
 
+const REASONING_TAG_RE = /<(think|thinking|thought)>([\s\S]*?)<\/\1>/i;
+const REASONING_TAG_RE_G = /<(think|thinking|thought)>[\s\S]*?<\/\1>/gi;
+
+/**
+ * Mirrors `amsg-instant/src/message-processor.js#stripReasoningTags`.
+ * Removes any private chain-of-thought markup leaking through
+ * `message.content` so it does not also ship inside ContentPush.
+ *
+ * @param {string} content
+ * @returns {string}
+ */
+function stripReasoningTags(content) {
+  if (typeof content !== 'string' || !content.includes('<')) return content;
+  return content.replace(REASONING_TAG_RE_G, '').trim();
+}
+
 /**
  * @typedef {Object} ProcessorContext
  * @property {Object}  webpush           - The web-push module instance (already VAPID-configured).
@@ -952,6 +968,15 @@ async function processSingleMessage(task, ctx, providedMasterKey) {
       throw new Error('Invalid message configuration: no content source available');
     }
 
+    // Auto-extract reasoning BEFORE the sentence split: when reasoning
+    // came from the `<think>` fallback inside message.content, the same
+    // span is still embedded in messageContent and would otherwise leak
+    // as raw markup into ContentPush.
+    const reasoning = readReasoningContent(llmResponse);
+    if (reasoning) {
+      messageContent = stripReasoningTags(messageContent);
+    }
+
     // Sentence splitting (mirrors @rei-standard/amsg-instant
     // splitMessageIntoSentences — keep in lockstep; do not drift). Caller may
     // override the default regex via decryptedPayload.splitPattern (string
@@ -988,7 +1013,6 @@ async function processSingleMessage(task, ctx, providedMasterKey) {
     // LLM response carried non-empty reasoning_content. `fixed` and
     // explicit-userMessage paths produce no LLM response, so this
     // block is naturally skipped for them (llmResponse stays null).
-    const reasoning = readReasoningContent(llmResponse);
     if (reasoning) {
       const reasoningPush = buildReasoningPush({
         messageType: decryptedPayload.messageType,

package/dist/index.d.ts

@@ -880,7 +880,7 @@ function readReasoningContent(llmResponse) {
   const choices = /** @type {{ choices?: unknown }} */ (llmResponse).choices;
   if (!Array.isArray(choices) || choices.length === 0) return null;
   const message = /** @type {{ message?: { reasoning_content?: unknown, content?: unknown } }} */ (choices[0])?.message;
-  
+
   const raw = message?.reasoning_content;
   if (typeof raw === 'string') {
     const trimmed = raw.trim();
@@ -889,7 +889,7 @@ function readReasoningContent(llmResponse) {
 
   const content = message?.content;
   if (typeof content === 'string') {
-    const match = content.match(/<(think|thinking|thought)>([\s\S]*?)<\/\1>/i);
+    const match = content.match(REASONING_TAG_RE);
     if (match) {
       const trimmed = match[2].trim();
       if (trimmed.length > 0) return trimmed;
@@ -899,6 +899,22 @@ function readReasoningContent(llmResponse) {
   return null;
 }
 
+const REASONING_TAG_RE = /<(think|thinking|thought)>([\s\S]*?)<\/\1>/i;
+const REASONING_TAG_RE_G = /<(think|thinking|thought)>[\s\S]*?<\/\1>/gi;
+
+/**
+ * Mirrors `amsg-instant/src/message-processor.js#stripReasoningTags`.
+ * Removes any private chain-of-thought markup leaking through
+ * `message.content` so it does not also ship inside ContentPush.
+ *
+ * @param {string} content
+ * @returns {string}
+ */
+function stripReasoningTags(content) {
+  if (typeof content !== 'string' || !content.includes('<')) return content;
+  return content.replace(REASONING_TAG_RE_G, '').trim();
+}
+
 /**
  * @typedef {Object} ProcessorContext
  * @property {Object}  webpush           - The web-push module instance (already VAPID-configured).
@@ -952,6 +968,15 @@ async function processSingleMessage(task, ctx, providedMasterKey) {
       throw new Error('Invalid message configuration: no content source available');
     }
 
+    // Auto-extract reasoning BEFORE the sentence split: when reasoning
+    // came from the `<think>` fallback inside message.content, the same
+    // span is still embedded in messageContent and would otherwise leak
+    // as raw markup into ContentPush.
+    const reasoning = readReasoningContent(llmResponse);
+    if (reasoning) {
+      messageContent = stripReasoningTags(messageContent);
+    }
+
     // Sentence splitting (mirrors @rei-standard/amsg-instant
     // splitMessageIntoSentences — keep in lockstep; do not drift). Caller may
     // override the default regex via decryptedPayload.splitPattern (string
@@ -988,7 +1013,6 @@ async function processSingleMessage(task, ctx, providedMasterKey) {
     // LLM response carried non-empty reasoning_content. `fixed` and
     // explicit-userMessage paths produce no LLM response, so this
     // block is naturally skipped for them (llmResponse stays null).
-    const reasoning = readReasoningContent(llmResponse);
     if (reasoning) {
       const reasoningPush = buildReasoningPush({
         messageType: decryptedPayload.messageType,

package/dist/index.mjs

@@ -525,7 +525,7 @@ function readReasoningContent(llmResponse) {
   }
   const content = message?.content;
   if (typeof content === "string") {
-    const match = content.match(/<(think|thinking|thought)>([\s\S]*?)<\/\1>/i);
+    const match = content.match(REASONING_TAG_RE);
     if (match) {
       const trimmed = match[2].trim();
       if (trimmed.length > 0) return trimmed;
@@ -533,6 +533,12 @@ function readReasoningContent(llmResponse) {
   }
   return null;
 }
+var REASONING_TAG_RE = /<(think|thinking|thought)>([\s\S]*?)<\/\1>/i;
+var REASONING_TAG_RE_G = /<(think|thinking|thought)>[\s\S]*?<\/\1>/gi;
+function stripReasoningTags(content) {
+  if (typeof content !== "string" || !content.includes("<")) return content;
+  return content.replace(REASONING_TAG_RE_G, "").trim();
+}
 async function processSingleMessage(task, ctx, providedMasterKey) {
   try {
     const masterKey = providedMasterKey || ctx.masterKey;
@@ -563,6 +569,10 @@ async function processSingleMessage(task, ctx, providedMasterKey) {
     } else {
       throw new Error("Invalid message configuration: no content source available");
     }
+    const reasoning = readReasoningContent(llmResponse);
+    if (reasoning) {
+      messageContent = stripReasoningTags(messageContent);
+    }
     const messages = splitMessageIntoSentences(messageContent, decryptedPayload.splitPattern ?? null);
     if (!ctx.vapid.email || !ctx.vapid.publicKey || !ctx.vapid.privateKey) {
       throw new Error("VAPID configuration missing - push notifications cannot be sent");
@@ -574,7 +584,6 @@ async function processSingleMessage(task, ctx, providedMasterKey) {
     const avatarUrl = decryptedPayload.avatarUrl || null;
     const metadata = decryptedPayload.metadata || {};
     const messageIdBase = task.id != null ? `msg_task_${task.id}` : `msg_${randomUUID()}_instant`;
-    const reasoning = readReasoningContent(llmResponse);
     if (reasoning) {
       const reasoningPush = buildReasoningPush({
         messageType: decryptedPayload.messageType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rei-standard/amsg-server",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "ReiStandard Active Messaging server SDK with pluggable database adapters. Three-axis push schema (messageKind / messageType / messageSubtype) from @rei-standard/amsg-shared. Auto-emits ReasoningPush when the LLM response carries reasoning_content.",
   "repository": {
     "type": "git",