@maudecode/openclaw-cowtail 0.14.0 → 0.14.1

package/dist/index.js

@@ -14545,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";
 }
@@ -14581,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
         });
       }
@@ -15052,11 +15077,13 @@ async function deliverCowtailReply(params) {
 }
 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.thread.sessionKey ?? params.route.sessionKey,
+      sessionKey: params.route.sessionKey,
+      ...routedThreadId ? { threadId: routedThreadId } : {},
       title: params.thread.title,
       text: message.text,
       authorLabel: "OpenClaw",
@@ -15176,8 +15203,8 @@ function emitCowtailStreamSnapshot(params) {
   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),
@@ -15403,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,
@@ -15447,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}`);
@@ -15465,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);
 }

package/dist/setup-entry.js

@@ -14545,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";
 }
@@ -14581,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
         });
       }
@@ -15052,11 +15077,13 @@ async function deliverCowtailReply(params) {
 }
 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.thread.sessionKey ?? params.route.sessionKey,
+      sessionKey: params.route.sessionKey,
+      ...routedThreadId ? { threadId: routedThreadId } : {},
       title: params.thread.title,
       text: message.text,
       authorLabel: "OpenClaw",
@@ -15176,8 +15203,8 @@ function emitCowtailStreamSnapshot(params) {
   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),
@@ -15403,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,
@@ -15447,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}`);
@@ -15465,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);
 }

package/package.json

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