nolo-cli 0.1.41 → 0.1.43

package/chat/messages/activityCompletion.ts

@@ -0,0 +1,97 @@
+import { serializeMessageContent } from "./messageContent";
+import {
+  buildActivityTimeline,
+  type ToolActivityStatus,
+} from "./web/toolDisplayName";
+
+type ActivityMessage = Parameters<typeof buildActivityTimeline>[0][number];
+
+type AssistantActivityCompletionInput = {
+  messages: ActivityMessage[];
+  finalContent: unknown;
+};
+
+type AssistantActivityCompletionMetadata = {
+  activity: {
+    phase: {
+      id: string;
+      title: string;
+      index?: number;
+      total?: number;
+      status: Extract<ToolActivityStatus, "success">;
+    };
+  };
+};
+
+const FINAL_DELIVERY_PHASE_PATTERNS = [
+  /汇报/,
+  /回复/,
+  /总结/,
+  /结果/,
+  /交付/,
+  /可视化/,
+  /图表/,
+  /report/i,
+  /deliver/i,
+  /result/i,
+  /summary/i,
+  /visual/i,
+  /chart/i,
+];
+
+const FAILED_FINAL_CONTENT_PATTERNS = [
+  /抱歉/,
+  /无法/,
+  /不能/,
+  /失败/,
+  /出错/,
+  /未完成/,
+  /cannot/i,
+  /can't/i,
+  /failed/i,
+  /error/i,
+  /unable/i,
+];
+
+function isLikelyFinalDeliveryPhase(title: string): boolean {
+  return FINAL_DELIVERY_PHASE_PATTERNS.some((pattern) => pattern.test(title));
+}
+
+function isLikelyFailedFinalContent(text: string): boolean {
+  return FAILED_FINAL_CONTENT_PATTERNS.some((pattern) => pattern.test(text));
+}
+
+export function inferAssistantActivityCompletionMetadata({
+  messages,
+  finalContent,
+}: AssistantActivityCompletionInput): AssistantActivityCompletionMetadata | undefined {
+  const finalText = serializeMessageContent(finalContent, "[图片]")?.trim();
+  if (!finalText || isLikelyFailedFinalContent(finalText)) return undefined;
+
+  const timeline = buildActivityTimeline(messages);
+  if (timeline.totalPhases <= 1 || timeline.completedPhases >= timeline.totalPhases) {
+    return undefined;
+  }
+
+  const finalPhase = timeline.phases[timeline.phases.length - 1];
+  if (!finalPhase || finalPhase.status !== "pending") return undefined;
+
+  const priorPhases = timeline.phases.slice(0, -1);
+  if (priorPhases.length === 0 || priorPhases.some((phase) => phase.status !== "success")) {
+    return undefined;
+  }
+
+  if (!isLikelyFinalDeliveryPhase(finalPhase.title)) return undefined;
+
+  return {
+    activity: {
+      phase: {
+        id: finalPhase.id,
+        title: finalPhase.title,
+        ...(finalPhase.index !== undefined ? { index: finalPhase.index } : {}),
+        ...(finalPhase.total !== undefined ? { total: finalPhase.total } : {}),
+        status: "success",
+      },
+    },
+  };
+}

package/chat/messages/imagePayloadPersistence.ts

@@ -0,0 +1,22 @@
+type ImagePayloadPart = Record<string, any>;
+
+export const stripDurableImageInlinePayload = <T extends ImagePayloadPart>(
+  part: T,
+): T => {
+  if (!part || typeof part !== "object") return part;
+
+  const { original_data_url: _originalDataUrl, ...withoutOriginalDataUrl } =
+    part;
+
+  if (
+    withoutOriginalDataUrl.type !== "image_url" ||
+    !withoutOriginalDataUrl.google_native ||
+    typeof withoutOriginalDataUrl.google_native !== "object"
+  ) {
+    return withoutOriginalDataUrl as T;
+  }
+
+  const { google_native: _googleNative, ...durablePart } =
+    withoutOriginalDataUrl;
+  return durablePart as T;
+};

package/chat/messages/messageContent.ts

@@ -10,10 +10,12 @@
 import type { RootState } from "../../app/store";
 import { upload } from "../../database/dbSlice";
 import { getRuntimeServerContext } from "../../database/runtimeServerContext";
+import { dataURLtoFile, waitForFileReady } from "../../app/utils/imageUtils";
 import { buildMessageFileContentUrl } from "./fileUrl";
 
 import { ContentType } from "../../app/types";
 import { addContentAction } from "../../create/space/content/addContentAction";
+import { stripDurableImageInlinePayload } from "./imagePayloadPersistence";
 
 /** 判断 URL 是否为 data:image 开头的 dataURL */
 const isDataUrlImage = (url: unknown): url is string =>
@@ -21,7 +23,7 @@ const isDataUrlImage = (url: unknown): url is string =>
 
 /**
  * 将生成的 dataURL 图片上传为文件，并返回最终 URL。
- * 失败时返回原始 dataURL，避免打断主流程。
+ * 失败时返回 null，避免把大 base64 图片持久化进 message。
  */
 const uploadGeneratedImageDataUrl = async (
   url: string,
@@ -31,16 +33,15 @@ const uploadGeneratedImageDataUrl = async (
   dispatch: any,
   getState: () => RootState,
   options?: { spaceId?: string; agentName?: string }
-): Promise<string> => {
+): Promise<string | null> => {
   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"
+      "[messageContent] dataURLtoFile failed, drop generated image inline payload"
     );
-    return url;
+    return null;
   }
 
   const customKey = `generated-image-${dialogId}-${messageId}-${index}`;
@@ -50,10 +51,10 @@ const uploadGeneratedImageDataUrl = async (
     metadata = await dispatch(upload({ file, customKey }) as any).unwrap();
   } catch (err) {
     console.warn(
-      "[messageContent] upload generated image failed, keep dataURL:",
+      "[messageContent] upload generated image failed, drop inline payload:",
       err
     );
-    return url;
+    return null;
   }
 
   const state = getState() as RootState;
@@ -62,10 +63,10 @@ const uploadGeneratedImageDataUrl = async (
 
   if (!currentServer || !fileId) {
     console.warn(
-      "[messageContent] missing currentServer or fileId, keep dataURL",
+      "[messageContent] missing currentServer or fileId, drop inline payload",
       { currentServer, fileId }
     );
-    return url;
+    return null;
   }
 
   // 如果提供了 spaceId，尝试保存到空间内容
@@ -89,16 +90,16 @@ const uploadGeneratedImageDataUrl = async (
 
   const imageUrl = buildMessageFileContentUrl(currentServer, fileId);
   if (!imageUrl) {
-    return url;
+    return null;
   }
   const ready = await waitForFileReady(imageUrl);
 
   if (!ready) {
     console.warn(
-      "[messageContent] uploaded generated image not ready, keep dataURL:",
+      "[messageContent] uploaded generated image not ready, drop inline payload:",
       imageUrl
     );
-    return url;
+    return null;
   }
 
   return imageUrl;
@@ -144,17 +145,20 @@ export const normalizeAssistantContentBuffer = async (
         options
       );
 
-      if (newUrl === part.image_url.url) {
-        return part;
+      if (!newUrl) {
+        return {
+          type: "text",
+          text: "[图片保存失败，请重试生成图片]",
+        };
       }
 
-      return {
+      return stripDurableImageInlinePayload({
         ...part,
         image_url: {
           ...part.image_url,
           url: newUrl,
         },
-      };
+      });
     })
   );
 

package/chat/messages/messageSlice.ts

@@ -35,6 +35,7 @@ import {
   appendSaveFailureToContent,
   finalizeAssistantMessageContent,
 } from "./messageContract";
+import { inferAssistantActivityCompletionMetadata } from "./activityCompletion";
 import { estimateMissingUsage } from "../../ai/token/missingUsageEstimate";
 import {
   countImageGenerationOutputsInContent,
@@ -837,6 +838,23 @@ export const messageSlice = createSliceWithThunks({
         const agentName = rawName || undefined;
         const { imageGenerationState: _transientImageGenerationState, ...persistedMessageMetadata } =
           payload.messageMetadata ?? {};
+        const {
+          metadata: persistedMetadata,
+          ...otherPersistedMessageMetadata
+        } = persistedMessageMetadata;
+        const shouldInferActivityCompletion =
+          !(persistedMetadata as Record<string, unknown> | undefined)?.activity &&
+          (!toolCalls || toolCalls.length === 0);
+        const inferredActivityCompletionMetadata = shouldInferActivityCompletion
+          ? inferAssistantActivityCompletionMetadata({
+              messages: selectAllMsgs(getState() as RootState, dialogId),
+              finalContent: finalVisibleContent,
+            })
+          : undefined;
+        const finalMetadata =
+          inferredActivityCompletionMetadata
+            ? { ...(persistedMetadata ?? {}), ...inferredActivityCompletionMetadata }
+            : persistedMetadata;
 
         const finalMessage: Message = {
           id: messageId,
@@ -848,7 +866,8 @@ export const messageSlice = createSliceWithThunks({
           cybotKey: agentConfig.dbKey,
           usage: finalUsageData,
           isStreaming: false,
-          ...persistedMessageMetadata,
+          ...otherPersistedMessageMetadata,
+          ...(finalMetadata ? { metadata: finalMetadata } : {}),
           ...(agentName ? { agentName } : {}),
           ...(toolCalls && toolCalls.length > 0
             ? { tool_calls: toolCalls }

package/chat/messages/toolThunks.ts

@@ -107,7 +107,23 @@ const processToolData = createAsyncThunk(
       }
     }
 
-    const inputSummary = JSON.stringify(toolArgs).slice(0, 400);
+    const activity =
+      toolArgs &&
+      typeof toolArgs === "object" &&
+      !Array.isArray(toolArgs) &&
+      toolArgs._activity &&
+      typeof toolArgs._activity === "object"
+        ? toolArgs._activity
+        : undefined;
+    const executionToolArgs =
+      toolArgs &&
+      typeof toolArgs === "object" &&
+      !Array.isArray(toolArgs) &&
+      Object.prototype.hasOwnProperty.call(toolArgs, "_activity")
+        ? (({ _activity: _ignored, ...rest }) => rest)(toolArgs)
+        : toolArgs;
+
+    const inputSummary = JSON.stringify(executionToolArgs).slice(0, 400);
 
     dispatch(
       toolRunStarted({
@@ -117,7 +133,7 @@ const processToolData = createAsyncThunk(
         behavior,
         inputSummary,
         interaction,
-        input: toolArgs,
+        input: executionToolArgs,
       })
     );
 
@@ -128,7 +144,7 @@ const processToolData = createAsyncThunk(
 
         const previewExecutor = def?.previewExecutor;
         const previewResult = previewExecutor
-          ? await previewExecutor(toolArgs, thunkApi, { parentMessageId })
+          ? await previewExecutor(executionToolArgs, thunkApi, { parentMessageId })
           : {
             rawData: {
               previewOnly: true,
@@ -149,10 +165,11 @@ const processToolData = createAsyncThunk(
         const toolPayload: ToolPayload = {
           toolName: canonicalName,
           status: "pending",
-          input: toolArgs,
+          input: executionToolArgs,
           rawToolCall: toolCall,
           toolRunId,
           summary,
+          ...(activity ? { activity } : {}),
         };
 
         return {
@@ -191,11 +208,12 @@ const processToolData = createAsyncThunk(
         const toolPayload: ToolPayload = {
           toolName: canonicalName,
           status: "failed",
-          input: toolArgs,
+          input: executionToolArgs,
           rawToolCall: toolCall,
           error: errorPayload,
           toolRunId,
           summary,
+          ...(activity ? { activity } : {}),
         };
 
         return rejectWithValue({
@@ -212,7 +230,7 @@ const processToolData = createAsyncThunk(
 
     // ========= 分支二：auto 工具（包括 ui_ask_choice / readFile / createPlan 等） =========
     try {
-      const toolResult = await found.executor(toolArgs, thunkApi, {
+      const toolResult = await found.executor(executionToolArgs, thunkApi, {
         parentMessageId,
         toolRunId,
       });
@@ -239,18 +257,19 @@ const processToolData = createAsyncThunk(
       const toolPayload: ToolPayload = {
         toolName: canonicalName,
         status: "succeeded",
-        input: toolArgs,
+        input: executionToolArgs,
         rawToolCall: toolCall,
         toolRunId,
         summary,
         ...(llmContext ? { llmContext } : {}),
+        ...(activity ? { activity } : {}),
       };
 
       // ✅ 关键：ui_ask_choice(blocking=true) 也视作“暂停点”
       const isUiAskChoice = canonicalName === "ui_ask_choice";
       const blocking =
-        typeof toolArgs?.blocking === "boolean"
-          ? toolArgs.blocking
+        typeof executionToolArgs?.blocking === "boolean"
+          ? executionToolArgs.blocking
           : true; // schema 默认 true
 
       const hasPendingInteraction =
@@ -274,7 +293,7 @@ const processToolData = createAsyncThunk(
 
       if (requiresConfirmation) {
         const confirmedInput = {
-          ...(toolArgs ?? {}),
+          ...(executionToolArgs ?? {}),
           __confirmedSelfEvolution: true,
         };
         const summary =
@@ -302,6 +321,7 @@ const processToolData = createAsyncThunk(
           rawToolCall: toolCall,
           toolRunId,
           summary,
+          ...(activity ? { activity } : {}),
         };
 
         return {
@@ -342,11 +362,12 @@ const processToolData = createAsyncThunk(
       const toolPayload: ToolPayload = {
         toolName: canonicalName,
         status: "failed",
-        input: toolArgs,
+        input: executionToolArgs,
         rawToolCall: toolCall,
         error: errorPayload,
         toolRunId,
         summary,
+        ...(activity ? { activity } : {}),
       };
 
       return rejectWithValue({

package/chat/messages/types.ts

@@ -16,7 +16,7 @@ export interface OpenAIImageContent {
     detail?: "low" | "high" | "auto";
   };
   google_native?: {
-    inlineData: {
+    inlineData?: {
       mimeType: string;
       data: string;
     };
@@ -112,6 +112,12 @@ export interface ToolPayload {
    */
   summary?: string;
 
+  /**
+   * Human-readable tool activity hint for UI projection.
+   * Execution output remains in message.content; this is display metadata only.
+   */
+  activity?: unknown;
+
   /**
    * 提供给下一轮 LLM 的结构化上下文补充。
    * 典型场景：工具真实产物（如 fileId / 可复用 URL）不能只靠 summary 传达。
@@ -153,6 +159,7 @@ export interface Message {
   imageGenerationState?: ImageGenerationState;
   userId?: string;
   usage?: any;
+  metadata?: Record<string, unknown>;
 
   controller?: AbortController;