@auto-ai/agent 2.1.191 → 2.1.192

package/mcps-runtime/claude-ws-channel/server/gateway.bundle.mjs

@@ -51002,6 +51002,14 @@ function extractJsonStringField(text, key) {
   }
   return;
 }
+function extractLastMetadataStringField(tail, entryType, fieldKey) {
+  const prefix = `{"type":"${entryType}"`;
+  const line = tail.split(`
+`).findLast((l) => l.startsWith(prefix));
+  if (!line)
+    return;
+  return extractLastJsonStringField(line, fieldKey);
+}
 function extractLastJsonStringField(text, key) {
   const patterns = [`"${key}":"`, `"${key}": "`];
   let lastValue;
@@ -51029,6 +51037,12 @@ function extractLastJsonStringField(text, key) {
   }
   return lastValue;
 }
+function unwrapChannelWrappedPrompt(text) {
+  const matched = text.match(/^<channel\s+[^>]+>\s*([\s\S]*?)\s*<\/channel>\s*$/i);
+  if (!matched)
+    return text;
+  return (matched[1] ?? "").trim();
+}
 function extractFirstPromptFromHead(head) {
   let start = 0;
   let commandFallback = "";
@@ -51078,7 +51092,7 @@ function extractFirstPromptFromHead(head) {
         }
       }
       for (const raw of texts) {
-        let result = raw.replace(/\n/g, " ").trim();
+        let result = unwrapChannelWrappedPrompt(raw).replace(/\n/g, " ").trim();
         if (!result)
           continue;
         const cmdMatch = COMMAND_NAME_RE.exec(result);
@@ -296049,7 +296063,7 @@ function migrateLegacyAttachmentTypes(message) {
   }
   return message;
 }
-function deserializeMessagesWithInterruptDetection(serializedMessages) {
+function deserializeMessagesWithInterruptDetection(serializedMessages, options) {
   try {
     const migratedMessages = serializedMessages.map(migrateLegacyAttachmentTypes);
     const validModes = new Set(PERMISSION_MODES);
@@ -296060,10 +296074,10 @@ function deserializeMessagesWithInterruptDetection(serializedMessages) {
     }
     const filteredToolUses = filterUnresolvedToolUses(migratedMessages);
     const filteredThinking = filterOrphanedThinkingOnlyMessages(filteredToolUses);
-    const filteredMessages = filterWhitespaceOnlyAssistantMessages(filteredThinking);
+    const filteredMessages = filteredThinking;
     const internalState = detectTurnInterruption(filteredMessages);
     let turnInterruptionState;
-    if (internalState.kind === "interrupted_turn") {
+    if (internalState.kind === "interrupted_turn" && !options?.skipInterruptedPlaceholders) {
       const [continuationMessage] = normalizeMessages([
         createUserMessage({
           content: "Continue from where you left off.",
@@ -296078,11 +296092,13 @@ function deserializeMessagesWithInterruptDetection(serializedMessages) {
     } else {
       turnInterruptionState = internalState;
     }
-    const lastRelevantIdx = filteredMessages.findLastIndex((m4) => m4.type !== "system" && m4.type !== "progress");
-    if (lastRelevantIdx !== -1 && filteredMessages[lastRelevantIdx].type === "user") {
-      filteredMessages.splice(lastRelevantIdx + 1, 0, createAssistantMessage({
-        content: NO_RESPONSE_REQUESTED
-      }));
+    if (!options?.skipInterruptedPlaceholders) {
+      const lastRelevantIdx = filteredMessages.findLastIndex((m4) => m4.type !== "system" && m4.type !== "progress");
+      if (lastRelevantIdx !== -1 && filteredMessages[lastRelevantIdx].type === "user") {
+        filteredMessages.splice(lastRelevantIdx + 1, 0, createAssistantMessage({
+          content: NO_RESPONSE_REQUESTED
+        }));
+      }
     }
     return { messages: filteredMessages, turnInterruptionState };
   } catch (error49) {
@@ -296221,7 +296237,9 @@ async function loadConversationForResume(source, sourceJsonlFile, options) {
       checkResumeConsistency(messages);
     }
     restoreSkillStateFromMessages(messages);
-    const deserialized = deserializeMessagesWithInterruptDetection(messages);
+    const deserialized = deserializeMessagesWithInterruptDetection(messages, {
+      skipInterruptedPlaceholders: options?.skipInterruptedPlaceholders
+    });
     messages = deserialized.messages;
     const hookMessages = options?.headlessWsResume ? [] : await processSessionStartHooks("resume", { sessionId });
     messages.push(...hookMessages);
@@ -325630,7 +325648,7 @@ function parseSessionInfoFromLite(sessionId, lite, projectPath) {
     if (!Number.isNaN(parsed))
       createdAt = parsed;
   }
-  const summary = customTitle || extractLastJsonStringField(tail, "lastPrompt") || extractLastJsonStringField(tail, "summary") || firstPrompt || fallbackSessionSummary(sessionId);
+  const summary = firstPrompt || fallbackSessionSummary(sessionId);
   const gitBranch = extractLastJsonStringField(tail, "gitBranch") || extractJsonStringField(head, "gitBranch") || undefined;
   const sessionCwd = extractJsonStringField(head, "cwd") || projectPath || undefined;
   const tagLine = tail.split(`
@@ -388005,7 +388023,7 @@ function normalizeMessagesForAPI(messages, tools = []) {
           timestamp: message.timestamp
         });
         const lastMessage = last_default(result);
-        if (lastMessage?.type === "user") {
+        if (lastMessage?.type === "user" && canMergeAdjacentUserMessages(lastMessage, userMsg)) {
           result[result.length - 1] = mergeUserMessages(lastMessage, userMsg);
           return;
         }
@@ -388054,7 +388072,7 @@ function normalizeMessagesForAPI(messages, tools = []) {
           }
         }
         const lastMessage = last_default(result);
-        if (lastMessage?.type === "user") {
+        if (lastMessage?.type === "user" && canMergeAdjacentUserMessages(lastMessage, normalizedMessage)) {
           result[result.length - 1] = mergeUserMessages(lastMessage, normalizedMessage);
           return;
         }
@@ -388111,7 +388129,21 @@ function normalizeMessagesForAPI(messages, tools = []) {
         const attachmentMessage = checkStatsigFeatureGate_CACHED_MAY_BE_STALE("tengu_chair_sermon") ? rawAttachmentMessage.map(ensureSystemReminderWrap) : rawAttachmentMessage;
         const lastMessage = last_default(result);
         if (lastMessage?.type === "user") {
-          result[result.length - 1] = attachmentMessage.reduce((p4, c8) => mergeUserMessagesAndToolResults(p4, c8), lastMessage);
+          const mergedUsers = [];
+          let acc = lastMessage;
+          for (const candidate of attachmentMessage) {
+            if (canMergeAdjacentUserMessages(acc, candidate)) {
+              acc = mergeUserMessagesAndToolResults(acc, candidate);
+            } else {
+              mergedUsers.push(acc);
+              acc = candidate;
+            }
+          }
+          mergedUsers.push(acc);
+          result[result.length - 1] = mergedUsers[0];
+          for (let i6 = 1;i6 < mergedUsers.length; i6 += 1) {
+            result.push(mergedUsers[i6]);
+          }
           return;
         }
         result.push(...attachmentMessage);
@@ -388122,8 +388154,7 @@ function normalizeMessagesForAPI(messages, tools = []) {
   const relocated = checkStatsigFeatureGate_CACHED_MAY_BE_STALE("tengu_toolref_defer_j8m") ? relocateToolReferenceSiblings(result) : result;
   const withFilteredOrphans = filterOrphanedThinkingOnlyMessages(relocated);
   const withFilteredThinking = filterTrailingThinkingFromLastAssistant(withFilteredOrphans);
-  const withFilteredWhitespace = filterWhitespaceOnlyAssistantMessages(withFilteredThinking);
-  const withNonEmpty = ensureNonEmptyAssistantContent(withFilteredWhitespace);
+  const withNonEmpty = ensureNonEmptyAssistantContent(withFilteredThinking);
   const smooshed = checkStatsigFeatureGate_CACHED_MAY_BE_STALE("tengu_chair_sermon") ? smooshSystemReminderSiblings(mergeAdjacentUserMessages(withNonEmpty)) : withNonEmpty;
   const sanitized = sanitizeErrorToolResultContent(smooshed);
   if (false) {}
@@ -388131,10 +388162,14 @@ function normalizeMessagesForAPI(messages, tools = []) {
   return sanitized;
 }
 function mergeUserMessagesAndToolResults(a5, b5) {
+  if (!canMergeAdjacentUserMessages(a5, b5)) {
+    return b5;
+  }
   const lastContent = normalizeUserTextContent(a5.message.content);
   const currentContent = normalizeUserTextContent(b5.message.content);
   return {
     ...a5,
+    isMeta: a5.isMeta && b5.isMeta ? true : undefined,
     message: {
       ...a5.message,
       content: hoistToolResults(mergeUserContentBlocks(lastContent, currentContent))
@@ -388159,12 +388194,16 @@ function isToolResultMessage(msg) {
     return false;
   return content.some((block) => block.type === "tool_result");
 }
+function canMergeAdjacentUserMessages(a5, b5) {
+  return Boolean(a5.isMeta) === Boolean(b5.isMeta);
+}
 function mergeUserMessages(a5, b5) {
   const lastContent = normalizeUserTextContent(a5.message.content);
   const currentContent = normalizeUserTextContent(b5.message.content);
   if (false) {}
   return {
     ...a5,
+    isMeta: a5.isMeta && b5.isMeta ? true : undefined,
     uuid: a5.isMeta ? b5.uuid : a5.uuid,
     message: {
       ...a5.message,
@@ -388176,7 +388215,7 @@ function mergeAdjacentUserMessages(msgs) {
   const out = [];
   for (const m4 of msgs) {
     const prev = out.at(-1);
-    if (m4.type === "user" && prev?.type === "user") {
+    if (m4.type === "user" && prev?.type === "user" && canMergeAdjacentUserMessages(prev, m4)) {
       out[out.length - 1] = mergeUserMessages(prev, m4);
     } else {
       out.push(m4);
@@ -389608,53 +389647,6 @@ function filterTrailingThinkingFromLastAssistant(messages) {
   };
   return result;
 }
-function hasOnlyWhitespaceTextContent(content) {
-  if (content.length === 0) {
-    return false;
-  }
-  for (const block of content) {
-    if (block.type !== "text") {
-      return false;
-    }
-    if (block.text !== undefined && block.text.trim() !== "") {
-      return false;
-    }
-  }
-  return true;
-}
-function filterWhitespaceOnlyAssistantMessages(messages) {
-  let hasChanges = false;
-  const filtered = messages.filter((message) => {
-    if (message.type !== "assistant") {
-      return true;
-    }
-    const content = message.message.content;
-    if (!Array.isArray(content) || content.length === 0) {
-      return true;
-    }
-    if (hasOnlyWhitespaceTextContent(content)) {
-      hasChanges = true;
-      logEvent("tengu_filtered_whitespace_only_assistant", {
-        messageUUID: message.uuid
-      });
-      return false;
-    }
-    return true;
-  });
-  if (!hasChanges) {
-    return messages;
-  }
-  const merged = [];
-  for (const message of filtered) {
-    const prev = merged.at(-1);
-    if (message.type === "user" && prev?.type === "user") {
-      merged[merged.length - 1] = mergeUserMessages(prev, message);
-    } else {
-      merged.push(message);
-    }
-  }
-  return merged;
-}
 function ensureNonEmptyAssistantContent(messages) {
   if (messages.length === 0) {
     return messages;
@@ -398792,27 +398784,28 @@ function getFirstMeaningfulUserMessageTextContent(transcript) {
     for (const textContent of texts) {
       if (!textContent)
         continue;
-      const commandNameTag = extractTag(textContent, COMMAND_NAME_TAG);
+      const normalized = unwrapChannelWrappedPrompt(textContent);
+      const commandNameTag = extractTag(normalized, COMMAND_NAME_TAG);
       if (commandNameTag) {
         const commandName = commandNameTag.replace(/^\//, "");
         if (builtInCommandNames().has(commandName)) {
           continue;
         } else {
-          const commandArgs = extractTag(textContent, "command-args")?.trim();
+          const commandArgs = extractTag(normalized, "command-args")?.trim();
           if (!commandArgs) {
             continue;
           }
           return `${commandNameTag} ${commandArgs}`;
         }
       }
-      const bashInput = extractTag(textContent, "bash-input");
+      const bashInput = extractTag(normalized, "bash-input");
       if (bashInput) {
         return `! ${bashInput}`;
       }
-      if (SKIP_FIRST_PROMPT_PATTERN2.test(textContent)) {
+      if (SKIP_FIRST_PROMPT_PATTERN2.test(normalized)) {
         continue;
       }
-      return textContent;
+      return normalized;
     }
   }
   return;
@@ -400394,10 +400387,12 @@ async function readLiteMetadata(filePath, fileSize, buf) {
   const projectPath = extractJsonStringField(head, "cwd");
   const teamName = extractJsonStringField(head, "teamName");
   const agentSetting = extractJsonStringField(head, "agentSetting");
-  const firstPrompt = extractLastJsonStringField(tail, "lastPrompt") || extractFirstPromptFromChunk(head) || extractJsonStringFieldPrefix(head, "content", 200) || extractJsonStringFieldPrefix(head, "text", 200) || "";
+  const firstPrompt = extractLastMetadataStringField(tail, "last-prompt", "lastPrompt") || extractFirstPromptFromChunk(head) || extractJsonStringFieldPrefix(head, "content", 200) || extractJsonStringFieldPrefix(head, "text", 200) || "";
   const customTitle = extractLastJsonStringField(tail, "customTitle") ?? extractLastJsonStringField(head, "customTitle") ?? extractLastJsonStringField(tail, "aiTitle") ?? extractLastJsonStringField(head, "aiTitle");
-  const summary = extractLastJsonStringField(tail, "summary");
-  const tag2 = extractLastJsonStringField(tail, "tag");
+  const summary = extractLastMetadataStringField(tail, "summary", "summary");
+  const tagLine = tail.split(`
+`).findLast((l4) => l4.startsWith('{"type":"tag"'));
+  const tag2 = tagLine ? extractLastJsonStringField(tagLine, "tag") || undefined : undefined;
   const gitBranch = extractLastJsonStringField(tail, "gitBranch") ?? extractJsonStringField(head, "gitBranch");
   const prUrl = extractLastJsonStringField(tail, "prUrl");
   const prRepository = extractLastJsonStringField(tail, "prRepository");
@@ -400468,7 +400463,9 @@ function extractFirstPromptFromChunk(chunk) {
       for (const text2 of texts) {
         if (!text2)
           continue;
-        let result = text2.replace(/\n/g, " ").trim();
+        let result = unwrapChannelWrappedPrompt(text2).replace(/\n/g, " ").trim();
+        if (!result)
+          continue;
         const commandNameTag = extractTag(result, COMMAND_NAME_TAG);
         if (commandNameTag) {
           const name3 = commandNameTag.replace(/^\//, "");
@@ -405853,6 +405850,20 @@ function messagesToWsV3Envelopes(args) {
 }
 
 // src/server/api/sessionReplayController.ts
+async function isSessionChildRunning(agent, storageId) {
+  const socket = process.env.WS_MAIN_RPC_SOCKET?.trim();
+  if (!socket) {
+    return false;
+  }
+  const statuses = await new MainRpcClient(socket).listSessionRuntimeStatus(agent);
+  if (!statuses?.length) {
+    return false;
+  }
+  return statuses.some((st) => {
+    const key2 = resolveSessionTranscriptStorageId(st.sessionId) ?? st.sessionId;
+    return key2 === storageId && st.running === true;
+  });
+}
 async function handleSessionReplayApi(req, url3) {
   if (url3.pathname !== "/api/sessions/replay") {
     return;
@@ -405903,8 +405914,10 @@ async function handleSessionReplayApi(req, url3) {
     let messages = [];
     try {
       await access3(jsonlPath);
+      const childRunning = await isSessionChildRunning(agent, storageId);
       const loaded = await loadConversationForResume(storageId, jsonlPath, {
-        headlessWsResume: true
+        headlessWsResume: true,
+        skipInterruptedPlaceholders: childRunning
       });
       messages = loaded?.messages ?? [];
     } catch (e5) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auto-ai/agent",
-  "version": "2.1.191",
+  "version": "2.1.192",
   "description": "Auto AI Agent 网关 CLI（WebSocket，独立二进制，无需 Bun）",
   "type": "module",
   "maintainers": [
@@ -32,11 +32,11 @@
     "zod": "^4.3.6"
   },
   "optionalDependencies": {
-    "@auto-ai/agent-linux-x64": "2.1.191",
-    "@auto-ai/agent-linux-arm64": "2.1.191",
-    "@auto-ai/agent-darwin-x64": "2.1.191",
-    "@auto-ai/agent-darwin-arm64": "2.1.191",
-    "@auto-ai/agent-win-x64": "2.1.191"
+    "@auto-ai/agent-linux-x64": "2.1.192",
+    "@auto-ai/agent-linux-arm64": "2.1.192",
+    "@auto-ai/agent-darwin-x64": "2.1.192",
+    "@auto-ai/agent-darwin-arm64": "2.1.192",
+    "@auto-ai/agent-win-x64": "2.1.192"
   },
   "scripts": {
     "prepare": "node ../../scripts/sync-launcher-env.js",