fix: harden outbound mirroring normalization
This commit is contained in:
@@ -31,6 +31,8 @@ Docs: https://docs.clawd.bot
|
|||||||
- Messaging: mirror outbound sends into target session keys (threads + dmScope) and create session entries on send. (#1520)
|
- Messaging: mirror outbound sends into target session keys (threads + dmScope) and create session entries on send. (#1520)
|
||||||
- Sessions: normalize session key casing to lowercase for consistent routing.
|
- Sessions: normalize session key casing to lowercase for consistent routing.
|
||||||
- BlueBubbles: normalize group session keys for outbound mirroring. (#1520)
|
- BlueBubbles: normalize group session keys for outbound mirroring. (#1520)
|
||||||
|
- Slack: match auto-thread mirroring channel ids case-insensitively. (#1520)
|
||||||
|
- Gateway: lowercase provided session keys when mirroring outbound sends. (#1520)
|
||||||
- Skills: gate bird Homebrew install to macOS. (#1569) Thanks @bradleypriest.
|
- Skills: gate bird Homebrew install to macOS. (#1569) Thanks @bradleypriest.
|
||||||
- Slack: honor open groupPolicy for unlisted channels in message + slash gating. (#1563) Thanks @itsjaydesu.
|
- Slack: honor open groupPolicy for unlisted channels in message + slash gating. (#1563) Thanks @itsjaydesu.
|
||||||
- Agents: show tool error fallback when the last assistant turn only invoked tools (prevents silent stops).
|
- Agents: show tool error fallback when the last assistant turn only invoked tools (prevents silent stops).
|
||||||
|
|||||||
@@ -40,6 +40,8 @@ Outbound sends were mirrored into the *current* agent session (tool session key)
|
|||||||
- Mattermost targets now strip `@` for DM session key routing.
|
- Mattermost targets now strip `@` for DM session key routing.
|
||||||
- Zalo Personal uses DM peer kind for 1:1 targets (group only when `group:` is present).
|
- Zalo Personal uses DM peer kind for 1:1 targets (group only when `group:` is present).
|
||||||
- BlueBubbles group targets strip `chat_*` prefixes to match inbound session keys.
|
- BlueBubbles group targets strip `chat_*` prefixes to match inbound session keys.
|
||||||
|
- Slack auto-thread mirroring matches channel ids case-insensitively.
|
||||||
|
- Gateway send lowercases provided session keys before mirroring.
|
||||||
|
|
||||||
## Decisions
|
## Decisions
|
||||||
- **Gateway send session derivation**: if `sessionKey` is provided, use it. If omitted, derive a sessionKey from target + default agent and mirror there.
|
- **Gateway send session derivation**: if `sessionKey` is provided, use it. If omitted, derive a sessionKey from target + default agent and mirror there.
|
||||||
|
|||||||
@@ -137,6 +137,34 @@ describe("gateway send mirroring", () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("lowercases provided session keys for mirroring", async () => {
|
||||||
|
mocks.deliverOutboundPayloads.mockResolvedValue([{ messageId: "m-lower", channel: "slack" }]);
|
||||||
|
|
||||||
|
const respond = vi.fn();
|
||||||
|
await sendHandlers.send({
|
||||||
|
params: {
|
||||||
|
to: "channel:C1",
|
||||||
|
message: "hi",
|
||||||
|
channel: "slack",
|
||||||
|
idempotencyKey: "idem-lower",
|
||||||
|
sessionKey: "agent:main:slack:channel:C123",
|
||||||
|
},
|
||||||
|
respond,
|
||||||
|
context: makeContext(),
|
||||||
|
req: { type: "req", id: "1", method: "send" },
|
||||||
|
client: null,
|
||||||
|
isWebchatConnect: () => false,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(mocks.deliverOutboundPayloads).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
mirror: expect.objectContaining({
|
||||||
|
sessionKey: "agent:main:slack:channel:c123",
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
it("derives a target session key when none is provided", async () => {
|
it("derives a target session key when none is provided", async () => {
|
||||||
mocks.deliverOutboundPayloads.mockResolvedValue([{ messageId: "m3", channel: "slack" }]);
|
mocks.deliverOutboundPayloads.mockResolvedValue([{ messageId: "m3", channel: "slack" }]);
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ export const sendHandlers: GatewayRequestHandlers = {
|
|||||||
);
|
);
|
||||||
const providedSessionKey =
|
const providedSessionKey =
|
||||||
typeof request.sessionKey === "string" && request.sessionKey.trim()
|
typeof request.sessionKey === "string" && request.sessionKey.trim()
|
||||||
? request.sessionKey.trim()
|
? request.sessionKey.trim().toLowerCase()
|
||||||
: undefined;
|
: undefined;
|
||||||
const derivedAgentId = resolveSessionAgentId({ config: cfg });
|
const derivedAgentId = resolveSessionAgentId({ config: cfg });
|
||||||
// If callers omit sessionKey, derive a target session key from the outbound route.
|
// If callers omit sessionKey, derive a target session key from the outbound route.
|
||||||
|
|||||||
@@ -89,4 +89,30 @@ describe("runMessageAction Slack threading", () => {
|
|||||||
const call = mocks.executeSendAction.mock.calls[0]?.[0];
|
const call = mocks.executeSendAction.mock.calls[0]?.[0];
|
||||||
expect(call?.ctx?.mirror?.sessionKey).toBe("agent:main:slack:channel:c123:thread:111.222");
|
expect(call?.ctx?.mirror?.sessionKey).toBe("agent:main:slack:channel:c123:thread:111.222");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("matches auto-threading when channel ids differ in case", async () => {
|
||||||
|
mocks.executeSendAction.mockResolvedValue({
|
||||||
|
handledBy: "plugin",
|
||||||
|
payload: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
await runMessageAction({
|
||||||
|
cfg: slackConfig,
|
||||||
|
action: "send",
|
||||||
|
params: {
|
||||||
|
channel: "slack",
|
||||||
|
target: "channel:c123",
|
||||||
|
message: "hi",
|
||||||
|
},
|
||||||
|
toolContext: {
|
||||||
|
currentChannelId: "C123",
|
||||||
|
currentThreadTs: "333.444",
|
||||||
|
replyToMode: "all",
|
||||||
|
},
|
||||||
|
agentId: "main",
|
||||||
|
});
|
||||||
|
|
||||||
|
const call = mocks.executeSendAction.mock.calls[0]?.[0];
|
||||||
|
expect(call?.ctx?.mirror?.sessionKey).toBe("agent:main:slack:channel:c123:thread:333.444");
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ function resolveSlackAutoThreadId(params: {
|
|||||||
if (context.replyToMode !== "all" && context.replyToMode !== "first") return undefined;
|
if (context.replyToMode !== "all" && context.replyToMode !== "first") return undefined;
|
||||||
const parsedTarget = parseSlackTarget(params.to, { defaultKind: "channel" });
|
const parsedTarget = parseSlackTarget(params.to, { defaultKind: "channel" });
|
||||||
if (!parsedTarget || parsedTarget.kind !== "channel") return undefined;
|
if (!parsedTarget || parsedTarget.kind !== "channel") return undefined;
|
||||||
if (parsedTarget.id !== context.currentChannelId) return undefined;
|
if (parsedTarget.id.toLowerCase() !== context.currentChannelId.toLowerCase()) return undefined;
|
||||||
if (context.replyToMode === "first" && context.hasRepliedRef?.value) return undefined;
|
if (context.replyToMode === "first" && context.hasRepliedRef?.value) return undefined;
|
||||||
return context.currentThreadTs;
|
return context.currentThreadTs;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user