@maudecode/openclaw-cowtail 0.9.1 → 0.11.0

package/dist/index.js

@@ -13728,6 +13728,7 @@ var openclawEventTypes = [
   "thread_created",
   "thread_updated",
   "message_created",
+  "message_updated",
   "message_acknowledged",
   "reply_created",
   "action_submitted",
@@ -13742,12 +13743,24 @@ var openclawTargetAgentSchema = exports_external.literal("default");
 var openclawMessageDirectionSchema = exports_external.enum(["openclaw_to_user", "user_to_openclaw"]);
 var openclawDeliveryStateSchema = exports_external.enum(["pending", "sent", "failed"]);
 var openclawActionStateSchema = exports_external.enum(["pending", "submitted", "failed", "expired"]);
+var openclawToolCallStatusSchema = exports_external.enum(["pending", "running", "complete", "error"]);
 var openclawEventTypeSchema = exports_external.enum(openclawEventTypes);
 var openclawSequenceSchema = exports_external.number().int().nonnegative();
 var openclawLinkSchema = exports_external.object({
   label: nonEmptyStringSchema,
   url: nonEmptyStringSchema
 });
+var openclawToolCallRecordSchema = exports_external.object({
+  id: nonEmptyStringSchema,
+  name: nonEmptyStringSchema,
+  args: jsonObjectSchema.optional(),
+  result: exports_external.unknown().optional(),
+  status: openclawToolCallStatusSchema,
+  startedAt: timestampSchema.optional(),
+  completedAt: timestampSchema.optional(),
+  insertedAtContentLength: exports_external.number().int().nonnegative().optional(),
+  contentSnapshotAtStart: exports_external.string().optional()
+});
 var openclawPluginClientHelloSchema = exports_external.object({
   protocolVersion: openclawProtocolVersionSchema,
   clientKind: exports_external.literal("openclaw_plugin"),
@@ -13782,6 +13795,7 @@ var openclawMessageRecordSchema = exports_external.object({
   authorLabel: nonEmptyStringSchema.optional(),
   text: nonEmptyStringSchema,
   links: exports_external.array(openclawLinkSchema).default([]),
+  toolCalls: exports_external.array(openclawToolCallRecordSchema).default([]),
   deliveryState: openclawDeliveryStateSchema,
   createdAt: timestampSchema,
   updatedAt: timestampSchema
@@ -13832,7 +13846,19 @@ var openclawPluginMessageCommandSchema = exports_external.object({
   text: nonEmptyStringSchema,
   authorLabel: nonEmptyStringSchema.optional(),
   links: exports_external.array(openclawLinkSchema).default([]),
-  actions: exports_external.array(openclawActionDraftSchema).default([])
+  toolCalls: exports_external.array(openclawToolCallRecordSchema).default([]),
+  actions: exports_external.array(openclawActionDraftSchema).default([]),
+  deliveryState: openclawDeliveryStateSchema.optional()
+});
+var openclawPluginMessageUpdateCommandSchema = exports_external.object({
+  type: exports_external.literal("openclaw_message_update"),
+  requestId: openclawRequestIdSchema,
+  messageId: nonEmptyStringSchema,
+  text: nonEmptyStringSchema,
+  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"),
@@ -13883,6 +13909,7 @@ var openclawActionResultCommandSchema = exports_external.object({
 });
 var openclawRealtimeClientMessageSchema = exports_external.discriminatedUnion("type", [
   openclawPluginMessageCommandSchema,
+  openclawPluginMessageUpdateCommandSchema,
   openclawIosNewThreadCommandSchema,
   openclawIosReplyCommandSchema,
   openclawIosActionCommandSchema,
@@ -13895,7 +13922,8 @@ var openclawRealtimeClientMessageSchema = exports_external.discriminatedUnion("t
 var openclawRealtimeAckSchema = exports_external.object({
   type: exports_external.literal("ack"),
   requestId: openclawRequestIdSchema,
-  sequence: openclawSequenceSchema.optional()
+  sequence: openclawSequenceSchema.optional(),
+  payload: jsonObjectSchema.optional()
 });
 var openclawRealtimeErrorSchema = exports_external.object({
   type: exports_external.literal("realtime_error"),
@@ -14129,9 +14157,19 @@ class CowtailRealtimeClient {
       ...command,
       requestId: this.#requestIdFactory(),
       links: command.links ?? [],
+      toolCalls: command.toolCalls ?? [],
       actions: command.actions ?? []
     });
   }
+  sendOpenClawMessageUpdate(command) {
+    return this.#sendCommand({
+      ...command,
+      requestId: this.#requestIdFactory(),
+      ...command.links ? { links: command.links } : {},
+      ...command.toolCalls ? { toolCalls: command.toolCalls } : {},
+      ...command.actions ? { actions: command.actions } : {}
+    });
+  }
   sendSessionBound(command) {
     return this.#sendCommand({
       ...command,
@@ -14236,7 +14274,7 @@ class CowtailRealtimeClient {
     }
     const message = parsed.data;
     if (message.type === "ack") {
-      this.#resolvePendingRequest(message.requestId, message.sequence);
+      this.#resolvePendingRequest(message.requestId, message.sequence, message.payload);
       return;
     }
     if (message.type === "realtime_error") {
@@ -14319,13 +14357,17 @@ class CowtailRealtimeClient {
       }
     });
   }
-  #resolvePendingRequest(requestId, sequence) {
+  #resolvePendingRequest(requestId, sequence, payload) {
     const pending = this.#pendingRequests.get(requestId);
     if (!pending) {
       return;
     }
     this.#pendingRequests.delete(requestId);
-    pending.resolve({ requestId, sequence });
+    pending.resolve({
+      requestId,
+      sequence,
+      ...payload ? { payload } : {}
+    });
   }
   #rejectPendingRequest(message) {
     if (!message.requestId) {
@@ -14399,7 +14441,8 @@ class CowtailRealtimeClient {
 }
 
 // src/inbound.ts
-import { dispatchInboundReplyWithBase } from "openclaw/plugin-sdk/inbound-reply-dispatch";
+import { createChannelReplyPipeline } from "openclaw/plugin-sdk/channel-reply-pipeline";
+import { normalizeOutboundReplyPayload } from "openclaw/plugin-sdk/reply-payload";
 
 // src/session-keys.ts
 function normalizeCowtailTarget(raw) {
@@ -14548,19 +14591,24 @@ async function dispatchCowtailTextTurn(params) {
     body,
     timestamp: message.createdAt
   });
-  await dispatchInboundReplyWithBase({
+  const streamState = { text: "", toolCalls: [] };
+  await recordCowtailInboundSessionAndDispatchReply({
     cfg: runtime.config.loadConfig(),
     channel: CHANNEL_ID,
     accountId: account.accountId,
+    agentId: route.agentId,
     route,
     storePath,
     ctxPayload,
-    core: runtime,
-    deliver: async (payload) => deliverCowtailReply({
+    runtime,
+    deliver: async (payload, info, rawPayload) => deliverCowtailReply({
       client,
       route,
       thread,
-      payload
+      payload,
+      rawPayload,
+      info,
+      streamState
     }),
     onRecordError: (error48) => {
       logger?.error?.(`Cowtail inbound session record failed: ${errorMessage(error48)}`);
@@ -14595,19 +14643,24 @@ async function dispatchCowtailActionTurn(params) {
     timestamp
   });
   let dispatchFailed = false;
-  await dispatchInboundReplyWithBase({
+  const streamState = { text: "", toolCalls: [] };
+  await recordCowtailInboundSessionAndDispatchReply({
     cfg: runtime.config.loadConfig(),
     channel: CHANNEL_ID,
     accountId: account.accountId,
+    agentId: route.agentId,
     route,
     storePath,
     ctxPayload,
-    core: runtime,
-    deliver: async (replyPayload) => deliverCowtailReply({
+    runtime,
+    deliver: async (replyPayload, info, rawPayload) => deliverCowtailReply({
       client,
       route,
       thread,
-      payload: replyPayload
+      payload: replyPayload,
+      rawPayload,
+      info,
+      streamState
     }),
     onRecordError: (error48) => {
       logger?.error?.(`Cowtail inbound session record failed: ${errorMessage(error48)}`);
@@ -14619,21 +14672,141 @@ async function dispatchCowtailActionTurn(params) {
   });
   return !dispatchFailed;
 }
+async function recordCowtailInboundSessionAndDispatchReply(params) {
+  await params.runtime.channel.session.recordInboundSession({
+    storePath: params.storePath,
+    sessionKey: typeof params.ctxPayload.SessionKey === "string" ? params.ctxPayload.SessionKey : params.route.sessionKey,
+    ctx: params.ctxPayload,
+    onRecordError: params.onRecordError
+  });
+  const { onModelSelected, ...replyPipeline } = createChannelReplyPipeline({
+    cfg: params.cfg,
+    agentId: params.agentId,
+    channel: params.channel,
+    accountId: params.accountId
+  });
+  await params.runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
+    ctx: params.ctxPayload,
+    cfg: params.cfg,
+    dispatcherOptions: {
+      ...replyPipeline,
+      deliver: async (payload, info) => {
+        try {
+          await params.deliver(normalizeCowtailReplyPayload(payload), info, payload);
+        } catch (error48) {
+          params.onDispatchError(error48, { kind: info?.kind ?? "final" });
+        }
+      },
+      onError: params.onDispatchError
+    },
+    replyOptions: {
+      onModelSelected
+    }
+  });
+}
 async function deliverCowtailReply(params) {
+  if (params.streamState.failed) {
+    return;
+  }
   const text = params.payload.text;
+  const kind = params.info?.kind ?? "final";
+  const links = resolveCowtailReplyLinks(params.payload);
+  if (kind === "tool") {
+    const { toolCall, summary } = 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";
+    if (!params.streamState.messageId) {
+      const result = await params.client.sendOpenClawMessage({
+        type: "openclaw_message",
+        sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
+        title: params.thread.title,
+        text: messageText,
+        authorLabel: "OpenClaw",
+        links,
+        toolCalls: params.streamState.toolCalls,
+        actions: [],
+        deliveryState: "pending"
+      });
+      params.streamState.messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      return;
+    }
+    await params.client.sendOpenClawMessageUpdate({
+      type: "openclaw_message_update",
+      messageId: params.streamState.messageId,
+      text: messageText,
+      links,
+      toolCalls: params.streamState.toolCalls,
+      deliveryState: "pending"
+    });
+    return;
+  }
   if (typeof text !== "string" || !text.trim()) {
     return;
   }
+  if (kind === "block") {
+    params.streamState.text = appendReplyBlock(params.streamState.text, text);
+    if (!params.streamState.messageId) {
+      const result = await params.client.sendOpenClawMessage({
+        type: "openclaw_message",
+        sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
+        title: params.thread.title,
+        text: params.streamState.text,
+        authorLabel: "OpenClaw",
+        links,
+        toolCalls: params.streamState.toolCalls,
+        actions: [],
+        deliveryState: "pending"
+      });
+      params.streamState.messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      return;
+    }
+    await params.client.sendOpenClawMessageUpdate({
+      type: "openclaw_message_update",
+      messageId: params.streamState.messageId,
+      text: params.streamState.text,
+      links,
+      toolCalls: params.streamState.toolCalls,
+      deliveryState: "pending"
+    });
+    return;
+  }
+  if (params.streamState.messageId) {
+    params.streamState.text = text;
+    await params.client.sendOpenClawMessageUpdate({
+      type: "openclaw_message_update",
+      messageId: params.streamState.messageId,
+      text,
+      links,
+      toolCalls: params.streamState.toolCalls,
+      actions: [],
+      deliveryState: "sent"
+    });
+    return;
+  }
   await params.client.sendOpenClawMessage({
     type: "openclaw_message",
     sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
     title: params.thread.title,
     text,
     authorLabel: "OpenClaw",
-    links: resolveCowtailReplyLinks(params.payload),
-    actions: []
+    links,
+    toolCalls: params.streamState.toolCalls,
+    actions: [],
+    deliveryState: "sent"
   });
 }
+function recordCreatedOpenClawMessageId(streamState, result) {
+  const messageId = result.payload?.messageId;
+  if (typeof messageId === "string" && messageId.trim()) {
+    return messageId;
+  }
+  streamState.failed = true;
+  throw new Error("Cowtail realtime ack missing messageId for streamed OpenClaw reply");
+}
 function resolveCowtailReplyLinks(payload) {
   const urls = [
     ...Array.isArray(payload.mediaUrls) ? payload.mediaUrls : [],
@@ -14644,6 +14817,101 @@ function resolveCowtailReplyLinks(payload) {
     url: url2
   }));
 }
+function normalizeCowtailReplyPayload(payload) {
+  if (!payload || typeof payload !== "object") {
+    return {};
+  }
+  return normalizeOutboundReplyPayload(payload);
+}
+function buildCowtailToolCall(params) {
+  const rawToolCall = readRawToolCall(params.rawPayload);
+  const summary = resolveToolCallSummary(params.payload, rawToolCall);
+  const index = params.streamState.toolCalls.length + 1;
+  const toolCall = {
+    id: rawToolCall.id ?? `tool-${index}`,
+    name: rawToolCall.name ?? "tool_result",
+    ...rawToolCall.args ? { args: rawToolCall.args } : {},
+    result: rawToolCall.result !== undefined ? rawToolCall.result : params.payload.text ?? params.payload,
+    status: rawToolCall.status ?? "complete",
+    ...rawToolCall.startedAt !== undefined ? { startedAt: rawToolCall.startedAt } : {},
+    completedAt: rawToolCall.completedAt ?? Date.now(),
+    insertedAtContentLength: params.streamState.text.length,
+    contentSnapshotAtStart: params.streamState.text
+  };
+  return {
+    toolCall,
+    ...summary ? { summary } : {}
+  };
+}
+function readRawToolCall(payload) {
+  if (!payload || typeof payload !== "object") {
+    return {};
+  }
+  const candidate = payload;
+  const channelData = candidate.channelData;
+  const toolCall = channelData && typeof channelData === "object" ? channelData.toolCall : undefined;
+  const source = toolCall && typeof toolCall === "object" ? toolCall : candidate;
+  const name = readString(source.name) ?? readString(source.toolName) ?? readString(source.tool);
+  const id = readString(source.id) ?? readString(source.toolCallId);
+  const status = readToolCallStatus(source.status);
+  const args = readRecord(source.args) ?? readRecord(source.input);
+  const startedAt = readTimestamp(source.startedAt);
+  const completedAt = readTimestamp(source.completedAt);
+  const insertedAtContentLength = readNonnegativeInteger(source.insertedAtContentLength);
+  const contentSnapshotAtStart = readString(source.contentSnapshotAtStart);
+  const result = source.result ?? source.output;
+  return {
+    ...id ? { id } : {},
+    ...name ? { name } : {},
+    ...args ? { args } : {},
+    ...result !== undefined ? { result } : {},
+    ...status ? { status } : {},
+    ...startedAt !== undefined ? { startedAt } : {},
+    ...completedAt !== undefined ? { completedAt } : {},
+    ...insertedAtContentLength !== undefined ? { insertedAtContentLength } : {},
+    ...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;
+}
+function readRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return;
+  }
+  return value;
+}
+function readToolCallStatus(value) {
+  return value === "pending" || value === "running" || value === "complete" || value === "error" ? value : undefined;
+}
+function readTimestamp(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= 0 ? value : undefined;
+}
+function readNonnegativeInteger(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= 0 ? value : undefined;
+}
+function appendReplyBlock(current, next) {
+  if (!next.trim()) {
+    return current;
+  }
+  if (!current) {
+    return next;
+  }
+  if (next.startsWith(current)) {
+    return next;
+  }
+  return `${current}${next}`;
+}
 function buildCowtailInboundBody(params) {
   const cfg = params.runtime.config.loadConfig();
   const storePath = params.runtime.agent.session.resolveStorePath(cfg.session?.store, {

package/dist/setup-entry.js

@@ -13728,6 +13728,7 @@ var openclawEventTypes = [
   "thread_created",
   "thread_updated",
   "message_created",
+  "message_updated",
   "message_acknowledged",
   "reply_created",
   "action_submitted",
@@ -13742,12 +13743,24 @@ var openclawTargetAgentSchema = exports_external.literal("default");
 var openclawMessageDirectionSchema = exports_external.enum(["openclaw_to_user", "user_to_openclaw"]);
 var openclawDeliveryStateSchema = exports_external.enum(["pending", "sent", "failed"]);
 var openclawActionStateSchema = exports_external.enum(["pending", "submitted", "failed", "expired"]);
+var openclawToolCallStatusSchema = exports_external.enum(["pending", "running", "complete", "error"]);
 var openclawEventTypeSchema = exports_external.enum(openclawEventTypes);
 var openclawSequenceSchema = exports_external.number().int().nonnegative();
 var openclawLinkSchema = exports_external.object({
   label: nonEmptyStringSchema,
   url: nonEmptyStringSchema
 });
+var openclawToolCallRecordSchema = exports_external.object({
+  id: nonEmptyStringSchema,
+  name: nonEmptyStringSchema,
+  args: jsonObjectSchema.optional(),
+  result: exports_external.unknown().optional(),
+  status: openclawToolCallStatusSchema,
+  startedAt: timestampSchema.optional(),
+  completedAt: timestampSchema.optional(),
+  insertedAtContentLength: exports_external.number().int().nonnegative().optional(),
+  contentSnapshotAtStart: exports_external.string().optional()
+});
 var openclawPluginClientHelloSchema = exports_external.object({
   protocolVersion: openclawProtocolVersionSchema,
   clientKind: exports_external.literal("openclaw_plugin"),
@@ -13782,6 +13795,7 @@ var openclawMessageRecordSchema = exports_external.object({
   authorLabel: nonEmptyStringSchema.optional(),
   text: nonEmptyStringSchema,
   links: exports_external.array(openclawLinkSchema).default([]),
+  toolCalls: exports_external.array(openclawToolCallRecordSchema).default([]),
   deliveryState: openclawDeliveryStateSchema,
   createdAt: timestampSchema,
   updatedAt: timestampSchema
@@ -13832,7 +13846,19 @@ var openclawPluginMessageCommandSchema = exports_external.object({
   text: nonEmptyStringSchema,
   authorLabel: nonEmptyStringSchema.optional(),
   links: exports_external.array(openclawLinkSchema).default([]),
-  actions: exports_external.array(openclawActionDraftSchema).default([])
+  toolCalls: exports_external.array(openclawToolCallRecordSchema).default([]),
+  actions: exports_external.array(openclawActionDraftSchema).default([]),
+  deliveryState: openclawDeliveryStateSchema.optional()
+});
+var openclawPluginMessageUpdateCommandSchema = exports_external.object({
+  type: exports_external.literal("openclaw_message_update"),
+  requestId: openclawRequestIdSchema,
+  messageId: nonEmptyStringSchema,
+  text: nonEmptyStringSchema,
+  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"),
@@ -13883,6 +13909,7 @@ var openclawActionResultCommandSchema = exports_external.object({
 });
 var openclawRealtimeClientMessageSchema = exports_external.discriminatedUnion("type", [
   openclawPluginMessageCommandSchema,
+  openclawPluginMessageUpdateCommandSchema,
   openclawIosNewThreadCommandSchema,
   openclawIosReplyCommandSchema,
   openclawIosActionCommandSchema,
@@ -13895,7 +13922,8 @@ var openclawRealtimeClientMessageSchema = exports_external.discriminatedUnion("t
 var openclawRealtimeAckSchema = exports_external.object({
   type: exports_external.literal("ack"),
   requestId: openclawRequestIdSchema,
-  sequence: openclawSequenceSchema.optional()
+  sequence: openclawSequenceSchema.optional(),
+  payload: jsonObjectSchema.optional()
 });
 var openclawRealtimeErrorSchema = exports_external.object({
   type: exports_external.literal("realtime_error"),
@@ -14129,9 +14157,19 @@ class CowtailRealtimeClient {
       ...command,
       requestId: this.#requestIdFactory(),
       links: command.links ?? [],
+      toolCalls: command.toolCalls ?? [],
       actions: command.actions ?? []
     });
   }
+  sendOpenClawMessageUpdate(command) {
+    return this.#sendCommand({
+      ...command,
+      requestId: this.#requestIdFactory(),
+      ...command.links ? { links: command.links } : {},
+      ...command.toolCalls ? { toolCalls: command.toolCalls } : {},
+      ...command.actions ? { actions: command.actions } : {}
+    });
+  }
   sendSessionBound(command) {
     return this.#sendCommand({
       ...command,
@@ -14236,7 +14274,7 @@ class CowtailRealtimeClient {
     }
     const message = parsed.data;
     if (message.type === "ack") {
-      this.#resolvePendingRequest(message.requestId, message.sequence);
+      this.#resolvePendingRequest(message.requestId, message.sequence, message.payload);
       return;
     }
     if (message.type === "realtime_error") {
@@ -14319,13 +14357,17 @@ class CowtailRealtimeClient {
       }
     });
   }
-  #resolvePendingRequest(requestId, sequence) {
+  #resolvePendingRequest(requestId, sequence, payload) {
     const pending = this.#pendingRequests.get(requestId);
     if (!pending) {
       return;
     }
     this.#pendingRequests.delete(requestId);
-    pending.resolve({ requestId, sequence });
+    pending.resolve({
+      requestId,
+      sequence,
+      ...payload ? { payload } : {}
+    });
   }
   #rejectPendingRequest(message) {
     if (!message.requestId) {
@@ -14399,7 +14441,8 @@ class CowtailRealtimeClient {
 }
 
 // src/inbound.ts
-import { dispatchInboundReplyWithBase } from "openclaw/plugin-sdk/inbound-reply-dispatch";
+import { createChannelReplyPipeline } from "openclaw/plugin-sdk/channel-reply-pipeline";
+import { normalizeOutboundReplyPayload } from "openclaw/plugin-sdk/reply-payload";
 
 // src/session-keys.ts
 function normalizeCowtailTarget(raw) {
@@ -14548,19 +14591,24 @@ async function dispatchCowtailTextTurn(params) {
     body,
     timestamp: message.createdAt
   });
-  await dispatchInboundReplyWithBase({
+  const streamState = { text: "", toolCalls: [] };
+  await recordCowtailInboundSessionAndDispatchReply({
     cfg: runtime.config.loadConfig(),
     channel: CHANNEL_ID,
     accountId: account.accountId,
+    agentId: route.agentId,
     route,
     storePath,
     ctxPayload,
-    core: runtime,
-    deliver: async (payload) => deliverCowtailReply({
+    runtime,
+    deliver: async (payload, info, rawPayload) => deliverCowtailReply({
       client,
       route,
       thread,
-      payload
+      payload,
+      rawPayload,
+      info,
+      streamState
     }),
     onRecordError: (error48) => {
       logger?.error?.(`Cowtail inbound session record failed: ${errorMessage(error48)}`);
@@ -14595,19 +14643,24 @@ async function dispatchCowtailActionTurn(params) {
     timestamp
   });
   let dispatchFailed = false;
-  await dispatchInboundReplyWithBase({
+  const streamState = { text: "", toolCalls: [] };
+  await recordCowtailInboundSessionAndDispatchReply({
     cfg: runtime.config.loadConfig(),
     channel: CHANNEL_ID,
     accountId: account.accountId,
+    agentId: route.agentId,
     route,
     storePath,
     ctxPayload,
-    core: runtime,
-    deliver: async (replyPayload) => deliverCowtailReply({
+    runtime,
+    deliver: async (replyPayload, info, rawPayload) => deliverCowtailReply({
       client,
       route,
       thread,
-      payload: replyPayload
+      payload: replyPayload,
+      rawPayload,
+      info,
+      streamState
     }),
     onRecordError: (error48) => {
       logger?.error?.(`Cowtail inbound session record failed: ${errorMessage(error48)}`);
@@ -14619,21 +14672,141 @@ async function dispatchCowtailActionTurn(params) {
   });
   return !dispatchFailed;
 }
+async function recordCowtailInboundSessionAndDispatchReply(params) {
+  await params.runtime.channel.session.recordInboundSession({
+    storePath: params.storePath,
+    sessionKey: typeof params.ctxPayload.SessionKey === "string" ? params.ctxPayload.SessionKey : params.route.sessionKey,
+    ctx: params.ctxPayload,
+    onRecordError: params.onRecordError
+  });
+  const { onModelSelected, ...replyPipeline } = createChannelReplyPipeline({
+    cfg: params.cfg,
+    agentId: params.agentId,
+    channel: params.channel,
+    accountId: params.accountId
+  });
+  await params.runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
+    ctx: params.ctxPayload,
+    cfg: params.cfg,
+    dispatcherOptions: {
+      ...replyPipeline,
+      deliver: async (payload, info) => {
+        try {
+          await params.deliver(normalizeCowtailReplyPayload(payload), info, payload);
+        } catch (error48) {
+          params.onDispatchError(error48, { kind: info?.kind ?? "final" });
+        }
+      },
+      onError: params.onDispatchError
+    },
+    replyOptions: {
+      onModelSelected
+    }
+  });
+}
 async function deliverCowtailReply(params) {
+  if (params.streamState.failed) {
+    return;
+  }
   const text = params.payload.text;
+  const kind = params.info?.kind ?? "final";
+  const links = resolveCowtailReplyLinks(params.payload);
+  if (kind === "tool") {
+    const { toolCall, summary } = 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";
+    if (!params.streamState.messageId) {
+      const result = await params.client.sendOpenClawMessage({
+        type: "openclaw_message",
+        sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
+        title: params.thread.title,
+        text: messageText,
+        authorLabel: "OpenClaw",
+        links,
+        toolCalls: params.streamState.toolCalls,
+        actions: [],
+        deliveryState: "pending"
+      });
+      params.streamState.messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      return;
+    }
+    await params.client.sendOpenClawMessageUpdate({
+      type: "openclaw_message_update",
+      messageId: params.streamState.messageId,
+      text: messageText,
+      links,
+      toolCalls: params.streamState.toolCalls,
+      deliveryState: "pending"
+    });
+    return;
+  }
   if (typeof text !== "string" || !text.trim()) {
     return;
   }
+  if (kind === "block") {
+    params.streamState.text = appendReplyBlock(params.streamState.text, text);
+    if (!params.streamState.messageId) {
+      const result = await params.client.sendOpenClawMessage({
+        type: "openclaw_message",
+        sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
+        title: params.thread.title,
+        text: params.streamState.text,
+        authorLabel: "OpenClaw",
+        links,
+        toolCalls: params.streamState.toolCalls,
+        actions: [],
+        deliveryState: "pending"
+      });
+      params.streamState.messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+      return;
+    }
+    await params.client.sendOpenClawMessageUpdate({
+      type: "openclaw_message_update",
+      messageId: params.streamState.messageId,
+      text: params.streamState.text,
+      links,
+      toolCalls: params.streamState.toolCalls,
+      deliveryState: "pending"
+    });
+    return;
+  }
+  if (params.streamState.messageId) {
+    params.streamState.text = text;
+    await params.client.sendOpenClawMessageUpdate({
+      type: "openclaw_message_update",
+      messageId: params.streamState.messageId,
+      text,
+      links,
+      toolCalls: params.streamState.toolCalls,
+      actions: [],
+      deliveryState: "sent"
+    });
+    return;
+  }
   await params.client.sendOpenClawMessage({
     type: "openclaw_message",
     sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
     title: params.thread.title,
     text,
     authorLabel: "OpenClaw",
-    links: resolveCowtailReplyLinks(params.payload),
-    actions: []
+    links,
+    toolCalls: params.streamState.toolCalls,
+    actions: [],
+    deliveryState: "sent"
   });
 }
+function recordCreatedOpenClawMessageId(streamState, result) {
+  const messageId = result.payload?.messageId;
+  if (typeof messageId === "string" && messageId.trim()) {
+    return messageId;
+  }
+  streamState.failed = true;
+  throw new Error("Cowtail realtime ack missing messageId for streamed OpenClaw reply");
+}
 function resolveCowtailReplyLinks(payload) {
   const urls = [
     ...Array.isArray(payload.mediaUrls) ? payload.mediaUrls : [],
@@ -14644,6 +14817,101 @@ function resolveCowtailReplyLinks(payload) {
     url: url2
   }));
 }
+function normalizeCowtailReplyPayload(payload) {
+  if (!payload || typeof payload !== "object") {
+    return {};
+  }
+  return normalizeOutboundReplyPayload(payload);
+}
+function buildCowtailToolCall(params) {
+  const rawToolCall = readRawToolCall(params.rawPayload);
+  const summary = resolveToolCallSummary(params.payload, rawToolCall);
+  const index = params.streamState.toolCalls.length + 1;
+  const toolCall = {
+    id: rawToolCall.id ?? `tool-${index}`,
+    name: rawToolCall.name ?? "tool_result",
+    ...rawToolCall.args ? { args: rawToolCall.args } : {},
+    result: rawToolCall.result !== undefined ? rawToolCall.result : params.payload.text ?? params.payload,
+    status: rawToolCall.status ?? "complete",
+    ...rawToolCall.startedAt !== undefined ? { startedAt: rawToolCall.startedAt } : {},
+    completedAt: rawToolCall.completedAt ?? Date.now(),
+    insertedAtContentLength: params.streamState.text.length,
+    contentSnapshotAtStart: params.streamState.text
+  };
+  return {
+    toolCall,
+    ...summary ? { summary } : {}
+  };
+}
+function readRawToolCall(payload) {
+  if (!payload || typeof payload !== "object") {
+    return {};
+  }
+  const candidate = payload;
+  const channelData = candidate.channelData;
+  const toolCall = channelData && typeof channelData === "object" ? channelData.toolCall : undefined;
+  const source = toolCall && typeof toolCall === "object" ? toolCall : candidate;
+  const name = readString(source.name) ?? readString(source.toolName) ?? readString(source.tool);
+  const id = readString(source.id) ?? readString(source.toolCallId);
+  const status = readToolCallStatus(source.status);
+  const args = readRecord(source.args) ?? readRecord(source.input);
+  const startedAt = readTimestamp(source.startedAt);
+  const completedAt = readTimestamp(source.completedAt);
+  const insertedAtContentLength = readNonnegativeInteger(source.insertedAtContentLength);
+  const contentSnapshotAtStart = readString(source.contentSnapshotAtStart);
+  const result = source.result ?? source.output;
+  return {
+    ...id ? { id } : {},
+    ...name ? { name } : {},
+    ...args ? { args } : {},
+    ...result !== undefined ? { result } : {},
+    ...status ? { status } : {},
+    ...startedAt !== undefined ? { startedAt } : {},
+    ...completedAt !== undefined ? { completedAt } : {},
+    ...insertedAtContentLength !== undefined ? { insertedAtContentLength } : {},
+    ...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;
+}
+function readRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return;
+  }
+  return value;
+}
+function readToolCallStatus(value) {
+  return value === "pending" || value === "running" || value === "complete" || value === "error" ? value : undefined;
+}
+function readTimestamp(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= 0 ? value : undefined;
+}
+function readNonnegativeInteger(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= 0 ? value : undefined;
+}
+function appendReplyBlock(current, next) {
+  if (!next.trim()) {
+    return current;
+  }
+  if (!current) {
+    return next;
+  }
+  if (next.startsWith(current)) {
+    return next;
+  }
+  return `${current}${next}`;
+}
 function buildCowtailInboundBody(params) {
   const cfg = params.runtime.config.loadConfig();
   const storePath = params.runtime.agent.session.resolveStorePath(cfg.session?.store, {

package/package.json

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