nolo-cli 0.1.39 → 0.1.41

package/chat/messages/messageAgent.ts

@@ -0,0 +1,8 @@
+import type { Message } from "./types";
+
+export function resolveMessageAgentKey(
+  message: Partial<Message> | null | undefined
+): string | undefined {
+  if (!message) return undefined;
+  return message.agentKey || message.cybotKey;
+}

package/chat/messages/messageContent.ts

@@ -0,0 +1,199 @@
+// 文件路径: packages/chat/messages/messageContent.ts
+
+/*
+ * ==================================================================
+ *  /chat/messages/messageContent.ts
+ *  - 负责处理 AI 流式内容 & 图片上传
+ * ==================================================================
+ */
+
+import type { RootState } from "../../app/store";
+import { upload } from "../../database/dbSlice";
+import { getRuntimeServerContext } from "../../database/runtimeServerContext";
+import { buildMessageFileContentUrl } from "./fileUrl";
+
+import { ContentType } from "../../app/types";
+import { addContentAction } from "../../create/space/content/addContentAction";
+
+/** 判断 URL 是否为 data:image 开头的 dataURL */
+const isDataUrlImage = (url: unknown): url is string =>
+  typeof url === "string" && url.startsWith("data:image");
+
+/**
+ * 将生成的 dataURL 图片上传为文件，并返回最终 URL。
+ * 失败时返回原始 dataURL，避免打断主流程。
+ */
+const uploadGeneratedImageDataUrl = async (
+  url: string,
+  dialogId: string,
+  messageId: string,
+  index: number,
+  dispatch: any,
+  getState: () => RootState,
+  options?: { spaceId?: string; agentName?: string }
+): Promise<string> => {
+  const fileName = `generated-image-${dialogId}-${messageId}-${index}.png`;
+  const { dataURLtoFile, waitForFileReady } = await import("../../app/utils/imageUtils");
+  const file = dataURLtoFile(url, fileName);
+
+  if (!file) {
+    console.warn(
+      "[messageContent] dataURLtoFile failed, keep dataURL for generated image"
+    );
+    return url;
+  }
+
+  const customKey = `generated-image-${dialogId}-${messageId}-${index}`;
+
+  let metadata: any;
+  try {
+    metadata = await dispatch(upload({ file, customKey }) as any).unwrap();
+  } catch (err) {
+    console.warn(
+      "[messageContent] upload generated image failed, keep dataURL:",
+      err
+    );
+    return url;
+  }
+
+  const state = getState() as RootState;
+  const { currentServer } = getRuntimeServerContext(state);
+  const fileId = (metadata?.dbKey || metadata?.id) as string | undefined;
+
+  if (!currentServer || !fileId) {
+    console.warn(
+      "[messageContent] missing currentServer or fileId, keep dataURL",
+      { currentServer, fileId }
+    );
+    return url;
+  }
+
+  // 如果提供了 spaceId，尝试保存到空间内容
+  if (options?.spaceId) {
+    try {
+      const agentPrefix = options.agentName ? `[${options.agentName}] ` : "";
+      const title = `${agentPrefix}Generated Image ${index + 1}`;
+
+      await addContentAction({
+        spaceId: options.spaceId,
+        contentKey: fileId,
+        title,
+        type: ContentType.IMAGE,
+      }, { dispatch, getState });
+
+      console.log(`[messageContent] Saved generated image to space: ${options.spaceId}`);
+    } catch (err) {
+      console.error("[messageContent] Failed to save generated image to space:", err);
+    }
+  }
+
+  const imageUrl = buildMessageFileContentUrl(currentServer, fileId);
+  if (!imageUrl) {
+    return url;
+  }
+  const ready = await waitForFileReady(imageUrl);
+
+  if (!ready) {
+    console.warn(
+      "[messageContent] uploaded generated image not ready, keep dataURL:",
+      imageUrl
+    );
+    return url;
+  }
+
+  return imageUrl;
+};
+
+/**
+ * 遍历 assistant 的 contentBuffer：
+ * - 对于 type === "image_url" 且 url 是 dataURL 的项：
+ *   - 上传为文件
+ *   - 把 url 替换成正式的文件 URL
+ * - 其他内容保持不变
+ */
+export const normalizeAssistantContentBuffer = async (
+  contentBuffer: any[],
+  dialogId: string,
+  messageId: string,
+  dispatch: any,
+  getState: () => RootState,
+  options?: { spaceId?: string; agentName?: string }
+): Promise<any[]> => {
+  if (!Array.isArray(contentBuffer) || contentBuffer.length === 0) {
+    return contentBuffer;
+  }
+
+  const updated = await Promise.all(
+    contentBuffer.map(async (part, index) => {
+      if (
+        !part ||
+        part.type !== "image_url" ||
+        !part.image_url ||
+        !isDataUrlImage(part.image_url.url)
+      ) {
+        return part;
+      }
+
+      const newUrl = await uploadGeneratedImageDataUrl(
+        part.image_url.url,
+        dialogId,
+        messageId,
+        index,
+        dispatch,
+        getState,
+        options
+      );
+
+      if (newUrl === part.image_url.url) {
+        return part;
+      }
+
+      return {
+        ...part,
+        image_url: {
+          ...part.image_url,
+          url: newUrl,
+        },
+      };
+    })
+  );
+
+  return updated;
+};
+
+/**
+ * 将 Message.content 归一化为纯文本:
+ * - string → 直接使用
+ * - OpenAI 风格数组 → 拼接 text 片段，image_url 替换为占位符
+ * - 其他 → null
+ *
+ * 共享函数：标题生成 / 摘要生成 / 上下文序列化均可复用
+ */
+export const serializeMessageContent = (
+  content: any,
+  imagePlaceholder = "[图片]"
+): string | null => {
+  if (typeof content === "string") {
+    return content.trim() || null;
+  }
+
+  if (Array.isArray(content)) {
+    const fragments: string[] = [];
+
+    for (const part of content) {
+      if (!part || typeof part !== "object") continue;
+
+      if (part.type === "text" && typeof part.text === "string") {
+        const text = part.text.trim();
+        if (text) fragments.push(text);
+      } else if (part.type === "image_url") {
+        fragments.push(imagePlaceholder);
+      }
+    }
+
+    const joined = fragments.join("\n").trim();
+    return joined || null;
+  }
+
+  return null;
+};

package/chat/messages/messageContract.ts

@@ -0,0 +1,88 @@
+import type { MessageContentPart } from "./types";
+
+type MessageLike = {
+  role?: string;
+  content?: string | MessageContentPart[] | null;
+};
+
+export function separateThinkContent(contentBuffer: MessageContentPart[]) {
+  let thinkContent = "";
+  let normalContent = "";
+
+  const combinedText = contentBuffer
+    .filter((c) => c.type === "text" && c.text)
+    .map((c) => c.text)
+    .join("");
+
+  const thinkMatches = combinedText.match(/<think\b[^>]*>(.*?)<\/think>/gis);
+
+  if (thinkMatches) {
+    thinkContent = thinkMatches
+      .map((m) => m.replace(/<think\b[^>]*>|<\/think>/gi, ""))
+      .join("\n\n");
+
+    normalContent = combinedText
+      .replace(/<think\b[^>]*>.*?<\/think>/gis, "")
+      .trim();
+  } else {
+    normalContent = combinedText;
+  }
+
+  return { thinkContent, normalContent };
+}
+
+export function countImageParts(
+  content: string | MessageContentPart[] | null | undefined,
+): number {
+  if (!Array.isArray(content)) return 0;
+  return content.filter((part) => part?.type === "image_url").length;
+}
+
+export function summarizeMessagesForDebug(
+  messages: Array<MessageLike> | null | undefined,
+) {
+  const safeMessages = Array.isArray(messages) ? messages : [];
+  return {
+    count: safeMessages.length,
+    roles: safeMessages.map((message) => message?.role ?? "unknown"),
+    imageMessageCount: safeMessages.filter(
+      (message) => countImageParts(message?.content ?? null) > 0,
+    ).length,
+  };
+}
+
+export function finalizeAssistantMessageContent(
+  normalizedContentBuffer: MessageContentPart[],
+  reasoningBuffer = "",
+) {
+  const { thinkContent: tagThink, normalContent } =
+    separateThinkContent(normalizedContentBuffer);
+
+  const thinkContent = `${tagThink}${reasoningBuffer}`.trim();
+  const hasNonTextParts = normalizedContentBuffer.some(
+    (part) => part && part.type && part.type !== "text",
+  );
+
+  return {
+    thinkContent,
+    textContent: normalContent || "",
+    visibleContent: hasNonTextParts
+      ? normalizedContentBuffer
+      : normalContent || "",
+    hasNonTextParts,
+    imagePartCount: countImageParts(normalizedContentBuffer),
+  };
+}
+
+export function appendSaveFailureToContent(
+  content: string | MessageContentPart[] | null | undefined,
+): string | MessageContentPart[] {
+  const failureText = "[Failed to save message]";
+  if (Array.isArray(content)) {
+    return [...content, { type: "text", text: failureText }];
+  }
+  if (typeof content === "string" && content.length > 0) {
+    return `${content}\n${failureText}`;
+  }
+  return failureText;
+}