@openclaw/msteams 2026.5.2 → 2026.5.3-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api.js +3 -0
- package/dist/channel-D7hdreTh.js +984 -0
- package/dist/channel-config-api.js +2 -0
- package/dist/channel-plugin-api.js +2 -0
- package/dist/channel.runtime-BC1ruIfN.js +573 -0
- package/dist/config-schema-B8QezH6t.js +15 -0
- package/dist/contract-api.js +2 -0
- package/dist/graph-users-9uQJepqr.js +1354 -0
- package/dist/index.js +22 -0
- package/dist/oauth-BWJyilR1.js +114 -0
- package/dist/oauth.token-xxpoLWy5.js +115 -0
- package/dist/policy-DTnU2GR7.js +142 -0
- package/dist/probe-D_H8yFps.js +2194 -0
- package/dist/resolve-allowlist-D41JSziq.js +219 -0
- package/dist/runtime-api-DV1iVMn1.js +28 -0
- package/dist/runtime-api.js +2 -0
- package/dist/secret-contract-BuoEXmPS.js +35 -0
- package/dist/secret-contract-api.js +2 -0
- package/dist/setup-entry.js +15 -0
- package/dist/setup-plugin-api.js +64 -0
- package/dist/setup-surface-BLkFQYIQ.js +313 -0
- package/dist/src-CFp1QpFd.js +4064 -0
- package/dist/test-api.js +2 -0
- package/package.json +14 -6
- package/api.ts +0 -3
- package/channel-config-api.ts +0 -1
- package/channel-plugin-api.ts +0 -2
- package/config-api.ts +0 -4
- package/contract-api.ts +0 -4
- package/index.ts +0 -20
- package/runtime-api.ts +0 -73
- package/secret-contract-api.ts +0 -5
- package/setup-entry.ts +0 -13
- package/setup-plugin-api.ts +0 -3
- package/src/ai-entity.ts +0 -7
- package/src/approval-auth.ts +0 -44
- package/src/attachments/bot-framework.test.ts +0 -461
- package/src/attachments/bot-framework.ts +0 -362
- package/src/attachments/download.ts +0 -311
- package/src/attachments/graph.test.ts +0 -416
- package/src/attachments/graph.ts +0 -484
- package/src/attachments/html.ts +0 -122
- package/src/attachments/payload.ts +0 -14
- package/src/attachments/remote-media.test.ts +0 -137
- package/src/attachments/remote-media.ts +0 -112
- package/src/attachments/shared.test.ts +0 -530
- package/src/attachments/shared.ts +0 -626
- package/src/attachments/types.ts +0 -47
- package/src/attachments.graph.test.ts +0 -342
- package/src/attachments.helpers.test.ts +0 -246
- package/src/attachments.test-helpers.ts +0 -17
- package/src/attachments.test.ts +0 -687
- package/src/attachments.ts +0 -18
- package/src/block-streaming-config.test.ts +0 -61
- package/src/channel-api.ts +0 -1
- package/src/channel.actions.test.ts +0 -742
- package/src/channel.directory.test.ts +0 -200
- package/src/channel.runtime.ts +0 -56
- package/src/channel.setup.ts +0 -77
- package/src/channel.test.ts +0 -128
- package/src/channel.ts +0 -1136
- package/src/config-schema.ts +0 -6
- package/src/config-ui-hints.ts +0 -12
- package/src/conversation-store-fs.test.ts +0 -74
- package/src/conversation-store-fs.ts +0 -149
- package/src/conversation-store-helpers.test.ts +0 -202
- package/src/conversation-store-helpers.ts +0 -105
- package/src/conversation-store-memory.ts +0 -51
- package/src/conversation-store.shared.test.ts +0 -225
- package/src/conversation-store.ts +0 -71
- package/src/directory-live.test.ts +0 -156
- package/src/directory-live.ts +0 -111
- package/src/doctor.ts +0 -27
- package/src/errors.test.ts +0 -133
- package/src/errors.ts +0 -246
- package/src/feedback-reflection-prompt.ts +0 -117
- package/src/feedback-reflection-store.ts +0 -114
- package/src/feedback-reflection.test.ts +0 -237
- package/src/feedback-reflection.ts +0 -283
- package/src/file-consent-helpers.test.ts +0 -326
- package/src/file-consent-helpers.ts +0 -126
- package/src/file-consent-invoke.ts +0 -150
- package/src/file-consent.test.ts +0 -363
- package/src/file-consent.ts +0 -287
- package/src/graph-chat.ts +0 -55
- package/src/graph-group-management.test.ts +0 -318
- package/src/graph-group-management.ts +0 -168
- package/src/graph-members.test.ts +0 -89
- package/src/graph-members.ts +0 -48
- package/src/graph-messages.actions.test.ts +0 -243
- package/src/graph-messages.read.test.ts +0 -391
- package/src/graph-messages.search.test.ts +0 -213
- package/src/graph-messages.test-helpers.ts +0 -50
- package/src/graph-messages.ts +0 -534
- package/src/graph-teams.test.ts +0 -215
- package/src/graph-teams.ts +0 -114
- package/src/graph-thread.test.ts +0 -246
- package/src/graph-thread.ts +0 -146
- package/src/graph-upload.test.ts +0 -258
- package/src/graph-upload.ts +0 -531
- package/src/graph-users.ts +0 -29
- package/src/graph.test.ts +0 -516
- package/src/graph.ts +0 -293
- package/src/inbound.test.ts +0 -221
- package/src/inbound.ts +0 -148
- package/src/index.ts +0 -4
- package/src/media-helpers.test.ts +0 -202
- package/src/media-helpers.ts +0 -105
- package/src/mentions.test.ts +0 -244
- package/src/mentions.ts +0 -114
- package/src/messenger.test.ts +0 -865
- package/src/messenger.ts +0 -605
- package/src/monitor-handler/access.ts +0 -125
- package/src/monitor-handler/inbound-media.test.ts +0 -289
- package/src/monitor-handler/inbound-media.ts +0 -180
- package/src/monitor-handler/message-handler-mock-support.test-support.ts +0 -28
- package/src/monitor-handler/message-handler.authz.test.ts +0 -669
- package/src/monitor-handler/message-handler.dm-media.test.ts +0 -54
- package/src/monitor-handler/message-handler.test-support.ts +0 -100
- package/src/monitor-handler/message-handler.thread-parent.test.ts +0 -223
- package/src/monitor-handler/message-handler.thread-session.test.ts +0 -77
- package/src/monitor-handler/message-handler.ts +0 -1000
- package/src/monitor-handler/reaction-handler.test.ts +0 -267
- package/src/monitor-handler/reaction-handler.ts +0 -210
- package/src/monitor-handler/thread-session.ts +0 -17
- package/src/monitor-handler.adaptive-card.test.ts +0 -162
- package/src/monitor-handler.feedback-authz.test.ts +0 -314
- package/src/monitor-handler.file-consent.test.ts +0 -423
- package/src/monitor-handler.sso.test.ts +0 -563
- package/src/monitor-handler.test-helpers.ts +0 -180
- package/src/monitor-handler.ts +0 -534
- package/src/monitor-handler.types.ts +0 -27
- package/src/monitor-types.ts +0 -6
- package/src/monitor.lifecycle.test.ts +0 -278
- package/src/monitor.test.ts +0 -119
- package/src/monitor.ts +0 -442
- package/src/oauth.flow.ts +0 -77
- package/src/oauth.shared.ts +0 -37
- package/src/oauth.test.ts +0 -305
- package/src/oauth.token.ts +0 -158
- package/src/oauth.ts +0 -130
- package/src/outbound.test.ts +0 -130
- package/src/outbound.ts +0 -71
- package/src/pending-uploads-fs.test.ts +0 -246
- package/src/pending-uploads-fs.ts +0 -235
- package/src/pending-uploads.test.ts +0 -173
- package/src/pending-uploads.ts +0 -121
- package/src/policy.test.ts +0 -240
- package/src/policy.ts +0 -262
- package/src/polls-store-memory.ts +0 -32
- package/src/polls.test.ts +0 -160
- package/src/polls.ts +0 -323
- package/src/presentation.ts +0 -68
- package/src/probe.test.ts +0 -77
- package/src/probe.ts +0 -132
- package/src/reply-dispatcher.test.ts +0 -437
- package/src/reply-dispatcher.ts +0 -346
- package/src/reply-stream-controller.test.ts +0 -235
- package/src/reply-stream-controller.ts +0 -147
- package/src/resolve-allowlist.test.ts +0 -250
- package/src/resolve-allowlist.ts +0 -309
- package/src/revoked-context.ts +0 -17
- package/src/runtime.ts +0 -9
- package/src/sdk-types.ts +0 -59
- package/src/sdk.test.ts +0 -666
- package/src/sdk.ts +0 -884
- package/src/secret-contract.ts +0 -49
- package/src/secret-input.ts +0 -7
- package/src/send-context.ts +0 -231
- package/src/send.test.ts +0 -493
- package/src/send.ts +0 -637
- package/src/sent-message-cache.test.ts +0 -15
- package/src/sent-message-cache.ts +0 -56
- package/src/session-route.ts +0 -40
- package/src/setup-core.ts +0 -160
- package/src/setup-surface.test.ts +0 -202
- package/src/setup-surface.ts +0 -320
- package/src/sso-token-store.test.ts +0 -72
- package/src/sso-token-store.ts +0 -166
- package/src/sso.ts +0 -300
- package/src/storage.ts +0 -25
- package/src/store-fs.ts +0 -44
- package/src/streaming-message.test.ts +0 -262
- package/src/streaming-message.ts +0 -297
- package/src/test-runtime.ts +0 -16
- package/src/thread-parent-context.test.ts +0 -224
- package/src/thread-parent-context.ts +0 -159
- package/src/token-response.ts +0 -11
- package/src/token.test.ts +0 -259
- package/src/token.ts +0 -195
- package/src/user-agent.test.ts +0 -86
- package/src/user-agent.ts +0 -53
- package/src/webhook-timeouts.ts +0 -27
- package/src/welcome-card.test.ts +0 -81
- package/src/welcome-card.ts +0 -57
- package/test-api.ts +0 -1
- package/tsconfig.json +0 -16
package/src/config-schema.ts
DELETED
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import { buildChannelConfigSchema, MSTeamsConfigSchema } from "../config-api.js";
|
|
2
|
-
import { msTeamsChannelConfigUiHints } from "./config-ui-hints.js";
|
|
3
|
-
|
|
4
|
-
export const MSTeamsChannelConfigSchema = buildChannelConfigSchema(MSTeamsConfigSchema, {
|
|
5
|
-
uiHints: msTeamsChannelConfigUiHints,
|
|
6
|
-
});
|
package/src/config-ui-hints.ts
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import type { ChannelConfigUiHint } from "openclaw/plugin-sdk/channel-core";
|
|
2
|
-
|
|
3
|
-
export const msTeamsChannelConfigUiHints = {
|
|
4
|
-
"": {
|
|
5
|
-
label: "MS Teams",
|
|
6
|
-
help: "Microsoft Teams channel provider configuration and provider-specific policy toggles. Use this section to isolate Teams behavior from other enterprise chat providers.",
|
|
7
|
-
},
|
|
8
|
-
configWrites: {
|
|
9
|
-
label: "MS Teams Config Writes",
|
|
10
|
-
help: "Allow Microsoft Teams to write config in response to channel events/commands (default: true).",
|
|
11
|
-
},
|
|
12
|
-
} satisfies Record<string, ChannelConfigUiHint>;
|
|
@@ -1,74 +0,0 @@
|
|
|
1
|
-
import fs from "node:fs";
|
|
2
|
-
import os from "node:os";
|
|
3
|
-
import path from "node:path";
|
|
4
|
-
import { beforeEach, describe, expect, it } from "vitest";
|
|
5
|
-
import { createMSTeamsConversationStoreFs } from "./conversation-store-fs.js";
|
|
6
|
-
import type { StoredConversationReference } from "./conversation-store.js";
|
|
7
|
-
import { setMSTeamsRuntime } from "./runtime.js";
|
|
8
|
-
import { msteamsRuntimeStub } from "./test-runtime.js";
|
|
9
|
-
|
|
10
|
-
describe("msteams conversation store (fs-only)", () => {
|
|
11
|
-
beforeEach(() => {
|
|
12
|
-
setMSTeamsRuntime(msteamsRuntimeStub);
|
|
13
|
-
});
|
|
14
|
-
|
|
15
|
-
it("filters and prunes expired entries while preserving legacy entries without lastSeenAt", async () => {
|
|
16
|
-
const stateDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), "openclaw-msteams-store-"));
|
|
17
|
-
|
|
18
|
-
const env: NodeJS.ProcessEnv = {
|
|
19
|
-
...process.env,
|
|
20
|
-
OPENCLAW_STATE_DIR: stateDir,
|
|
21
|
-
};
|
|
22
|
-
|
|
23
|
-
const store = createMSTeamsConversationStoreFs({ env, ttlMs: 1_000 });
|
|
24
|
-
|
|
25
|
-
const ref: StoredConversationReference = {
|
|
26
|
-
conversation: { id: "19:active@thread.tacv2" },
|
|
27
|
-
channelId: "msteams",
|
|
28
|
-
serviceUrl: "https://service.example.com",
|
|
29
|
-
user: { id: "u1", aadObjectId: "aad1" },
|
|
30
|
-
};
|
|
31
|
-
|
|
32
|
-
await store.upsert("19:active@thread.tacv2", ref);
|
|
33
|
-
|
|
34
|
-
const filePath = path.join(stateDir, "msteams-conversations.json");
|
|
35
|
-
const raw = await fs.promises.readFile(filePath, "utf-8");
|
|
36
|
-
const json = JSON.parse(raw) as {
|
|
37
|
-
version: number;
|
|
38
|
-
conversations: Record<string, StoredConversationReference>;
|
|
39
|
-
};
|
|
40
|
-
|
|
41
|
-
json.conversations["19:old@thread.tacv2"] = {
|
|
42
|
-
...ref,
|
|
43
|
-
conversation: { id: "19:old@thread.tacv2" },
|
|
44
|
-
lastSeenAt: new Date(Date.now() - 60_000).toISOString(),
|
|
45
|
-
};
|
|
46
|
-
|
|
47
|
-
json.conversations["19:legacy@thread.tacv2"] = {
|
|
48
|
-
...ref,
|
|
49
|
-
conversation: { id: "19:legacy@thread.tacv2" },
|
|
50
|
-
};
|
|
51
|
-
|
|
52
|
-
await fs.promises.writeFile(filePath, `${JSON.stringify(json, null, 2)}\n`);
|
|
53
|
-
|
|
54
|
-
const list = await store.list();
|
|
55
|
-
const ids = list.map((entry) => entry.conversationId).toSorted();
|
|
56
|
-
expect(ids).toEqual(["19:active@thread.tacv2", "19:legacy@thread.tacv2"]);
|
|
57
|
-
|
|
58
|
-
expect(await store.get("19:old@thread.tacv2")).toBeNull();
|
|
59
|
-
expect(await store.get("19:legacy@thread.tacv2")).not.toBeNull();
|
|
60
|
-
|
|
61
|
-
await store.upsert("19:new@thread.tacv2", {
|
|
62
|
-
...ref,
|
|
63
|
-
conversation: { id: "19:new@thread.tacv2" },
|
|
64
|
-
});
|
|
65
|
-
|
|
66
|
-
const rawAfter = await fs.promises.readFile(filePath, "utf-8");
|
|
67
|
-
const jsonAfter = JSON.parse(rawAfter) as typeof json;
|
|
68
|
-
expect(Object.keys(jsonAfter.conversations).toSorted()).toEqual([
|
|
69
|
-
"19:active@thread.tacv2",
|
|
70
|
-
"19:legacy@thread.tacv2",
|
|
71
|
-
"19:new@thread.tacv2",
|
|
72
|
-
]);
|
|
73
|
-
});
|
|
74
|
-
});
|
|
@@ -1,149 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
findPreferredDmConversationByUserId,
|
|
3
|
-
mergeStoredConversationReference,
|
|
4
|
-
normalizeStoredConversationId,
|
|
5
|
-
parseStoredConversationTimestamp,
|
|
6
|
-
toConversationStoreEntries,
|
|
7
|
-
} from "./conversation-store-helpers.js";
|
|
8
|
-
import type {
|
|
9
|
-
MSTeamsConversationStore,
|
|
10
|
-
MSTeamsConversationStoreEntry,
|
|
11
|
-
StoredConversationReference,
|
|
12
|
-
} from "./conversation-store.js";
|
|
13
|
-
import { resolveMSTeamsStorePath } from "./storage.js";
|
|
14
|
-
import { readJsonFile, withFileLock, writeJsonFile } from "./store-fs.js";
|
|
15
|
-
|
|
16
|
-
type ConversationStoreData = {
|
|
17
|
-
version: 1;
|
|
18
|
-
conversations: Record<string, StoredConversationReference>;
|
|
19
|
-
};
|
|
20
|
-
|
|
21
|
-
const STORE_FILENAME = "msteams-conversations.json";
|
|
22
|
-
const MAX_CONVERSATIONS = 1000;
|
|
23
|
-
const CONVERSATION_TTL_MS = 365 * 24 * 60 * 60 * 1000;
|
|
24
|
-
|
|
25
|
-
function pruneToLimit(conversations: Record<string, StoredConversationReference>) {
|
|
26
|
-
const entries = Object.entries(conversations);
|
|
27
|
-
if (entries.length <= MAX_CONVERSATIONS) {
|
|
28
|
-
return conversations;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
entries.sort((a, b) => {
|
|
32
|
-
const aTs = parseStoredConversationTimestamp(a[1].lastSeenAt) ?? 0;
|
|
33
|
-
const bTs = parseStoredConversationTimestamp(b[1].lastSeenAt) ?? 0;
|
|
34
|
-
return aTs - bTs;
|
|
35
|
-
});
|
|
36
|
-
|
|
37
|
-
const keep = entries.slice(entries.length - MAX_CONVERSATIONS);
|
|
38
|
-
return Object.fromEntries(keep);
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
function pruneExpired(
|
|
42
|
-
conversations: Record<string, StoredConversationReference>,
|
|
43
|
-
nowMs: number,
|
|
44
|
-
ttlMs: number,
|
|
45
|
-
) {
|
|
46
|
-
let removed = false;
|
|
47
|
-
const kept: typeof conversations = {};
|
|
48
|
-
for (const [conversationId, reference] of Object.entries(conversations)) {
|
|
49
|
-
const lastSeenAt = parseStoredConversationTimestamp(reference.lastSeenAt);
|
|
50
|
-
// Preserve legacy entries that have no lastSeenAt until they're seen again.
|
|
51
|
-
if (lastSeenAt != null && nowMs - lastSeenAt > ttlMs) {
|
|
52
|
-
removed = true;
|
|
53
|
-
continue;
|
|
54
|
-
}
|
|
55
|
-
kept[conversationId] = reference;
|
|
56
|
-
}
|
|
57
|
-
return { conversations: kept, removed };
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
export function createMSTeamsConversationStoreFs(params?: {
|
|
61
|
-
env?: NodeJS.ProcessEnv;
|
|
62
|
-
homedir?: () => string;
|
|
63
|
-
ttlMs?: number;
|
|
64
|
-
stateDir?: string;
|
|
65
|
-
storePath?: string;
|
|
66
|
-
}): MSTeamsConversationStore {
|
|
67
|
-
const ttlMs = params?.ttlMs ?? CONVERSATION_TTL_MS;
|
|
68
|
-
const filePath = resolveMSTeamsStorePath({
|
|
69
|
-
filename: STORE_FILENAME,
|
|
70
|
-
env: params?.env,
|
|
71
|
-
homedir: params?.homedir,
|
|
72
|
-
stateDir: params?.stateDir,
|
|
73
|
-
storePath: params?.storePath,
|
|
74
|
-
});
|
|
75
|
-
|
|
76
|
-
const empty: ConversationStoreData = { version: 1, conversations: {} };
|
|
77
|
-
|
|
78
|
-
const readStore = async (): Promise<ConversationStoreData> => {
|
|
79
|
-
const { value } = await readJsonFile(filePath, empty);
|
|
80
|
-
if (
|
|
81
|
-
value.version !== 1 ||
|
|
82
|
-
!value.conversations ||
|
|
83
|
-
typeof value.conversations !== "object" ||
|
|
84
|
-
Array.isArray(value.conversations)
|
|
85
|
-
) {
|
|
86
|
-
return empty;
|
|
87
|
-
}
|
|
88
|
-
const nowMs = Date.now();
|
|
89
|
-
const pruned = pruneExpired(value.conversations, nowMs, ttlMs).conversations;
|
|
90
|
-
return { version: 1, conversations: pruneToLimit(pruned) };
|
|
91
|
-
};
|
|
92
|
-
|
|
93
|
-
const list = async (): Promise<MSTeamsConversationStoreEntry[]> => {
|
|
94
|
-
const store = await readStore();
|
|
95
|
-
return toConversationStoreEntries(Object.entries(store.conversations));
|
|
96
|
-
};
|
|
97
|
-
|
|
98
|
-
const get = async (conversationId: string): Promise<StoredConversationReference | null> => {
|
|
99
|
-
const store = await readStore();
|
|
100
|
-
return store.conversations[normalizeStoredConversationId(conversationId)] ?? null;
|
|
101
|
-
};
|
|
102
|
-
|
|
103
|
-
const findPreferredDmByUserId = async (
|
|
104
|
-
id: string,
|
|
105
|
-
): Promise<MSTeamsConversationStoreEntry | null> => {
|
|
106
|
-
return findPreferredDmConversationByUserId(await list(), id);
|
|
107
|
-
};
|
|
108
|
-
|
|
109
|
-
const upsert = async (
|
|
110
|
-
conversationId: string,
|
|
111
|
-
reference: StoredConversationReference,
|
|
112
|
-
): Promise<void> => {
|
|
113
|
-
const normalizedId = normalizeStoredConversationId(conversationId);
|
|
114
|
-
await withFileLock(filePath, empty, async () => {
|
|
115
|
-
const store = await readStore();
|
|
116
|
-
store.conversations[normalizedId] = mergeStoredConversationReference(
|
|
117
|
-
store.conversations[normalizedId],
|
|
118
|
-
reference,
|
|
119
|
-
new Date().toISOString(),
|
|
120
|
-
);
|
|
121
|
-
const nowMs = Date.now();
|
|
122
|
-
store.conversations = pruneExpired(store.conversations, nowMs, ttlMs).conversations;
|
|
123
|
-
store.conversations = pruneToLimit(store.conversations);
|
|
124
|
-
await writeJsonFile(filePath, store);
|
|
125
|
-
});
|
|
126
|
-
};
|
|
127
|
-
|
|
128
|
-
const remove = async (conversationId: string): Promise<boolean> => {
|
|
129
|
-
const normalizedId = normalizeStoredConversationId(conversationId);
|
|
130
|
-
return await withFileLock(filePath, empty, async () => {
|
|
131
|
-
const store = await readStore();
|
|
132
|
-
if (!(normalizedId in store.conversations)) {
|
|
133
|
-
return false;
|
|
134
|
-
}
|
|
135
|
-
delete store.conversations[normalizedId];
|
|
136
|
-
await writeJsonFile(filePath, store);
|
|
137
|
-
return true;
|
|
138
|
-
});
|
|
139
|
-
};
|
|
140
|
-
|
|
141
|
-
return {
|
|
142
|
-
upsert,
|
|
143
|
-
get,
|
|
144
|
-
list,
|
|
145
|
-
remove,
|
|
146
|
-
findPreferredDmByUserId,
|
|
147
|
-
findByUserId: findPreferredDmByUserId,
|
|
148
|
-
};
|
|
149
|
-
}
|
|
@@ -1,202 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it } from "vitest";
|
|
2
|
-
import { findPreferredDmConversationByUserId } from "./conversation-store-helpers.js";
|
|
3
|
-
import type { MSTeamsConversationStoreEntry } from "./conversation-store.js";
|
|
4
|
-
|
|
5
|
-
function entry(params: {
|
|
6
|
-
conversationId: string;
|
|
7
|
-
userId?: string;
|
|
8
|
-
aadObjectId?: string;
|
|
9
|
-
conversationType?: string;
|
|
10
|
-
lastSeenAt?: string;
|
|
11
|
-
}): MSTeamsConversationStoreEntry {
|
|
12
|
-
return {
|
|
13
|
-
conversationId: params.conversationId,
|
|
14
|
-
reference: {
|
|
15
|
-
user: {
|
|
16
|
-
id: params.userId ?? "user-1",
|
|
17
|
-
aadObjectId: params.aadObjectId ?? "aad-1",
|
|
18
|
-
},
|
|
19
|
-
conversation: {
|
|
20
|
-
id: params.conversationId,
|
|
21
|
-
conversationType: params.conversationType,
|
|
22
|
-
},
|
|
23
|
-
lastSeenAt: params.lastSeenAt,
|
|
24
|
-
},
|
|
25
|
-
};
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
describe("findPreferredDmConversationByUserId", () => {
|
|
29
|
-
it("returns null for empty id", () => {
|
|
30
|
-
expect(findPreferredDmConversationByUserId([], " ")).toBeNull();
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
it("returns null when no entries match", () => {
|
|
34
|
-
const entries = [entry({ conversationId: "conv-1", aadObjectId: "other-user" })];
|
|
35
|
-
expect(findPreferredDmConversationByUserId(entries, "aad-1")).toBeNull();
|
|
36
|
-
});
|
|
37
|
-
|
|
38
|
-
it("returns a personal DM conversation by aadObjectId", () => {
|
|
39
|
-
const entries = [
|
|
40
|
-
entry({
|
|
41
|
-
conversationId: "dm-conv",
|
|
42
|
-
aadObjectId: "aad-target",
|
|
43
|
-
conversationType: "personal",
|
|
44
|
-
}),
|
|
45
|
-
];
|
|
46
|
-
const result = findPreferredDmConversationByUserId(entries, "aad-target");
|
|
47
|
-
expect(result?.conversationId).toBe("dm-conv");
|
|
48
|
-
});
|
|
49
|
-
|
|
50
|
-
it("returns a personal DM conversation by user.id", () => {
|
|
51
|
-
const entries = [
|
|
52
|
-
entry({
|
|
53
|
-
conversationId: "dm-conv",
|
|
54
|
-
userId: "user-target",
|
|
55
|
-
aadObjectId: "other",
|
|
56
|
-
conversationType: "personal",
|
|
57
|
-
}),
|
|
58
|
-
];
|
|
59
|
-
const result = findPreferredDmConversationByUserId(entries, "user-target");
|
|
60
|
-
expect(result?.conversationId).toBe("dm-conv");
|
|
61
|
-
});
|
|
62
|
-
|
|
63
|
-
it("does NOT return a channel conversation for a user lookup (#54520)", () => {
|
|
64
|
-
// This is the core bug: user sends messages in both a DM and a channel.
|
|
65
|
-
// The channel conversation also carries the user's aadObjectId.
|
|
66
|
-
// findPreferredDmByUserId must NOT return the channel conversation.
|
|
67
|
-
const entries = [
|
|
68
|
-
entry({
|
|
69
|
-
conversationId: "19:channel@thread.tacv2",
|
|
70
|
-
aadObjectId: "aad-target",
|
|
71
|
-
conversationType: "channel",
|
|
72
|
-
lastSeenAt: "2026-03-25T21:00:00.000Z",
|
|
73
|
-
}),
|
|
74
|
-
];
|
|
75
|
-
const result = findPreferredDmConversationByUserId(entries, "aad-target");
|
|
76
|
-
expect(result).toBeNull();
|
|
77
|
-
});
|
|
78
|
-
|
|
79
|
-
it("does NOT return a groupChat conversation for a user lookup (#54520)", () => {
|
|
80
|
-
const entries = [
|
|
81
|
-
entry({
|
|
82
|
-
conversationId: "19:group@thread.tacv2",
|
|
83
|
-
aadObjectId: "aad-target",
|
|
84
|
-
conversationType: "groupChat",
|
|
85
|
-
lastSeenAt: "2026-03-25T21:00:00.000Z",
|
|
86
|
-
}),
|
|
87
|
-
];
|
|
88
|
-
const result = findPreferredDmConversationByUserId(entries, "aad-target");
|
|
89
|
-
expect(result).toBeNull();
|
|
90
|
-
});
|
|
91
|
-
|
|
92
|
-
it("prefers personal DM over channel even when channel is more recent (#54520)", () => {
|
|
93
|
-
// Reproduces the exact race: channel message arrives after DM, but the
|
|
94
|
-
// DM conversation should still be returned.
|
|
95
|
-
const entries = [
|
|
96
|
-
entry({
|
|
97
|
-
conversationId: "dm-conv",
|
|
98
|
-
aadObjectId: "aad-target",
|
|
99
|
-
conversationType: "personal",
|
|
100
|
-
lastSeenAt: "2026-03-25T20:00:00.000Z",
|
|
101
|
-
}),
|
|
102
|
-
entry({
|
|
103
|
-
conversationId: "19:channel@thread.tacv2",
|
|
104
|
-
aadObjectId: "aad-target",
|
|
105
|
-
conversationType: "channel",
|
|
106
|
-
lastSeenAt: "2026-03-25T21:00:00.000Z",
|
|
107
|
-
}),
|
|
108
|
-
];
|
|
109
|
-
const result = findPreferredDmConversationByUserId(entries, "aad-target");
|
|
110
|
-
expect(result?.conversationId).toBe("dm-conv");
|
|
111
|
-
});
|
|
112
|
-
|
|
113
|
-
it("prefers personal DM over groupChat even when groupChat is more recent", () => {
|
|
114
|
-
const entries = [
|
|
115
|
-
entry({
|
|
116
|
-
conversationId: "dm-conv",
|
|
117
|
-
aadObjectId: "aad-target",
|
|
118
|
-
conversationType: "personal",
|
|
119
|
-
lastSeenAt: "2026-03-25T20:00:00.000Z",
|
|
120
|
-
}),
|
|
121
|
-
entry({
|
|
122
|
-
conversationId: "19:group@thread.tacv2",
|
|
123
|
-
aadObjectId: "aad-target",
|
|
124
|
-
conversationType: "groupChat",
|
|
125
|
-
lastSeenAt: "2026-03-25T21:00:00.000Z",
|
|
126
|
-
}),
|
|
127
|
-
];
|
|
128
|
-
const result = findPreferredDmConversationByUserId(entries, "aad-target");
|
|
129
|
-
expect(result?.conversationId).toBe("dm-conv");
|
|
130
|
-
});
|
|
131
|
-
|
|
132
|
-
it("prefers the freshest personal DM when multiple exist", () => {
|
|
133
|
-
const entries = [
|
|
134
|
-
entry({
|
|
135
|
-
conversationId: "dm-old",
|
|
136
|
-
aadObjectId: "aad-target",
|
|
137
|
-
conversationType: "personal",
|
|
138
|
-
lastSeenAt: "2026-03-25T20:00:00.000Z",
|
|
139
|
-
}),
|
|
140
|
-
entry({
|
|
141
|
-
conversationId: "dm-new",
|
|
142
|
-
aadObjectId: "aad-target",
|
|
143
|
-
conversationType: "personal",
|
|
144
|
-
lastSeenAt: "2026-03-25T21:00:00.000Z",
|
|
145
|
-
}),
|
|
146
|
-
];
|
|
147
|
-
const result = findPreferredDmConversationByUserId(entries, "aad-target");
|
|
148
|
-
expect(result?.conversationId).toBe("dm-new");
|
|
149
|
-
});
|
|
150
|
-
|
|
151
|
-
it("falls back to unknown-type entries when no personal conversations exist", () => {
|
|
152
|
-
// Legacy entries without conversationType should still be usable as a
|
|
153
|
-
// fallback to avoid breaking existing deployments.
|
|
154
|
-
const entries = [
|
|
155
|
-
entry({
|
|
156
|
-
conversationId: "legacy-conv",
|
|
157
|
-
aadObjectId: "aad-target",
|
|
158
|
-
// No conversationType set (legacy entry)
|
|
159
|
-
}),
|
|
160
|
-
];
|
|
161
|
-
const result = findPreferredDmConversationByUserId(entries, "aad-target");
|
|
162
|
-
expect(result?.conversationId).toBe("legacy-conv");
|
|
163
|
-
});
|
|
164
|
-
|
|
165
|
-
it("prefers personal over unknown-type entries", () => {
|
|
166
|
-
const entries = [
|
|
167
|
-
entry({
|
|
168
|
-
conversationId: "legacy-conv",
|
|
169
|
-
aadObjectId: "aad-target",
|
|
170
|
-
lastSeenAt: "2026-03-25T21:00:00.000Z",
|
|
171
|
-
// No conversationType
|
|
172
|
-
}),
|
|
173
|
-
entry({
|
|
174
|
-
conversationId: "dm-conv",
|
|
175
|
-
aadObjectId: "aad-target",
|
|
176
|
-
conversationType: "personal",
|
|
177
|
-
lastSeenAt: "2026-03-25T20:00:00.000Z",
|
|
178
|
-
}),
|
|
179
|
-
];
|
|
180
|
-
const result = findPreferredDmConversationByUserId(entries, "aad-target");
|
|
181
|
-
expect(result?.conversationId).toBe("dm-conv");
|
|
182
|
-
});
|
|
183
|
-
|
|
184
|
-
it("does NOT fall back to channel/group when no personal or unknown entries exist", () => {
|
|
185
|
-
const entries = [
|
|
186
|
-
entry({
|
|
187
|
-
conversationId: "19:channel@thread.tacv2",
|
|
188
|
-
aadObjectId: "aad-target",
|
|
189
|
-
conversationType: "channel",
|
|
190
|
-
lastSeenAt: "2026-03-25T21:00:00.000Z",
|
|
191
|
-
}),
|
|
192
|
-
entry({
|
|
193
|
-
conversationId: "19:group@thread.tacv2",
|
|
194
|
-
aadObjectId: "aad-target",
|
|
195
|
-
conversationType: "groupChat",
|
|
196
|
-
lastSeenAt: "2026-03-25T20:00:00.000Z",
|
|
197
|
-
}),
|
|
198
|
-
];
|
|
199
|
-
const result = findPreferredDmConversationByUserId(entries, "aad-target");
|
|
200
|
-
expect(result).toBeNull();
|
|
201
|
-
});
|
|
202
|
-
});
|
|
@@ -1,105 +0,0 @@
|
|
|
1
|
-
import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/text-runtime";
|
|
2
|
-
import type {
|
|
3
|
-
MSTeamsConversationStoreEntry,
|
|
4
|
-
StoredConversationReference,
|
|
5
|
-
} from "./conversation-store.js";
|
|
6
|
-
|
|
7
|
-
export function normalizeStoredConversationId(raw: string): string {
|
|
8
|
-
return raw.split(";")[0] ?? raw;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
export function parseStoredConversationTimestamp(value: string | undefined): number | null {
|
|
12
|
-
if (!value) {
|
|
13
|
-
return null;
|
|
14
|
-
}
|
|
15
|
-
const parsed = Date.parse(value);
|
|
16
|
-
if (!Number.isFinite(parsed)) {
|
|
17
|
-
return null;
|
|
18
|
-
}
|
|
19
|
-
return parsed;
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
export function toConversationStoreEntries(
|
|
23
|
-
entries: Iterable<[string, StoredConversationReference]>,
|
|
24
|
-
): MSTeamsConversationStoreEntry[] {
|
|
25
|
-
return Array.from(entries, ([conversationId, reference]) => ({
|
|
26
|
-
conversationId,
|
|
27
|
-
reference,
|
|
28
|
-
}));
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
export function mergeStoredConversationReference(
|
|
32
|
-
existing: StoredConversationReference | undefined,
|
|
33
|
-
incoming: StoredConversationReference,
|
|
34
|
-
nowIso: string,
|
|
35
|
-
): StoredConversationReference {
|
|
36
|
-
return {
|
|
37
|
-
// Preserve fields from the previous entry that may not be present on every
|
|
38
|
-
// inbound activity. Without this, sparse activities (e.g. conversationUpdate,
|
|
39
|
-
// reactions) would clear previously captured values. Some fields are only
|
|
40
|
-
// populated opportunistically, such as timezone from clientInfo entities and
|
|
41
|
-
// graphChatId from Graph lookups used for DM media downloads.
|
|
42
|
-
...(existing?.timezone && !incoming.timezone ? { timezone: existing.timezone } : {}),
|
|
43
|
-
...(existing?.graphChatId && !incoming.graphChatId
|
|
44
|
-
? { graphChatId: existing.graphChatId }
|
|
45
|
-
: {}),
|
|
46
|
-
...(existing?.tenantId && !incoming.tenantId ? { tenantId: existing.tenantId } : {}),
|
|
47
|
-
...(existing?.aadObjectId && !incoming.aadObjectId
|
|
48
|
-
? { aadObjectId: existing.aadObjectId }
|
|
49
|
-
: {}),
|
|
50
|
-
...incoming,
|
|
51
|
-
lastSeenAt: nowIso,
|
|
52
|
-
};
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
export function findPreferredDmConversationByUserId(
|
|
56
|
-
entries: Iterable<MSTeamsConversationStoreEntry>,
|
|
57
|
-
id: string,
|
|
58
|
-
): MSTeamsConversationStoreEntry | null {
|
|
59
|
-
const target = id.trim();
|
|
60
|
-
if (!target) {
|
|
61
|
-
return null;
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
// Partition user matches into DM-safe and non-DM buckets.
|
|
65
|
-
// Channel and group conversations also carry the sender's aadObjectId, but
|
|
66
|
-
// returning one of those when the caller asked for a user-targeted DM would
|
|
67
|
-
// leak the reply into a shared channel -- the root cause of #54520.
|
|
68
|
-
const personalMatches: MSTeamsConversationStoreEntry[] = [];
|
|
69
|
-
const unknownTypeMatches: MSTeamsConversationStoreEntry[] = [];
|
|
70
|
-
for (const entry of entries) {
|
|
71
|
-
if (entry.reference.user?.aadObjectId !== target && entry.reference.user?.id !== target) {
|
|
72
|
-
continue;
|
|
73
|
-
}
|
|
74
|
-
const convType = normalizeLowercaseStringOrEmpty(
|
|
75
|
-
entry.reference.conversation?.conversationType ?? "",
|
|
76
|
-
);
|
|
77
|
-
if (convType === "personal") {
|
|
78
|
-
personalMatches.push(entry);
|
|
79
|
-
} else if (convType === "channel" || convType === "groupchat") {
|
|
80
|
-
// Explicitly skip channel/group conversations -- these must never be
|
|
81
|
-
// returned for a user-targeted DM lookup.
|
|
82
|
-
} else {
|
|
83
|
-
// Legacy entries without conversationType are ambiguous. Include them
|
|
84
|
-
// as a fallback but rank below confirmed personal conversations.
|
|
85
|
-
unknownTypeMatches.push(entry);
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
// Prefer confirmed personal DMs, fall back to unknown-type entries.
|
|
90
|
-
const candidates = personalMatches.length > 0 ? personalMatches : unknownTypeMatches;
|
|
91
|
-
if (candidates.length === 0) {
|
|
92
|
-
return null;
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
// When multiple candidates exist, prefer the most recently seen one.
|
|
96
|
-
if (candidates.length > 1) {
|
|
97
|
-
candidates.sort(
|
|
98
|
-
(a, b) =>
|
|
99
|
-
(parseStoredConversationTimestamp(b.reference.lastSeenAt) ?? 0) -
|
|
100
|
-
(parseStoredConversationTimestamp(a.reference.lastSeenAt) ?? 0),
|
|
101
|
-
);
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
return candidates[0] ?? null;
|
|
105
|
-
}
|
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
findPreferredDmConversationByUserId,
|
|
3
|
-
mergeStoredConversationReference,
|
|
4
|
-
normalizeStoredConversationId,
|
|
5
|
-
toConversationStoreEntries,
|
|
6
|
-
} from "./conversation-store-helpers.js";
|
|
7
|
-
import type {
|
|
8
|
-
MSTeamsConversationStore,
|
|
9
|
-
MSTeamsConversationStoreEntry,
|
|
10
|
-
StoredConversationReference,
|
|
11
|
-
} from "./conversation-store.js";
|
|
12
|
-
|
|
13
|
-
export function createMSTeamsConversationStoreMemory(
|
|
14
|
-
initial: MSTeamsConversationStoreEntry[] = [],
|
|
15
|
-
): MSTeamsConversationStore {
|
|
16
|
-
const map = new Map<string, StoredConversationReference>();
|
|
17
|
-
for (const { conversationId, reference } of initial) {
|
|
18
|
-
map.set(normalizeStoredConversationId(conversationId), reference);
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
const findPreferredDmByUserId = async (
|
|
22
|
-
id: string,
|
|
23
|
-
): Promise<MSTeamsConversationStoreEntry | null> => {
|
|
24
|
-
return findPreferredDmConversationByUserId(toConversationStoreEntries(map.entries()), id);
|
|
25
|
-
};
|
|
26
|
-
|
|
27
|
-
return {
|
|
28
|
-
upsert: async (conversationId, reference) => {
|
|
29
|
-
const normalizedId = normalizeStoredConversationId(conversationId);
|
|
30
|
-
map.set(
|
|
31
|
-
normalizedId,
|
|
32
|
-
mergeStoredConversationReference(
|
|
33
|
-
map.get(normalizedId),
|
|
34
|
-
reference,
|
|
35
|
-
new Date().toISOString(),
|
|
36
|
-
),
|
|
37
|
-
);
|
|
38
|
-
},
|
|
39
|
-
get: async (conversationId) => {
|
|
40
|
-
return map.get(normalizeStoredConversationId(conversationId)) ?? null;
|
|
41
|
-
},
|
|
42
|
-
list: async () => {
|
|
43
|
-
return toConversationStoreEntries(map.entries());
|
|
44
|
-
},
|
|
45
|
-
remove: async (conversationId) => {
|
|
46
|
-
return map.delete(normalizeStoredConversationId(conversationId));
|
|
47
|
-
},
|
|
48
|
-
findPreferredDmByUserId,
|
|
49
|
-
findByUserId: findPreferredDmByUserId,
|
|
50
|
-
};
|
|
51
|
-
}
|