@maudecode/openclaw-cowtail 0.13.0 → 0.14.1

package/README.md

@@ -7,3 +7,7 @@ Load it from an OpenClaw config with `plugins.entries.cowtail.path` pointing at
 Configure `channels.cowtail.url` with the Cowtail realtime WebSocket endpoint and `channels.cowtail.bridgeToken` with the same bridge token configured on the Cowtail realtime service.
 
 V1 supports a single owner and OpenClaw's default `main` agent only.
+
+## Realtime event scope
+
+The plugin receives Cowtail events that require OpenClaw work: iOS-created threads, iOS replies, and submitted actions. Cowtail thread lifecycle updates such as read state, rename, and delete stay local to Cowtail/iOS because OpenClaw v1 has no channel-level state mutation contract for those operations.

package/dist/index.js

@@ -13801,6 +13801,7 @@ var openclawThreadRecordSchema = exports_external.object({
 var openclawMessageRecordBaseSchema = exports_external.object({
   id: nonEmptyStringSchema,
   threadId: nonEmptyStringSchema,
+  streamId: nonEmptyStringSchema.optional(),
   direction: openclawMessageDirectionSchema,
   authorLabel: nonEmptyStringSchema.optional(),
   text: openclawMessageTextSchema,
@@ -13855,13 +13856,16 @@ var openclawPluginMessageCommandSchema = requireOpenClawRenderableContent(export
   requestId: openclawRequestIdSchema,
   idempotencyKey: openclawIdempotencyKeySchema,
   sessionKey: nonEmptyStringSchema,
+  threadId: nonEmptyStringSchema.optional(),
+  threadHint: nonEmptyStringSchema.optional(),
   title: nonEmptyStringSchema.optional(),
   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()
+  deliveryState: openclawDeliveryStateSchema.optional(),
+  streamId: nonEmptyStringSchema
 }));
 var openclawPluginMessageUpdateCommandSchema = requireOpenClawRenderableContent(exports_external.object({
   type: exports_external.literal("openclaw_message_update"),
@@ -13872,7 +13876,8 @@ var openclawPluginMessageUpdateCommandSchema = requireOpenClawRenderableContent(
   links: exports_external.array(openclawLinkSchema).optional(),
   toolCalls: exports_external.array(openclawToolCallRecordSchema).optional(),
   actions: exports_external.array(openclawActionDraftSchema).optional(),
-  deliveryState: openclawDeliveryStateSchema.optional()
+  deliveryState: openclawDeliveryStateSchema.optional(),
+  streamId: nonEmptyStringSchema
 }));
 var openclawMessageStreamSnapshotCommandBaseSchema = exports_external.object({
   type: exports_external.literal("openclaw_message_stream_snapshot"),
@@ -13884,6 +13889,7 @@ var openclawMessageStreamSnapshotCommandBaseSchema = exports_external.object({
   links: exports_external.array(openclawLinkSchema).default([]),
   toolCalls: exports_external.array(openclawToolCallRecordSchema).default([]),
   isFinal: exports_external.boolean(),
+  snapshotSequence: exports_external.number().int().nonnegative(),
   updatedAt: timestampSchema
 });
 var openclawMessageStreamSnapshotCommandSchema = requireOpenClawRenderableContent(openclawMessageStreamSnapshotCommandBaseSchema);
@@ -13956,11 +13962,18 @@ var openclawRealtimeClientMessageSchema = exports_external.union([
   openclawSessionBoundCommandSchema,
   openclawActionResultCommandSchema
 ]);
+var openclawRealtimeAckPayloadSchema = exports_external.object({
+  threadId: nonEmptyStringSchema.optional(),
+  messageId: nonEmptyStringSchema.optional(),
+  dropped: exports_external.literal(true).optional(),
+  duplicate: exports_external.literal(true).optional(),
+  reason: nonEmptyStringSchema.optional()
+});
 var openclawRealtimeAckSchema = exports_external.object({
   type: exports_external.literal("ack"),
   requestId: openclawRequestIdSchema,
   sequence: openclawSequenceSchema.optional(),
-  payload: jsonObjectSchema.optional()
+  payload: openclawRealtimeAckPayloadSchema.optional()
 });
 var openclawRealtimeErrorSchema = exports_external.object({
   type: exports_external.literal("realtime_error"),
@@ -14009,6 +14022,13 @@ var openclawEventReplayResponseSchema = exports_external.object({
   ok: exports_external.literal(true),
   events: exports_external.array(openclawEventEnvelopeSchema)
 });
+var openclawPushNotificationPayloadSchema = exports_external.object({
+  kind: exports_external.literal("openclaw"),
+  version: exports_external.literal(1),
+  threadId: nonEmptyStringSchema,
+  messageId: nonEmptyStringSchema,
+  url: nonEmptyStringSchema.optional()
+});
 // ../protocol/src/fixes.ts
 var fixScopeSchema = exports_external.enum(fixScopes);
 var fixCreateRequestSchema = exports_external.object({
@@ -14064,11 +14084,12 @@ var healthResponseSchema = exports_external.object({
   storageUnit: nonEmptyStringSchema
 });
 // ../protocol/src/push.ts
+var pushEnvironmentSchema = exports_external.enum(["development", "production"]);
 var pushRegisterRequestSchema = exports_external.object({
   identityToken: nonEmptyStringSchema,
   deviceToken: nonEmptyStringSchema,
   platform: nonEmptyStringSchema.optional(),
-  environment: nonEmptyStringSchema.optional(),
+  environment: pushEnvironmentSchema.optional(),
   deviceName: nonEmptyStringSchema.optional()
 });
 var pushRegisterResponseSchema = exports_external.object({
@@ -14077,6 +14098,7 @@ var pushRegisterResponseSchema = exports_external.object({
   id: nonEmptyStringSchema
 });
 var pushUnregisterRequestSchema = exports_external.object({
+  identityToken: nonEmptyStringSchema,
   deviceToken: nonEmptyStringSchema
 });
 var pushUnregisterResponseSchema = exports_external.object({
@@ -14100,6 +14122,7 @@ var pushResultSchema = exports_external.object({
   userId: nonEmptyStringSchema,
   sent: exports_external.number().int().nonnegative(),
   failed: exports_external.number().int().nonnegative(),
+  skipped: exports_external.number().int().nonnegative().default(0),
   results: exports_external.array(jsonObjectSchema)
 });
 // ../protocol/src/responses.ts
@@ -14120,7 +14143,8 @@ var usersListEntrySchema = exports_external.object({
   enabledDeviceCount: exports_external.number().int().nonnegative()
 });
 var userDeviceSchema = exports_external.object({
-  deviceToken: nonEmptyStringSchema,
+  id: nonEmptyStringSchema,
+  deviceTokenPreview: nonEmptyStringSchema,
   platform: nonEmptyStringSchema,
   environment: nonEmptyStringSchema,
   enabled: exports_external.boolean(),
@@ -14192,10 +14216,12 @@ class CowtailRealtimeClient {
   }
   sendOpenClawMessage(command) {
     const requestId = this.#requestIdFactory();
+    const idempotencyKey = command.idempotencyKey ?? `cowtail:request:${requestId}`;
     return this.#sendCommand({
       ...command,
       requestId,
-      idempotencyKey: command.idempotencyKey ?? `cowtail:request:${requestId}`,
+      idempotencyKey,
+      streamId: command.streamId ?? idempotencyKey,
       links: command.links ?? [],
       toolCalls: command.toolCalls ?? [],
       actions: command.actions ?? []
@@ -14519,6 +14545,30 @@ function normalizeCowtailTarget(raw) {
 function buildCowtailTarget(threadId) {
   return `cowtail:${normalizeCowtailTarget(threadId)}`;
 }
+function resolveCowtailThreadIdFromSessionKey(sessionKey) {
+  const raw = (sessionKey ?? "").trim();
+  if (!raw) {
+    return;
+  }
+  const parts = raw.split(":").filter(Boolean);
+  if (parts.length < 4 || parts[0]?.toLowerCase() !== "agent") {
+    return;
+  }
+  const cowtailIndex = parts.findIndex((part, index) => index >= 2 && part.toLowerCase() === "cowtail");
+  if (cowtailIndex < 0) {
+    if (parts[2]?.toLowerCase() !== "direct") {
+      return;
+    }
+    const directTarget = normalizeCowtailTarget(parts.slice(3).join(":"));
+    return directTarget || undefined;
+  }
+  const rest = parts.slice(cowtailIndex + 1);
+  const first = rest[0]?.toLowerCase();
+  const second = rest[1]?.toLowerCase();
+  const target = first === "direct" || first === "group" || first === "channel" ? rest.slice(1).join(":") : second === "direct" || second === "group" || second === "channel" ? rest.slice(2).join(":") : rest.join(":");
+  const normalized = normalizeCowtailTarget(target);
+  return normalized || undefined;
+}
 function isSupportedCowtailAgent(agentId) {
   return (agentId ?? "main").trim() === "main";
 }
@@ -14555,10 +14605,11 @@ async function handleCowtailEvent(params) {
         return;
       }
       if (!thread.sessionKey) {
+        const threadId = resolveCowtailThreadId({ route, thread });
         await client.sendSessionBound({
           type: "openclaw_session_bound",
-          idempotencyKey: `cowtail:session-bound:${thread.id}`,
-          threadId: thread.id,
+          idempotencyKey: `cowtail:session-bound:${threadId}`,
+          threadId,
           sessionKey: route.sessionKey
         });
       }
@@ -14668,6 +14719,7 @@ async function dispatchCowtailTextTurn(params) {
     idempotencyKey: `cowtail:reply:${message.id}`,
     streamId: `cowtail:stream:${message.id}`,
     updateIndex: 0,
+    snapshotSequence: 0,
     toolFallbackIndex: 0,
     toolFallbackIds: {},
     text: "",
@@ -14741,6 +14793,7 @@ async function dispatchCowtailActionTurn(params) {
     idempotencyKey: `cowtail:action:${action.id}`,
     streamId: `cowtail:action-stream:${action.id}`,
     updateIndex: 0,
+    snapshotSequence: 0,
     toolFallbackIndex: 0,
     toolFallbackIds: {},
     text: "",
@@ -14921,28 +14974,17 @@ async function deliverCowtailReply(params) {
       updatedAt: Date.now()
     });
     if (!params.streamState.messageId) {
-      const result2 = await params.client.sendOpenClawMessage({
-        type: "openclaw_message",
-        idempotencyKey: params.streamState.idempotencyKey,
-        sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
-        title: params.thread.title,
+      await createDurableCowtailReply(params, {
         text: messageText,
-        authorLabel: "OpenClaw",
         links,
-        toolCalls: params.streamState.toolCalls,
-        actions: [],
         deliveryState: "pending"
       });
-      const messageId2 = recordCreatedOpenClawMessageId(params.streamState, result2);
-      if (!messageId2) {
-        return;
-      }
-      params.streamState.messageId = messageId2;
       return;
     }
     await params.client.sendOpenClawMessageUpdate({
       type: "openclaw_message_update",
       idempotencyKey: nextStreamUpdateIdempotencyKey(params.streamState),
+      streamId: params.streamState.streamId,
       messageId: params.streamState.messageId,
       text: messageText,
       links,
@@ -14967,28 +15009,17 @@ async function deliverCowtailReply(params) {
       updatedAt: Date.now()
     });
     if (!params.streamState.messageId) {
-      const result2 = await params.client.sendOpenClawMessage({
-        type: "openclaw_message",
-        idempotencyKey: params.streamState.idempotencyKey,
-        sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
-        title: params.thread.title,
+      await createDurableCowtailReply(params, {
         text: params.streamState.text,
-        authorLabel: "OpenClaw",
         links,
-        toolCalls: params.streamState.toolCalls,
-        actions: [],
         deliveryState: "pending"
       });
-      const messageId2 = recordCreatedOpenClawMessageId(params.streamState, result2);
-      if (!messageId2) {
-        return;
-      }
-      params.streamState.messageId = messageId2;
       return;
     }
     await params.client.sendOpenClawMessageUpdate({
       type: "openclaw_message_update",
       idempotencyKey: nextStreamUpdateIdempotencyKey(params.streamState),
+      streamId: params.streamState.streamId,
       messageId: params.streamState.messageId,
       text: params.streamState.text,
       links,
@@ -15002,6 +15033,7 @@ async function deliverCowtailReply(params) {
     await params.client.sendOpenClawMessageUpdate({
       type: "openclaw_message_update",
       idempotencyKey: nextStreamUpdateIdempotencyKey(params.streamState),
+      streamId: params.streamState.streamId,
       messageId: params.streamState.messageId,
       text,
       links,
@@ -15023,23 +15055,14 @@ async function deliverCowtailReply(params) {
     return;
   }
   params.streamState.text = text;
-  const result = await params.client.sendOpenClawMessage({
-    type: "openclaw_message",
-    idempotencyKey: params.streamState.idempotencyKey,
-    sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
-    title: params.thread.title,
+  const messageId = await createDurableCowtailReply(params, {
     text,
-    authorLabel: "OpenClaw",
     links,
-    toolCalls: params.streamState.toolCalls,
-    actions: [],
     deliveryState: "sent"
   });
-  const messageId = recordCreatedOpenClawMessageId(params.streamState, result);
   if (!messageId) {
     return;
   }
-  params.streamState.messageId = messageId;
   emitCowtailStreamSnapshot({
     client: params.client,
     logger: params.logger,
@@ -15052,6 +15075,35 @@ async function deliverCowtailReply(params) {
   });
   params.streamState.completed = true;
 }
+async function createDurableCowtailReply(params, message) {
+  try {
+    const routedThreadId = resolveCowtailThreadIdFromSessionKey(params.route.sessionKey);
+    const result = await params.client.sendOpenClawMessage({
+      type: "openclaw_message",
+      idempotencyKey: params.streamState.idempotencyKey,
+      streamId: params.streamState.streamId,
+      sessionKey: params.route.sessionKey,
+      ...routedThreadId ? { threadId: routedThreadId } : {},
+      title: params.thread.title,
+      text: message.text,
+      authorLabel: "OpenClaw",
+      links: message.links,
+      toolCalls: params.streamState.toolCalls,
+      actions: [],
+      deliveryState: message.deliveryState
+    });
+    const messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+    if (!messageId) {
+      failCowtailStreamBeforeDurableCreate(params);
+      return;
+    }
+    params.streamState.messageId = messageId;
+    return messageId;
+  } catch (error48) {
+    failCowtailStreamBeforeDurableCreate(params);
+    throw error48;
+  }
+}
 async function finalizeCowtailStreamedReply(params) {
   if (params.streamState.failed || params.streamState.completed || !params.streamState.messageId || !params.streamState.text.trim() && params.streamState.toolCalls.length === 0) {
     return;
@@ -15059,6 +15111,7 @@ async function finalizeCowtailStreamedReply(params) {
   await params.client.sendOpenClawMessageUpdate({
     type: "openclaw_message_update",
     idempotencyKey: nextStreamUpdateIdempotencyKey(params.streamState),
+    streamId: params.streamState.streamId,
     messageId: params.streamState.messageId,
     text: params.streamState.text,
     links: params.streamState.links,
@@ -15140,26 +15193,46 @@ function deliverCowtailToolProgress(params) {
   });
 }
 function emitCowtailStreamSnapshot(params) {
-  if (params.streamState.failed || !params.text.trim() && params.streamState.links.length === 0 && params.streamState.toolCalls.length === 0) {
+  if (params.streamState.failed && params.allowFailed !== true || !params.text.trim() && params.streamState.links.length === 0 && params.streamState.toolCalls.length === 0) {
     return;
   }
   params.streamState.liveText = params.text;
   params.streamState.lastSnapshotText = params.text;
   params.streamState.lastSnapshotSentAt = params.updatedAt;
+  params.streamState.snapshotSequence += 1;
   params.client.sendOpenClawStreamSnapshot({
     type: "openclaw_message_stream_snapshot",
     streamId: params.streamState.streamId,
-    sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
-    threadId: params.thread.id,
+    sessionKey: params.route.sessionKey,
+    threadId: resolveCowtailThreadId(params),
     text: params.text,
     links: params.streamState.links.map((link) => ({ ...link })),
     toolCalls: structuredClone(params.streamState.toolCalls),
     isFinal: params.isFinal,
+    snapshotSequence: params.streamState.snapshotSequence,
     updatedAt: params.updatedAt
   }).catch((error48) => {
     params.logger?.warn?.(`Cowtail stream snapshot send failed: ${errorMessage(error48)}`);
   });
 }
+function failCowtailStreamBeforeDurableCreate(params) {
+  if (!params.streamState.messageId && params.streamState.snapshotSequence > 0) {
+    const text = params.streamState.text.trim() ? params.streamState.text : currentLiveCowtailStreamText(params.streamState);
+    emitCowtailStreamSnapshot({
+      client: params.client,
+      logger: params.logger,
+      route: params.route,
+      thread: params.thread,
+      streamState: params.streamState,
+      text,
+      isFinal: true,
+      updatedAt: Date.now(),
+      allowFailed: true
+    });
+  }
+  params.streamState.failed = true;
+  params.streamState.completed = true;
+}
 function currentLiveCowtailStreamText(streamState) {
   return streamState.liveText ?? streamState.text;
 }
@@ -15357,7 +15430,7 @@ function buildCowtailInboundBody(params) {
   };
 }
 function finalizeInboundContext(params) {
-  const target = buildCowtailTarget(params.thread.id);
+  const target = buildCowtailTarget(resolveCowtailThreadId(params));
   return params.runtime.channel.reply.finalizeInboundContext({
     Body: params.body,
     BodyForAgent: params.text,
@@ -15401,14 +15474,17 @@ function resolveThreadRoute(params) {
       sessionKey: params.thread.sessionKey
     };
   }
-  const route = params.runtime.channel.routing.resolveAgentRoute({
-    cfg: params.runtime.config.loadConfig(),
-    channel: CHANNEL_ID,
+  const threadId = normalizeCowtailTarget(params.thread.id);
+  if (!threadId) {
+    params.logger?.warn?.("Cowtail thread_created event has a blank thread id");
+    return null;
+  }
+  const cfg = params.runtime.config.loadConfig();
+  const route = resolveCowtailAgentRoute({
+    cfg,
+    threadId,
     accountId: params.account.accountId,
-    peer: {
-      kind: "direct",
-      id: buildCowtailTarget(params.thread.id)
-    }
+    runtime: params.runtime
   });
   if (!isSupportedCowtailAgent(route.agentId)) {
     params.logger?.warn?.(`Cowtail thread ${params.thread.id} resolved unsupported agent ${route.agentId}`);
@@ -15419,6 +15495,45 @@ function resolveThreadRoute(params) {
     sessionKey: route.sessionKey
   };
 }
+function resolveCowtailAgentRoute(params) {
+  const rawRoute = resolveAgentRouteForPeer({
+    cfg: params.cfg,
+    accountId: params.accountId,
+    runtime: params.runtime,
+    peerId: params.threadId
+  });
+  if (isPeerBindingRoute(rawRoute)) {
+    return rawRoute;
+  }
+  const prefixedThreadId = buildCowtailTarget(params.threadId);
+  if (prefixedThreadId === params.threadId) {
+    return rawRoute;
+  }
+  const prefixedRoute = resolveAgentRouteForPeer({
+    cfg: params.cfg,
+    accountId: params.accountId,
+    runtime: params.runtime,
+    peerId: prefixedThreadId
+  });
+  return isPeerBindingRoute(prefixedRoute) ? prefixedRoute : rawRoute;
+}
+function resolveAgentRouteForPeer(params) {
+  return params.runtime.channel.routing.resolveAgentRoute({
+    cfg: params.cfg,
+    channel: CHANNEL_ID,
+    accountId: params.accountId,
+    peer: {
+      kind: "direct",
+      id: params.peerId
+    }
+  });
+}
+function isPeerBindingRoute(route) {
+  return route.matchedBy === "binding.peer";
+}
+function resolveCowtailThreadId(params) {
+  return resolveCowtailThreadIdFromSessionKey(params.route.sessionKey) ?? normalizeCowtailTarget(params.thread.id);
+}
 function errorMessage(error48) {
   return error48 instanceof Error ? error48.message : String(error48);
 }
@@ -15436,23 +15551,29 @@ function resolveCowtailTarget(to) {
   if (!normalizedTarget) {
     throw new Error("Cowtail target must not be blank");
   }
-  return buildCowtailTarget(normalizedTarget);
+  return normalizedTarget;
 }
 async function sendCowtailText(params) {
   const { client, to } = params;
   const text = ensureNonBlankText(params.text);
   const target = resolveCowtailTarget(to);
+  const sessionKey = buildCowtailTarget(target);
   const result = await client.sendOpenClawMessage({
     type: "openclaw_message",
-    sessionKey: target,
+    sessionKey,
+    threadHint: target,
     text,
     links: [],
     actions: []
   });
+  const messageId = result.payload?.messageId;
+  if (typeof messageId !== "string" || messageId.trim() === "") {
+    throw new Error("Cowtail did not acknowledge a durable message id");
+  }
   return {
     channel: "cowtail",
-    messageId: String(result.sequence ?? result.requestId),
-    to: target
+    messageId,
+    to: buildCowtailTarget(target)
   };
 }
 

package/dist/setup-entry.js

@@ -13801,6 +13801,7 @@ var openclawThreadRecordSchema = exports_external.object({
 var openclawMessageRecordBaseSchema = exports_external.object({
   id: nonEmptyStringSchema,
   threadId: nonEmptyStringSchema,
+  streamId: nonEmptyStringSchema.optional(),
   direction: openclawMessageDirectionSchema,
   authorLabel: nonEmptyStringSchema.optional(),
   text: openclawMessageTextSchema,
@@ -13855,13 +13856,16 @@ var openclawPluginMessageCommandSchema = requireOpenClawRenderableContent(export
   requestId: openclawRequestIdSchema,
   idempotencyKey: openclawIdempotencyKeySchema,
   sessionKey: nonEmptyStringSchema,
+  threadId: nonEmptyStringSchema.optional(),
+  threadHint: nonEmptyStringSchema.optional(),
   title: nonEmptyStringSchema.optional(),
   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()
+  deliveryState: openclawDeliveryStateSchema.optional(),
+  streamId: nonEmptyStringSchema
 }));
 var openclawPluginMessageUpdateCommandSchema = requireOpenClawRenderableContent(exports_external.object({
   type: exports_external.literal("openclaw_message_update"),
@@ -13872,7 +13876,8 @@ var openclawPluginMessageUpdateCommandSchema = requireOpenClawRenderableContent(
   links: exports_external.array(openclawLinkSchema).optional(),
   toolCalls: exports_external.array(openclawToolCallRecordSchema).optional(),
   actions: exports_external.array(openclawActionDraftSchema).optional(),
-  deliveryState: openclawDeliveryStateSchema.optional()
+  deliveryState: openclawDeliveryStateSchema.optional(),
+  streamId: nonEmptyStringSchema
 }));
 var openclawMessageStreamSnapshotCommandBaseSchema = exports_external.object({
   type: exports_external.literal("openclaw_message_stream_snapshot"),
@@ -13884,6 +13889,7 @@ var openclawMessageStreamSnapshotCommandBaseSchema = exports_external.object({
   links: exports_external.array(openclawLinkSchema).default([]),
   toolCalls: exports_external.array(openclawToolCallRecordSchema).default([]),
   isFinal: exports_external.boolean(),
+  snapshotSequence: exports_external.number().int().nonnegative(),
   updatedAt: timestampSchema
 });
 var openclawMessageStreamSnapshotCommandSchema = requireOpenClawRenderableContent(openclawMessageStreamSnapshotCommandBaseSchema);
@@ -13956,11 +13962,18 @@ var openclawRealtimeClientMessageSchema = exports_external.union([
   openclawSessionBoundCommandSchema,
   openclawActionResultCommandSchema
 ]);
+var openclawRealtimeAckPayloadSchema = exports_external.object({
+  threadId: nonEmptyStringSchema.optional(),
+  messageId: nonEmptyStringSchema.optional(),
+  dropped: exports_external.literal(true).optional(),
+  duplicate: exports_external.literal(true).optional(),
+  reason: nonEmptyStringSchema.optional()
+});
 var openclawRealtimeAckSchema = exports_external.object({
   type: exports_external.literal("ack"),
   requestId: openclawRequestIdSchema,
   sequence: openclawSequenceSchema.optional(),
-  payload: jsonObjectSchema.optional()
+  payload: openclawRealtimeAckPayloadSchema.optional()
 });
 var openclawRealtimeErrorSchema = exports_external.object({
   type: exports_external.literal("realtime_error"),
@@ -14009,6 +14022,13 @@ var openclawEventReplayResponseSchema = exports_external.object({
   ok: exports_external.literal(true),
   events: exports_external.array(openclawEventEnvelopeSchema)
 });
+var openclawPushNotificationPayloadSchema = exports_external.object({
+  kind: exports_external.literal("openclaw"),
+  version: exports_external.literal(1),
+  threadId: nonEmptyStringSchema,
+  messageId: nonEmptyStringSchema,
+  url: nonEmptyStringSchema.optional()
+});
 // ../protocol/src/fixes.ts
 var fixScopeSchema = exports_external.enum(fixScopes);
 var fixCreateRequestSchema = exports_external.object({
@@ -14064,11 +14084,12 @@ var healthResponseSchema = exports_external.object({
   storageUnit: nonEmptyStringSchema
 });
 // ../protocol/src/push.ts
+var pushEnvironmentSchema = exports_external.enum(["development", "production"]);
 var pushRegisterRequestSchema = exports_external.object({
   identityToken: nonEmptyStringSchema,
   deviceToken: nonEmptyStringSchema,
   platform: nonEmptyStringSchema.optional(),
-  environment: nonEmptyStringSchema.optional(),
+  environment: pushEnvironmentSchema.optional(),
   deviceName: nonEmptyStringSchema.optional()
 });
 var pushRegisterResponseSchema = exports_external.object({
@@ -14077,6 +14098,7 @@ var pushRegisterResponseSchema = exports_external.object({
   id: nonEmptyStringSchema
 });
 var pushUnregisterRequestSchema = exports_external.object({
+  identityToken: nonEmptyStringSchema,
   deviceToken: nonEmptyStringSchema
 });
 var pushUnregisterResponseSchema = exports_external.object({
@@ -14100,6 +14122,7 @@ var pushResultSchema = exports_external.object({
   userId: nonEmptyStringSchema,
   sent: exports_external.number().int().nonnegative(),
   failed: exports_external.number().int().nonnegative(),
+  skipped: exports_external.number().int().nonnegative().default(0),
   results: exports_external.array(jsonObjectSchema)
 });
 // ../protocol/src/responses.ts
@@ -14120,7 +14143,8 @@ var usersListEntrySchema = exports_external.object({
   enabledDeviceCount: exports_external.number().int().nonnegative()
 });
 var userDeviceSchema = exports_external.object({
-  deviceToken: nonEmptyStringSchema,
+  id: nonEmptyStringSchema,
+  deviceTokenPreview: nonEmptyStringSchema,
   platform: nonEmptyStringSchema,
   environment: nonEmptyStringSchema,
   enabled: exports_external.boolean(),
@@ -14192,10 +14216,12 @@ class CowtailRealtimeClient {
   }
   sendOpenClawMessage(command) {
     const requestId = this.#requestIdFactory();
+    const idempotencyKey = command.idempotencyKey ?? `cowtail:request:${requestId}`;
     return this.#sendCommand({
       ...command,
       requestId,
-      idempotencyKey: command.idempotencyKey ?? `cowtail:request:${requestId}`,
+      idempotencyKey,
+      streamId: command.streamId ?? idempotencyKey,
       links: command.links ?? [],
       toolCalls: command.toolCalls ?? [],
       actions: command.actions ?? []
@@ -14519,6 +14545,30 @@ function normalizeCowtailTarget(raw) {
 function buildCowtailTarget(threadId) {
   return `cowtail:${normalizeCowtailTarget(threadId)}`;
 }
+function resolveCowtailThreadIdFromSessionKey(sessionKey) {
+  const raw = (sessionKey ?? "").trim();
+  if (!raw) {
+    return;
+  }
+  const parts = raw.split(":").filter(Boolean);
+  if (parts.length < 4 || parts[0]?.toLowerCase() !== "agent") {
+    return;
+  }
+  const cowtailIndex = parts.findIndex((part, index) => index >= 2 && part.toLowerCase() === "cowtail");
+  if (cowtailIndex < 0) {
+    if (parts[2]?.toLowerCase() !== "direct") {
+      return;
+    }
+    const directTarget = normalizeCowtailTarget(parts.slice(3).join(":"));
+    return directTarget || undefined;
+  }
+  const rest = parts.slice(cowtailIndex + 1);
+  const first = rest[0]?.toLowerCase();
+  const second = rest[1]?.toLowerCase();
+  const target = first === "direct" || first === "group" || first === "channel" ? rest.slice(1).join(":") : second === "direct" || second === "group" || second === "channel" ? rest.slice(2).join(":") : rest.join(":");
+  const normalized = normalizeCowtailTarget(target);
+  return normalized || undefined;
+}
 function isSupportedCowtailAgent(agentId) {
   return (agentId ?? "main").trim() === "main";
 }
@@ -14555,10 +14605,11 @@ async function handleCowtailEvent(params) {
         return;
       }
       if (!thread.sessionKey) {
+        const threadId = resolveCowtailThreadId({ route, thread });
         await client.sendSessionBound({
           type: "openclaw_session_bound",
-          idempotencyKey: `cowtail:session-bound:${thread.id}`,
-          threadId: thread.id,
+          idempotencyKey: `cowtail:session-bound:${threadId}`,
+          threadId,
           sessionKey: route.sessionKey
         });
       }
@@ -14668,6 +14719,7 @@ async function dispatchCowtailTextTurn(params) {
     idempotencyKey: `cowtail:reply:${message.id}`,
     streamId: `cowtail:stream:${message.id}`,
     updateIndex: 0,
+    snapshotSequence: 0,
     toolFallbackIndex: 0,
     toolFallbackIds: {},
     text: "",
@@ -14741,6 +14793,7 @@ async function dispatchCowtailActionTurn(params) {
     idempotencyKey: `cowtail:action:${action.id}`,
     streamId: `cowtail:action-stream:${action.id}`,
     updateIndex: 0,
+    snapshotSequence: 0,
     toolFallbackIndex: 0,
     toolFallbackIds: {},
     text: "",
@@ -14921,28 +14974,17 @@ async function deliverCowtailReply(params) {
       updatedAt: Date.now()
     });
     if (!params.streamState.messageId) {
-      const result2 = await params.client.sendOpenClawMessage({
-        type: "openclaw_message",
-        idempotencyKey: params.streamState.idempotencyKey,
-        sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
-        title: params.thread.title,
+      await createDurableCowtailReply(params, {
         text: messageText,
-        authorLabel: "OpenClaw",
         links,
-        toolCalls: params.streamState.toolCalls,
-        actions: [],
         deliveryState: "pending"
       });
-      const messageId2 = recordCreatedOpenClawMessageId(params.streamState, result2);
-      if (!messageId2) {
-        return;
-      }
-      params.streamState.messageId = messageId2;
       return;
     }
     await params.client.sendOpenClawMessageUpdate({
       type: "openclaw_message_update",
       idempotencyKey: nextStreamUpdateIdempotencyKey(params.streamState),
+      streamId: params.streamState.streamId,
       messageId: params.streamState.messageId,
       text: messageText,
       links,
@@ -14967,28 +15009,17 @@ async function deliverCowtailReply(params) {
       updatedAt: Date.now()
     });
     if (!params.streamState.messageId) {
-      const result2 = await params.client.sendOpenClawMessage({
-        type: "openclaw_message",
-        idempotencyKey: params.streamState.idempotencyKey,
-        sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
-        title: params.thread.title,
+      await createDurableCowtailReply(params, {
         text: params.streamState.text,
-        authorLabel: "OpenClaw",
         links,
-        toolCalls: params.streamState.toolCalls,
-        actions: [],
         deliveryState: "pending"
       });
-      const messageId2 = recordCreatedOpenClawMessageId(params.streamState, result2);
-      if (!messageId2) {
-        return;
-      }
-      params.streamState.messageId = messageId2;
       return;
     }
     await params.client.sendOpenClawMessageUpdate({
       type: "openclaw_message_update",
       idempotencyKey: nextStreamUpdateIdempotencyKey(params.streamState),
+      streamId: params.streamState.streamId,
       messageId: params.streamState.messageId,
       text: params.streamState.text,
       links,
@@ -15002,6 +15033,7 @@ async function deliverCowtailReply(params) {
     await params.client.sendOpenClawMessageUpdate({
       type: "openclaw_message_update",
       idempotencyKey: nextStreamUpdateIdempotencyKey(params.streamState),
+      streamId: params.streamState.streamId,
       messageId: params.streamState.messageId,
       text,
       links,
@@ -15023,23 +15055,14 @@ async function deliverCowtailReply(params) {
     return;
   }
   params.streamState.text = text;
-  const result = await params.client.sendOpenClawMessage({
-    type: "openclaw_message",
-    idempotencyKey: params.streamState.idempotencyKey,
-    sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
-    title: params.thread.title,
+  const messageId = await createDurableCowtailReply(params, {
     text,
-    authorLabel: "OpenClaw",
     links,
-    toolCalls: params.streamState.toolCalls,
-    actions: [],
     deliveryState: "sent"
   });
-  const messageId = recordCreatedOpenClawMessageId(params.streamState, result);
   if (!messageId) {
     return;
   }
-  params.streamState.messageId = messageId;
   emitCowtailStreamSnapshot({
     client: params.client,
     logger: params.logger,
@@ -15052,6 +15075,35 @@ async function deliverCowtailReply(params) {
   });
   params.streamState.completed = true;
 }
+async function createDurableCowtailReply(params, message) {
+  try {
+    const routedThreadId = resolveCowtailThreadIdFromSessionKey(params.route.sessionKey);
+    const result = await params.client.sendOpenClawMessage({
+      type: "openclaw_message",
+      idempotencyKey: params.streamState.idempotencyKey,
+      streamId: params.streamState.streamId,
+      sessionKey: params.route.sessionKey,
+      ...routedThreadId ? { threadId: routedThreadId } : {},
+      title: params.thread.title,
+      text: message.text,
+      authorLabel: "OpenClaw",
+      links: message.links,
+      toolCalls: params.streamState.toolCalls,
+      actions: [],
+      deliveryState: message.deliveryState
+    });
+    const messageId = recordCreatedOpenClawMessageId(params.streamState, result);
+    if (!messageId) {
+      failCowtailStreamBeforeDurableCreate(params);
+      return;
+    }
+    params.streamState.messageId = messageId;
+    return messageId;
+  } catch (error48) {
+    failCowtailStreamBeforeDurableCreate(params);
+    throw error48;
+  }
+}
 async function finalizeCowtailStreamedReply(params) {
   if (params.streamState.failed || params.streamState.completed || !params.streamState.messageId || !params.streamState.text.trim() && params.streamState.toolCalls.length === 0) {
     return;
@@ -15059,6 +15111,7 @@ async function finalizeCowtailStreamedReply(params) {
   await params.client.sendOpenClawMessageUpdate({
     type: "openclaw_message_update",
     idempotencyKey: nextStreamUpdateIdempotencyKey(params.streamState),
+    streamId: params.streamState.streamId,
     messageId: params.streamState.messageId,
     text: params.streamState.text,
     links: params.streamState.links,
@@ -15140,26 +15193,46 @@ function deliverCowtailToolProgress(params) {
   });
 }
 function emitCowtailStreamSnapshot(params) {
-  if (params.streamState.failed || !params.text.trim() && params.streamState.links.length === 0 && params.streamState.toolCalls.length === 0) {
+  if (params.streamState.failed && params.allowFailed !== true || !params.text.trim() && params.streamState.links.length === 0 && params.streamState.toolCalls.length === 0) {
     return;
   }
   params.streamState.liveText = params.text;
   params.streamState.lastSnapshotText = params.text;
   params.streamState.lastSnapshotSentAt = params.updatedAt;
+  params.streamState.snapshotSequence += 1;
   params.client.sendOpenClawStreamSnapshot({
     type: "openclaw_message_stream_snapshot",
     streamId: params.streamState.streamId,
-    sessionKey: params.thread.sessionKey ?? params.route.sessionKey,
-    threadId: params.thread.id,
+    sessionKey: params.route.sessionKey,
+    threadId: resolveCowtailThreadId(params),
     text: params.text,
     links: params.streamState.links.map((link) => ({ ...link })),
     toolCalls: structuredClone(params.streamState.toolCalls),
     isFinal: params.isFinal,
+    snapshotSequence: params.streamState.snapshotSequence,
     updatedAt: params.updatedAt
   }).catch((error48) => {
     params.logger?.warn?.(`Cowtail stream snapshot send failed: ${errorMessage(error48)}`);
   });
 }
+function failCowtailStreamBeforeDurableCreate(params) {
+  if (!params.streamState.messageId && params.streamState.snapshotSequence > 0) {
+    const text = params.streamState.text.trim() ? params.streamState.text : currentLiveCowtailStreamText(params.streamState);
+    emitCowtailStreamSnapshot({
+      client: params.client,
+      logger: params.logger,
+      route: params.route,
+      thread: params.thread,
+      streamState: params.streamState,
+      text,
+      isFinal: true,
+      updatedAt: Date.now(),
+      allowFailed: true
+    });
+  }
+  params.streamState.failed = true;
+  params.streamState.completed = true;
+}
 function currentLiveCowtailStreamText(streamState) {
   return streamState.liveText ?? streamState.text;
 }
@@ -15357,7 +15430,7 @@ function buildCowtailInboundBody(params) {
   };
 }
 function finalizeInboundContext(params) {
-  const target = buildCowtailTarget(params.thread.id);
+  const target = buildCowtailTarget(resolveCowtailThreadId(params));
   return params.runtime.channel.reply.finalizeInboundContext({
     Body: params.body,
     BodyForAgent: params.text,
@@ -15401,14 +15474,17 @@ function resolveThreadRoute(params) {
       sessionKey: params.thread.sessionKey
     };
   }
-  const route = params.runtime.channel.routing.resolveAgentRoute({
-    cfg: params.runtime.config.loadConfig(),
-    channel: CHANNEL_ID,
+  const threadId = normalizeCowtailTarget(params.thread.id);
+  if (!threadId) {
+    params.logger?.warn?.("Cowtail thread_created event has a blank thread id");
+    return null;
+  }
+  const cfg = params.runtime.config.loadConfig();
+  const route = resolveCowtailAgentRoute({
+    cfg,
+    threadId,
     accountId: params.account.accountId,
-    peer: {
-      kind: "direct",
-      id: buildCowtailTarget(params.thread.id)
-    }
+    runtime: params.runtime
   });
   if (!isSupportedCowtailAgent(route.agentId)) {
     params.logger?.warn?.(`Cowtail thread ${params.thread.id} resolved unsupported agent ${route.agentId}`);
@@ -15419,6 +15495,45 @@ function resolveThreadRoute(params) {
     sessionKey: route.sessionKey
   };
 }
+function resolveCowtailAgentRoute(params) {
+  const rawRoute = resolveAgentRouteForPeer({
+    cfg: params.cfg,
+    accountId: params.accountId,
+    runtime: params.runtime,
+    peerId: params.threadId
+  });
+  if (isPeerBindingRoute(rawRoute)) {
+    return rawRoute;
+  }
+  const prefixedThreadId = buildCowtailTarget(params.threadId);
+  if (prefixedThreadId === params.threadId) {
+    return rawRoute;
+  }
+  const prefixedRoute = resolveAgentRouteForPeer({
+    cfg: params.cfg,
+    accountId: params.accountId,
+    runtime: params.runtime,
+    peerId: prefixedThreadId
+  });
+  return isPeerBindingRoute(prefixedRoute) ? prefixedRoute : rawRoute;
+}
+function resolveAgentRouteForPeer(params) {
+  return params.runtime.channel.routing.resolveAgentRoute({
+    cfg: params.cfg,
+    channel: CHANNEL_ID,
+    accountId: params.accountId,
+    peer: {
+      kind: "direct",
+      id: params.peerId
+    }
+  });
+}
+function isPeerBindingRoute(route) {
+  return route.matchedBy === "binding.peer";
+}
+function resolveCowtailThreadId(params) {
+  return resolveCowtailThreadIdFromSessionKey(params.route.sessionKey) ?? normalizeCowtailTarget(params.thread.id);
+}
 function errorMessage(error48) {
   return error48 instanceof Error ? error48.message : String(error48);
 }
@@ -15436,23 +15551,29 @@ function resolveCowtailTarget(to) {
   if (!normalizedTarget) {
     throw new Error("Cowtail target must not be blank");
   }
-  return buildCowtailTarget(normalizedTarget);
+  return normalizedTarget;
 }
 async function sendCowtailText(params) {
   const { client, to } = params;
   const text = ensureNonBlankText(params.text);
   const target = resolveCowtailTarget(to);
+  const sessionKey = buildCowtailTarget(target);
   const result = await client.sendOpenClawMessage({
     type: "openclaw_message",
-    sessionKey: target,
+    sessionKey,
+    threadHint: target,
     text,
     links: [],
     actions: []
   });
+  const messageId = result.payload?.messageId;
+  if (typeof messageId !== "string" || messageId.trim() === "") {
+    throw new Error("Cowtail did not acknowledge a durable message id");
+  }
   return {
     channel: "cowtail",
-    messageId: String(result.sequence ?? result.requestId),
-    to: target
+    messageId,
+    to: buildCowtailTarget(target)
   };
 }
 

package/package.json

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