@maudecode/openclaw-cowtail 0.11.0 → 0.12.1

package/dist/index.js

@@ -13746,6 +13746,16 @@ var openclawActionStateSchema = exports_external.enum(["pending", "submitted", "
 var openclawToolCallStatusSchema = exports_external.enum(["pending", "running", "complete", "error"]);
 var openclawEventTypeSchema = exports_external.enum(openclawEventTypes);
 var openclawSequenceSchema = exports_external.number().int().nonnegative();
+var openclawMessageTextSchema = exports_external.string();
+function hasOpenClawRenderableContent(value) {
+  return value.text.trim().length > 0 || (value.links?.length ?? 0) > 0 || (value.toolCalls?.length ?? 0) > 0 || (value.actions?.length ?? 0) > 0;
+}
+function requireOpenClawRenderableContent(schema) {
+  return schema.refine((value) => hasOpenClawRenderableContent(value), {
+    message: "OpenClaw messages require text or renderable content",
+    path: ["text"]
+  });
+}
 var openclawLinkSchema = exports_external.object({
   label: nonEmptyStringSchema,
   url: nonEmptyStringSchema
@@ -13788,18 +13798,19 @@ var openclawThreadRecordSchema = exports_external.object({
   updatedAt: timestampSchema,
   lastMessageAt: timestampSchema.optional()
 });
-var openclawMessageRecordSchema = exports_external.object({
+var openclawMessageRecordBaseSchema = exports_external.object({
   id: nonEmptyStringSchema,
   threadId: nonEmptyStringSchema,
   direction: openclawMessageDirectionSchema,
   authorLabel: nonEmptyStringSchema.optional(),
-  text: nonEmptyStringSchema,
+  text: openclawMessageTextSchema,
   links: exports_external.array(openclawLinkSchema).default([]),
   toolCalls: exports_external.array(openclawToolCallRecordSchema).default([]),
   deliveryState: openclawDeliveryStateSchema,
   createdAt: timestampSchema,
   updatedAt: timestampSchema
 });
+var openclawMessageRecordSchema = requireOpenClawRenderableContent(openclawMessageRecordBaseSchema);
 var openclawActionRecordSchema = exports_external.object({
   id: nonEmptyStringSchema,
   threadId: nonEmptyStringSchema,
@@ -13838,28 +13849,28 @@ var openclawActionDraftSchema = exports_external.object({
   kind: nonEmptyStringSchema,
   payload: jsonObjectSchema
 });
-var openclawPluginMessageCommandSchema = exports_external.object({
+var openclawPluginMessageCommandSchema = requireOpenClawRenderableContent(exports_external.object({
   type: exports_external.literal("openclaw_message"),
   requestId: openclawRequestIdSchema,
   sessionKey: nonEmptyStringSchema,
   title: nonEmptyStringSchema.optional(),
-  text: nonEmptyStringSchema,
+  text: openclawMessageTextSchema,
   authorLabel: nonEmptyStringSchema.optional(),
   links: exports_external.array(openclawLinkSchema).default([]),
   toolCalls: exports_external.array(openclawToolCallRecordSchema).default([]),
   actions: exports_external.array(openclawActionDraftSchema).default([]),
   deliveryState: openclawDeliveryStateSchema.optional()
-});
-var openclawPluginMessageUpdateCommandSchema = exports_external.object({
+}));
+var openclawPluginMessageUpdateCommandSchema = requireOpenClawRenderableContent(exports_external.object({
   type: exports_external.literal("openclaw_message_update"),
   requestId: openclawRequestIdSchema,
   messageId: nonEmptyStringSchema,
-  text: nonEmptyStringSchema,
+  text: openclawMessageTextSchema,
   links: exports_external.array(openclawLinkSchema).optional(),
   toolCalls: exports_external.array(openclawToolCallRecordSchema).optional(),
   actions: exports_external.array(openclawActionDraftSchema).optional(),
   deliveryState: openclawDeliveryStateSchema.optional()
-});
+}));
 var openclawIosNewThreadCommandSchema = exports_external.object({
   type: exports_external.literal("ios_new_thread"),
   requestId: openclawRequestIdSchema,
@@ -13907,7 +13918,7 @@ var openclawActionResultCommandSchema = exports_external.object({
   state: exports_external.enum(["submitted", "failed", "expired"]),
   resultMetadata: jsonObjectSchema.optional()
 });
-var openclawRealtimeClientMessageSchema = exports_external.discriminatedUnion("type", [
+var openclawRealtimeClientMessageSchema = exports_external.union([
   openclawPluginMessageCommandSchema,
   openclawPluginMessageUpdateCommandSchema,
   openclawIosNewThreadCommandSchema,
@@ -13949,9 +13960,9 @@ var openclawMessageListResponseSchema = exports_external.object({
   count: exports_external.number().int().nonnegative(),
   messages: exports_external.array(openclawMessageRecordSchema)
 });
-var openclawMessageWithActionsRecordSchema = openclawMessageRecordSchema.extend({
+var openclawMessageWithActionsRecordSchema = requireOpenClawRenderableContent(openclawMessageRecordBaseSchema.extend({
   actions: exports_external.array(openclawActionRecordSchema).default([])
-});
+}));
 var openclawMessageWithActionsListResponseSchema = exports_external.object({
   ok: exports_external.literal(true),
   count: exports_external.number().int().nonnegative(),
@@ -14591,7 +14602,7 @@ async function dispatchCowtailTextTurn(params) {
     body,
     timestamp: message.createdAt
   });
-  const streamState = { text: "", toolCalls: [] };
+  const streamState = { text: "", links: [], toolCalls: [] };
   await recordCowtailInboundSessionAndDispatchReply({
     cfg: runtime.config.loadConfig(),
     channel: CHANNEL_ID,
@@ -14617,6 +14628,10 @@ async function dispatchCowtailTextTurn(params) {
       logger?.error?.(`Cowtail ${info.kind} reply failed: ${errorMessage(error48)}`);
     }
   });
+  await finalizeCowtailStreamedReply({
+    client,
+    streamState
+  });
 }
 async function dispatchCowtailActionTurn(params) {
   const { account, client, runtime, logger, route, thread, action, payload, timestamp } = params;
@@ -14643,7 +14658,7 @@ async function dispatchCowtailActionTurn(params) {
     timestamp
   });
   let dispatchFailed = false;
-  const streamState = { text: "", toolCalls: [] };
+  const streamState = { text: "", links: [], toolCalls: [] };
   await recordCowtailInboundSessionAndDispatchReply({
     cfg: runtime.config.loadConfig(),
     channel: CHANNEL_ID,
@@ -14670,6 +14685,10 @@ async function dispatchCowtailActionTurn(params) {
       logger?.error?.(`Cowtail ${info.kind} reply failed: ${errorMessage(error48)}`);
     }
   });
+  await finalizeCowtailStreamedReply({
+    client,
+    streamState
+  });
   return !dispatchFailed;
 }
 async function recordCowtailInboundSessionAndDispatchReply(params) {
@@ -14700,6 +14719,7 @@ async function recordCowtailInboundSessionAndDispatchReply(params) {
       onError: params.onDispatchError
     },
     replyOptions: {
+      disableBlockStreaming: false,
       onModelSelected
     }
   });
@@ -14711,14 +14731,17 @@ async function deliverCowtailReply(params) {
   const text = params.payload.text;
   const kind = params.info?.kind ?? "final";
   const links = resolveCowtailReplyLinks(params.payload);
+  if (links.length > 0) {
+    params.streamState.links = links;
+  }
   if (kind === "tool") {
-    const { toolCall, summary } = buildCowtailToolCall({
+    const toolCall = buildCowtailToolCall({
       payload: params.payload,
       rawPayload: params.rawPayload,
       streamState: params.streamState
     });
     params.streamState.toolCalls = [...params.streamState.toolCalls, toolCall];
-    const messageText = params.streamState.text || summary || "Tool activity";
+    const messageText = params.streamState.text;
     if (!params.streamState.messageId) {
       const result = await params.client.sendOpenClawMessage({
         type: "openclaw_message",
@@ -14731,7 +14754,11 @@ async function deliverCowtailReply(params) {
         actions: [],
         deliveryState: "pending"
       });
-      params.streamState.messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      const messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      if (!messageId) {
+        return;
+      }
+      params.streamState.messageId = messageId;
       return;
     }
     await params.client.sendOpenClawMessageUpdate({
@@ -14761,7 +14788,11 @@ async function deliverCowtailReply(params) {
         actions: [],
         deliveryState: "pending"
       });
-      params.streamState.messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      const messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      if (!messageId) {
+        return;
+      }
+      params.streamState.messageId = messageId;
       return;
     }
     await params.client.sendOpenClawMessageUpdate({
@@ -14785,6 +14816,7 @@ async function deliverCowtailReply(params) {
       actions: [],
       deliveryState: "sent"
     });
+    params.streamState.completed = true;
     return;
   }
   await params.client.sendOpenClawMessage({
@@ -14798,8 +14830,29 @@ async function deliverCowtailReply(params) {
     actions: [],
     deliveryState: "sent"
   });
+  params.streamState.completed = true;
+}
+async function finalizeCowtailStreamedReply(params) {
+  if (params.streamState.failed || params.streamState.completed || !params.streamState.messageId || !params.streamState.text.trim() && params.streamState.toolCalls.length === 0) {
+    return;
+  }
+  await params.client.sendOpenClawMessageUpdate({
+    type: "openclaw_message_update",
+    messageId: params.streamState.messageId,
+    text: params.streamState.text,
+    links: params.streamState.links,
+    toolCalls: params.streamState.toolCalls,
+    actions: [],
+    deliveryState: "sent"
+  });
+  params.streamState.completed = true;
 }
 function recordCreatedOpenClawMessageId(streamState, result) {
+  if (result.payload?.dropped === true) {
+    streamState.failed = true;
+    streamState.completed = true;
+    return;
+  }
   const messageId = result.payload?.messageId;
   if (typeof messageId === "string" && messageId.trim()) {
     return messageId;
@@ -14825,9 +14878,8 @@ function normalizeCowtailReplyPayload(payload) {
 }
 function buildCowtailToolCall(params) {
   const rawToolCall = readRawToolCall(params.rawPayload);
-  const summary = resolveToolCallSummary(params.payload, rawToolCall);
   const index = params.streamState.toolCalls.length + 1;
-  const toolCall = {
+  return {
     id: rawToolCall.id ?? `tool-${index}`,
     name: rawToolCall.name ?? "tool_result",
     ...rawToolCall.args ? { args: rawToolCall.args } : {},
@@ -14838,10 +14890,6 @@ function buildCowtailToolCall(params) {
     insertedAtContentLength: params.streamState.text.length,
     contentSnapshotAtStart: params.streamState.text
   };
-  return {
-    toolCall,
-    ...summary ? { summary } : {}
-  };
 }
 function readRawToolCall(payload) {
   if (!payload || typeof payload !== "object") {
@@ -14872,16 +14920,6 @@ function readRawToolCall(payload) {
     ...contentSnapshotAtStart !== undefined ? { contentSnapshotAtStart } : {}
   };
 }
-function resolveToolCallSummary(payload, toolCall) {
-  if (typeof payload.text === "string" && payload.text.trim()) {
-    return payload.text.trim().split(`
-`)[0];
-  }
-  if (toolCall.name) {
-    return toolCall.name;
-  }
-  return;
-}
 function readString(value) {
   return typeof value === "string" && value.trim() ? value : undefined;
 }
@@ -15153,7 +15191,7 @@ function createCowtailChannelPlugin(deps = defaultDeps) {
         reactions: false,
         edit: false,
         unsend: false,
-        blockStreaming: false
+        blockStreaming: true
       },
       setup: {
         applyAccountConfig: ({ cfg }) => cfg

package/dist/setup-entry.js

@@ -13746,6 +13746,16 @@ var openclawActionStateSchema = exports_external.enum(["pending", "submitted", "
 var openclawToolCallStatusSchema = exports_external.enum(["pending", "running", "complete", "error"]);
 var openclawEventTypeSchema = exports_external.enum(openclawEventTypes);
 var openclawSequenceSchema = exports_external.number().int().nonnegative();
+var openclawMessageTextSchema = exports_external.string();
+function hasOpenClawRenderableContent(value) {
+  return value.text.trim().length > 0 || (value.links?.length ?? 0) > 0 || (value.toolCalls?.length ?? 0) > 0 || (value.actions?.length ?? 0) > 0;
+}
+function requireOpenClawRenderableContent(schema) {
+  return schema.refine((value) => hasOpenClawRenderableContent(value), {
+    message: "OpenClaw messages require text or renderable content",
+    path: ["text"]
+  });
+}
 var openclawLinkSchema = exports_external.object({
   label: nonEmptyStringSchema,
   url: nonEmptyStringSchema
@@ -13788,18 +13798,19 @@ var openclawThreadRecordSchema = exports_external.object({
   updatedAt: timestampSchema,
   lastMessageAt: timestampSchema.optional()
 });
-var openclawMessageRecordSchema = exports_external.object({
+var openclawMessageRecordBaseSchema = exports_external.object({
   id: nonEmptyStringSchema,
   threadId: nonEmptyStringSchema,
   direction: openclawMessageDirectionSchema,
   authorLabel: nonEmptyStringSchema.optional(),
-  text: nonEmptyStringSchema,
+  text: openclawMessageTextSchema,
   links: exports_external.array(openclawLinkSchema).default([]),
   toolCalls: exports_external.array(openclawToolCallRecordSchema).default([]),
   deliveryState: openclawDeliveryStateSchema,
   createdAt: timestampSchema,
   updatedAt: timestampSchema
 });
+var openclawMessageRecordSchema = requireOpenClawRenderableContent(openclawMessageRecordBaseSchema);
 var openclawActionRecordSchema = exports_external.object({
   id: nonEmptyStringSchema,
   threadId: nonEmptyStringSchema,
@@ -13838,28 +13849,28 @@ var openclawActionDraftSchema = exports_external.object({
   kind: nonEmptyStringSchema,
   payload: jsonObjectSchema
 });
-var openclawPluginMessageCommandSchema = exports_external.object({
+var openclawPluginMessageCommandSchema = requireOpenClawRenderableContent(exports_external.object({
   type: exports_external.literal("openclaw_message"),
   requestId: openclawRequestIdSchema,
   sessionKey: nonEmptyStringSchema,
   title: nonEmptyStringSchema.optional(),
-  text: nonEmptyStringSchema,
+  text: openclawMessageTextSchema,
   authorLabel: nonEmptyStringSchema.optional(),
   links: exports_external.array(openclawLinkSchema).default([]),
   toolCalls: exports_external.array(openclawToolCallRecordSchema).default([]),
   actions: exports_external.array(openclawActionDraftSchema).default([]),
   deliveryState: openclawDeliveryStateSchema.optional()
-});
-var openclawPluginMessageUpdateCommandSchema = exports_external.object({
+}));
+var openclawPluginMessageUpdateCommandSchema = requireOpenClawRenderableContent(exports_external.object({
   type: exports_external.literal("openclaw_message_update"),
   requestId: openclawRequestIdSchema,
   messageId: nonEmptyStringSchema,
-  text: nonEmptyStringSchema,
+  text: openclawMessageTextSchema,
   links: exports_external.array(openclawLinkSchema).optional(),
   toolCalls: exports_external.array(openclawToolCallRecordSchema).optional(),
   actions: exports_external.array(openclawActionDraftSchema).optional(),
   deliveryState: openclawDeliveryStateSchema.optional()
-});
+}));
 var openclawIosNewThreadCommandSchema = exports_external.object({
   type: exports_external.literal("ios_new_thread"),
   requestId: openclawRequestIdSchema,
@@ -13907,7 +13918,7 @@ var openclawActionResultCommandSchema = exports_external.object({
   state: exports_external.enum(["submitted", "failed", "expired"]),
   resultMetadata: jsonObjectSchema.optional()
 });
-var openclawRealtimeClientMessageSchema = exports_external.discriminatedUnion("type", [
+var openclawRealtimeClientMessageSchema = exports_external.union([
   openclawPluginMessageCommandSchema,
   openclawPluginMessageUpdateCommandSchema,
   openclawIosNewThreadCommandSchema,
@@ -13949,9 +13960,9 @@ var openclawMessageListResponseSchema = exports_external.object({
   count: exports_external.number().int().nonnegative(),
   messages: exports_external.array(openclawMessageRecordSchema)
 });
-var openclawMessageWithActionsRecordSchema = openclawMessageRecordSchema.extend({
+var openclawMessageWithActionsRecordSchema = requireOpenClawRenderableContent(openclawMessageRecordBaseSchema.extend({
   actions: exports_external.array(openclawActionRecordSchema).default([])
-});
+}));
 var openclawMessageWithActionsListResponseSchema = exports_external.object({
   ok: exports_external.literal(true),
   count: exports_external.number().int().nonnegative(),
@@ -14591,7 +14602,7 @@ async function dispatchCowtailTextTurn(params) {
     body,
     timestamp: message.createdAt
   });
-  const streamState = { text: "", toolCalls: [] };
+  const streamState = { text: "", links: [], toolCalls: [] };
   await recordCowtailInboundSessionAndDispatchReply({
     cfg: runtime.config.loadConfig(),
     channel: CHANNEL_ID,
@@ -14617,6 +14628,10 @@ async function dispatchCowtailTextTurn(params) {
       logger?.error?.(`Cowtail ${info.kind} reply failed: ${errorMessage(error48)}`);
     }
   });
+  await finalizeCowtailStreamedReply({
+    client,
+    streamState
+  });
 }
 async function dispatchCowtailActionTurn(params) {
   const { account, client, runtime, logger, route, thread, action, payload, timestamp } = params;
@@ -14643,7 +14658,7 @@ async function dispatchCowtailActionTurn(params) {
     timestamp
   });
   let dispatchFailed = false;
-  const streamState = { text: "", toolCalls: [] };
+  const streamState = { text: "", links: [], toolCalls: [] };
   await recordCowtailInboundSessionAndDispatchReply({
     cfg: runtime.config.loadConfig(),
     channel: CHANNEL_ID,
@@ -14670,6 +14685,10 @@ async function dispatchCowtailActionTurn(params) {
       logger?.error?.(`Cowtail ${info.kind} reply failed: ${errorMessage(error48)}`);
     }
   });
+  await finalizeCowtailStreamedReply({
+    client,
+    streamState
+  });
   return !dispatchFailed;
 }
 async function recordCowtailInboundSessionAndDispatchReply(params) {
@@ -14700,6 +14719,7 @@ async function recordCowtailInboundSessionAndDispatchReply(params) {
       onError: params.onDispatchError
     },
     replyOptions: {
+      disableBlockStreaming: false,
       onModelSelected
     }
   });
@@ -14711,14 +14731,17 @@ async function deliverCowtailReply(params) {
   const text = params.payload.text;
   const kind = params.info?.kind ?? "final";
   const links = resolveCowtailReplyLinks(params.payload);
+  if (links.length > 0) {
+    params.streamState.links = links;
+  }
   if (kind === "tool") {
-    const { toolCall, summary } = buildCowtailToolCall({
+    const toolCall = buildCowtailToolCall({
       payload: params.payload,
       rawPayload: params.rawPayload,
       streamState: params.streamState
     });
     params.streamState.toolCalls = [...params.streamState.toolCalls, toolCall];
-    const messageText = params.streamState.text || summary || "Tool activity";
+    const messageText = params.streamState.text;
     if (!params.streamState.messageId) {
       const result = await params.client.sendOpenClawMessage({
         type: "openclaw_message",
@@ -14731,7 +14754,11 @@ async function deliverCowtailReply(params) {
         actions: [],
         deliveryState: "pending"
       });
-      params.streamState.messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      const messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      if (!messageId) {
+        return;
+      }
+      params.streamState.messageId = messageId;
       return;
     }
     await params.client.sendOpenClawMessageUpdate({
@@ -14761,7 +14788,11 @@ async function deliverCowtailReply(params) {
         actions: [],
         deliveryState: "pending"
       });
-      params.streamState.messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      const messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      if (!messageId) {
+        return;
+      }
+      params.streamState.messageId = messageId;
       return;
     }
     await params.client.sendOpenClawMessageUpdate({
@@ -14785,6 +14816,7 @@ async function deliverCowtailReply(params) {
       actions: [],
       deliveryState: "sent"
     });
+    params.streamState.completed = true;
     return;
   }
   await params.client.sendOpenClawMessage({
@@ -14798,8 +14830,29 @@ async function deliverCowtailReply(params) {
     actions: [],
     deliveryState: "sent"
   });
+  params.streamState.completed = true;
+}
+async function finalizeCowtailStreamedReply(params) {
+  if (params.streamState.failed || params.streamState.completed || !params.streamState.messageId || !params.streamState.text.trim() && params.streamState.toolCalls.length === 0) {
+    return;
+  }
+  await params.client.sendOpenClawMessageUpdate({
+    type: "openclaw_message_update",
+    messageId: params.streamState.messageId,
+    text: params.streamState.text,
+    links: params.streamState.links,
+    toolCalls: params.streamState.toolCalls,
+    actions: [],
+    deliveryState: "sent"
+  });
+  params.streamState.completed = true;
 }
 function recordCreatedOpenClawMessageId(streamState, result) {
+  if (result.payload?.dropped === true) {
+    streamState.failed = true;
+    streamState.completed = true;
+    return;
+  }
   const messageId = result.payload?.messageId;
   if (typeof messageId === "string" && messageId.trim()) {
     return messageId;
@@ -14825,9 +14878,8 @@ function normalizeCowtailReplyPayload(payload) {
 }
 function buildCowtailToolCall(params) {
   const rawToolCall = readRawToolCall(params.rawPayload);
-  const summary = resolveToolCallSummary(params.payload, rawToolCall);
   const index = params.streamState.toolCalls.length + 1;
-  const toolCall = {
+  return {
     id: rawToolCall.id ?? `tool-${index}`,
     name: rawToolCall.name ?? "tool_result",
     ...rawToolCall.args ? { args: rawToolCall.args } : {},
@@ -14838,10 +14890,6 @@ function buildCowtailToolCall(params) {
     insertedAtContentLength: params.streamState.text.length,
     contentSnapshotAtStart: params.streamState.text
   };
-  return {
-    toolCall,
-    ...summary ? { summary } : {}
-  };
 }
 function readRawToolCall(payload) {
   if (!payload || typeof payload !== "object") {
@@ -14872,16 +14920,6 @@ function readRawToolCall(payload) {
     ...contentSnapshotAtStart !== undefined ? { contentSnapshotAtStart } : {}
   };
 }
-function resolveToolCallSummary(payload, toolCall) {
-  if (typeof payload.text === "string" && payload.text.trim()) {
-    return payload.text.trim().split(`
-`)[0];
-  }
-  if (toolCall.name) {
-    return toolCall.name;
-  }
-  return;
-}
 function readString(value) {
   return typeof value === "string" && value.trim() ? value : undefined;
 }
@@ -15153,7 +15191,7 @@ function createCowtailChannelPlugin(deps = defaultDeps) {
         reactions: false,
         edit: false,
         unsend: false,
-        blockStreaming: false
+        blockStreaming: true
       },
       setup: {
         applyAccountConfig: ({ cfg }) => cfg

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maudecode/openclaw-cowtail",
-  "version": "0.11.0",
+  "version": "0.12.1",
   "description": "Cowtail channel plugin for OpenClaw",
   "type": "module",
   "repository": {