@openclaw/feishu 2026.3.13 → 2026.5.2-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/api.ts +31 -0
- package/channel-entry.ts +20 -0
- package/channel-plugin-api.ts +1 -0
- package/contract-api.ts +16 -0
- package/index.ts +70 -53
- package/openclaw.plugin.json +1827 -4
- package/package.json +32 -7
- package/runtime-api.ts +55 -0
- package/secret-contract-api.ts +5 -0
- package/security-contract-api.ts +1 -0
- package/session-key-api.ts +1 -0
- package/setup-api.ts +3 -0
- package/setup-entry.test.ts +14 -0
- package/setup-entry.ts +13 -0
- package/src/accounts.test.ts +95 -7
- package/src/accounts.ts +199 -117
- package/src/app-registration.ts +331 -0
- package/src/approval-auth.test.ts +24 -0
- package/src/approval-auth.ts +25 -0
- package/src/async.test.ts +35 -0
- package/src/async.ts +43 -1
- package/src/audio-preflight.runtime.ts +9 -0
- package/src/bitable.test.ts +131 -0
- package/src/bitable.ts +59 -22
- package/src/bot-content.ts +474 -0
- package/src/bot-group-name.test.ts +108 -0
- package/src/bot-runtime-api.ts +12 -0
- package/src/bot-sender-name.ts +125 -0
- package/src/bot.broadcast.test.ts +463 -0
- package/src/bot.card-action.test.ts +519 -5
- package/src/bot.checkBotMentioned.test.ts +92 -20
- package/src/bot.helpers.test.ts +118 -0
- package/src/bot.stripBotMention.test.ts +13 -21
- package/src/bot.test.ts +1334 -401
- package/src/bot.ts +778 -775
- package/src/card-action.ts +408 -40
- package/src/card-interaction.test.ts +129 -0
- package/src/card-interaction.ts +159 -0
- package/src/card-test-helpers.ts +47 -0
- package/src/card-ux-approval.ts +65 -0
- package/src/card-ux-launcher.test.ts +99 -0
- package/src/card-ux-launcher.ts +121 -0
- package/src/card-ux-shared.ts +33 -0
- package/src/channel-runtime-api.ts +16 -0
- package/src/channel.runtime.ts +47 -0
- package/src/channel.test.ts +914 -3
- package/src/channel.ts +1253 -309
- package/src/chat-schema.ts +5 -4
- package/src/chat.test.ts +135 -28
- package/src/chat.ts +68 -10
- package/src/client.test.ts +212 -103
- package/src/client.ts +115 -21
- package/src/comment-dispatcher-runtime-api.ts +6 -0
- package/src/comment-dispatcher.test.ts +169 -0
- package/src/comment-dispatcher.ts +107 -0
- package/src/comment-handler-runtime-api.ts +3 -0
- package/src/comment-handler.test.ts +486 -0
- package/src/comment-handler.ts +309 -0
- package/src/comment-reaction.test.ts +166 -0
- package/src/comment-reaction.ts +259 -0
- package/src/comment-shared.test.ts +182 -0
- package/src/comment-shared.ts +406 -0
- package/src/comment-target.ts +44 -0
- package/src/config-schema.test.ts +63 -1
- package/src/config-schema.ts +31 -4
- package/src/conversation-id.test.ts +18 -0
- package/src/conversation-id.ts +199 -0
- package/src/dedup-runtime-api.ts +1 -0
- package/src/dedup.ts +33 -95
- package/src/directory.static.ts +61 -0
- package/src/directory.test.ts +116 -20
- package/src/directory.ts +60 -92
- package/src/doc-schema.ts +1 -1
- package/src/docx-batch-insert.test.ts +39 -38
- package/src/docx-batch-insert.ts +55 -19
- package/src/docx-color-text.ts +9 -4
- package/src/docx-table-ops.test.ts +53 -0
- package/src/docx-table-ops.ts +52 -34
- package/src/docx-types.ts +38 -0
- package/src/docx.account-selection.test.ts +12 -3
- package/src/docx.test.ts +314 -74
- package/src/docx.ts +278 -122
- package/src/drive-schema.ts +47 -1
- package/src/drive.test.ts +1219 -0
- package/src/drive.ts +614 -13
- package/src/dynamic-agent.ts +10 -4
- package/src/event-types.ts +45 -0
- package/src/external-keys.ts +1 -1
- package/src/lifecycle.test-support.ts +220 -0
- package/src/media.test.ts +403 -26
- package/src/media.ts +509 -132
- package/src/mention-target.types.ts +5 -0
- package/src/mention.ts +32 -51
- package/src/message-action-contract.ts +13 -0
- package/src/monitor-state-runtime-api.ts +7 -0
- package/src/monitor-transport-runtime-api.ts +7 -0
- package/src/monitor.account.ts +218 -312
- package/src/monitor.acp-init-failure.lifecycle.test-support.ts +219 -0
- package/src/monitor.bot-identity.ts +86 -0
- package/src/monitor.bot-menu-handler.ts +165 -0
- package/src/monitor.bot-menu.lifecycle.test-support.ts +224 -0
- package/src/monitor.bot-menu.test.ts +178 -0
- package/src/monitor.broadcast.reply-once.lifecycle.test-support.ts +264 -0
- package/src/monitor.card-action.lifecycle.test-support.ts +373 -0
- package/src/monitor.cleanup.test.ts +376 -0
- package/src/monitor.comment-notice-handler.ts +105 -0
- package/src/monitor.comment.test.ts +937 -0
- package/src/monitor.comment.ts +1386 -0
- package/src/monitor.lifecycle.test.ts +4 -0
- package/src/monitor.message-handler.ts +339 -0
- package/src/monitor.reaction.lifecycle.test-support.ts +68 -0
- package/src/monitor.reaction.test.ts +108 -48
- package/src/monitor.startup.test.ts +11 -9
- package/src/monitor.startup.ts +26 -16
- package/src/monitor.state.ts +20 -5
- package/src/monitor.synthetic-error.ts +18 -0
- package/src/monitor.test-mocks.ts +2 -2
- package/src/monitor.transport.ts +220 -60
- package/src/monitor.ts +15 -10
- package/src/monitor.webhook-e2e.test.ts +65 -7
- package/src/monitor.webhook-security.test.ts +122 -0
- package/src/monitor.webhook.test-helpers.ts +44 -26
- package/src/outbound-runtime-api.ts +1 -0
- package/src/outbound.test.ts +616 -37
- package/src/outbound.ts +623 -81
- package/src/perm-schema.ts +1 -1
- package/src/perm.ts +1 -7
- package/src/pins.ts +108 -0
- package/src/policy.test.ts +297 -117
- package/src/policy.ts +142 -29
- package/src/post.ts +7 -6
- package/src/probe.test.ts +14 -9
- package/src/probe.ts +26 -16
- package/src/processing-claims.ts +59 -0
- package/src/qr-terminal.ts +1 -0
- package/src/reactions.ts +4 -34
- package/src/reasoning-preview.test.ts +59 -0
- package/src/reasoning-preview.ts +20 -0
- package/src/reply-dispatcher-runtime-api.ts +7 -0
- package/src/reply-dispatcher.test.ts +660 -29
- package/src/reply-dispatcher.ts +407 -154
- package/src/runtime.ts +6 -3
- package/src/secret-contract.ts +145 -0
- package/src/secret-input.ts +1 -13
- package/src/security-audit-shared.ts +69 -0
- package/src/security-audit.test.ts +61 -0
- package/src/security-audit.ts +1 -0
- package/src/send-result.ts +1 -1
- package/src/send-target.test.ts +9 -3
- package/src/send-target.ts +10 -4
- package/src/send.reply-fallback.test.ts +105 -2
- package/src/send.test.ts +386 -4
- package/src/send.ts +414 -95
- package/src/sequential-key.test.ts +72 -0
- package/src/sequential-key.ts +28 -0
- package/src/sequential-queue.test.ts +92 -0
- package/src/sequential-queue.ts +16 -0
- package/src/session-conversation.ts +42 -0
- package/src/session-route.ts +48 -0
- package/src/setup-core.ts +51 -0
- package/src/{onboarding.test.ts → setup-surface.test.ts} +52 -21
- package/src/setup-surface.ts +581 -0
- package/src/streaming-card.test.ts +138 -2
- package/src/streaming-card.ts +134 -18
- package/src/subagent-hooks.test.ts +603 -0
- package/src/subagent-hooks.ts +397 -0
- package/src/targets.ts +3 -13
- package/src/test-support/lifecycle-test-support.ts +453 -0
- package/src/thread-bindings.test.ts +143 -0
- package/src/thread-bindings.ts +330 -0
- package/src/tool-account-routing.test.ts +66 -8
- package/src/tool-account.test.ts +44 -0
- package/src/tool-account.ts +40 -17
- package/src/tool-factory-test-harness.ts +11 -8
- package/src/tool-result.ts +3 -1
- package/src/tools-config.ts +1 -1
- package/src/types.ts +16 -15
- package/src/typing.ts +10 -6
- package/src/wiki-schema.ts +1 -1
- package/src/wiki.ts +1 -7
- package/subagent-hooks-api.ts +31 -0
- package/tsconfig.json +16 -0
- package/src/feishu-command-handler.ts +0 -59
- package/src/onboarding.status.test.ts +0 -25
- package/src/onboarding.ts +0 -489
- package/src/send-message.ts +0 -71
- package/src/targets.test.ts +0 -70
|
@@ -0,0 +1,330 @@
|
|
|
1
|
+
import type { OpenClawConfig } from "openclaw/plugin-sdk/config-types";
|
|
2
|
+
import {
|
|
3
|
+
resolveThreadBindingIdleTimeoutMsForChannel,
|
|
4
|
+
resolveThreadBindingMaxAgeMsForChannel,
|
|
5
|
+
registerSessionBindingAdapter,
|
|
6
|
+
resolveThreadBindingConversationIdFromBindingId,
|
|
7
|
+
unregisterSessionBindingAdapter,
|
|
8
|
+
type BindingTargetKind,
|
|
9
|
+
type SessionBindingAdapter,
|
|
10
|
+
type SessionBindingRecord,
|
|
11
|
+
} from "openclaw/plugin-sdk/conversation-runtime";
|
|
12
|
+
import { normalizeAccountId, resolveAgentIdFromSessionKey } from "openclaw/plugin-sdk/routing";
|
|
13
|
+
import { normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
|
|
14
|
+
|
|
15
|
+
type FeishuBindingTargetKind = "subagent" | "acp";
|
|
16
|
+
|
|
17
|
+
type FeishuThreadBindingRecord = {
|
|
18
|
+
accountId: string;
|
|
19
|
+
conversationId: string;
|
|
20
|
+
parentConversationId?: string;
|
|
21
|
+
deliveryTo?: string;
|
|
22
|
+
deliveryThreadId?: string;
|
|
23
|
+
targetKind: FeishuBindingTargetKind;
|
|
24
|
+
targetSessionKey: string;
|
|
25
|
+
agentId?: string;
|
|
26
|
+
label?: string;
|
|
27
|
+
boundBy?: string;
|
|
28
|
+
boundAt: number;
|
|
29
|
+
lastActivityAt: number;
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
type FeishuThreadBindingManager = {
|
|
33
|
+
accountId: string;
|
|
34
|
+
getByConversationId: (conversationId: string) => FeishuThreadBindingRecord | undefined;
|
|
35
|
+
listBySessionKey: (targetSessionKey: string) => FeishuThreadBindingRecord[];
|
|
36
|
+
bindConversation: (params: {
|
|
37
|
+
conversationId: string;
|
|
38
|
+
parentConversationId?: string;
|
|
39
|
+
targetKind: BindingTargetKind;
|
|
40
|
+
targetSessionKey: string;
|
|
41
|
+
metadata?: Record<string, unknown>;
|
|
42
|
+
}) => FeishuThreadBindingRecord | null;
|
|
43
|
+
touchConversation: (conversationId: string, at?: number) => FeishuThreadBindingRecord | null;
|
|
44
|
+
unbindConversation: (conversationId: string) => FeishuThreadBindingRecord | null;
|
|
45
|
+
unbindBySessionKey: (targetSessionKey: string) => FeishuThreadBindingRecord[];
|
|
46
|
+
stop: () => void;
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
type FeishuThreadBindingsState = {
|
|
50
|
+
managersByAccountId: Map<string, FeishuThreadBindingManager>;
|
|
51
|
+
bindingsByAccountConversation: Map<string, FeishuThreadBindingRecord>;
|
|
52
|
+
};
|
|
53
|
+
|
|
54
|
+
const FEISHU_THREAD_BINDINGS_STATE_KEY = Symbol.for("openclaw.feishuThreadBindingsState");
|
|
55
|
+
let state: FeishuThreadBindingsState | undefined;
|
|
56
|
+
|
|
57
|
+
function getState(): FeishuThreadBindingsState {
|
|
58
|
+
if (!state) {
|
|
59
|
+
const globalStore = globalThis as Record<PropertyKey, unknown>;
|
|
60
|
+
state = (globalStore[FEISHU_THREAD_BINDINGS_STATE_KEY] as
|
|
61
|
+
| FeishuThreadBindingsState
|
|
62
|
+
| undefined) ?? {
|
|
63
|
+
managersByAccountId: new Map(),
|
|
64
|
+
bindingsByAccountConversation: new Map(),
|
|
65
|
+
};
|
|
66
|
+
globalStore[FEISHU_THREAD_BINDINGS_STATE_KEY] = state;
|
|
67
|
+
}
|
|
68
|
+
return state;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
function resolveBindingKey(params: { accountId: string; conversationId: string }): string {
|
|
72
|
+
return `${params.accountId}:${params.conversationId}`;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
function toSessionBindingTargetKind(raw: FeishuBindingTargetKind): BindingTargetKind {
|
|
76
|
+
return raw === "subagent" ? "subagent" : "session";
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
function toFeishuTargetKind(raw: BindingTargetKind): FeishuBindingTargetKind {
|
|
80
|
+
return raw === "subagent" ? "subagent" : "acp";
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
function toSessionBindingRecord(
|
|
84
|
+
record: FeishuThreadBindingRecord,
|
|
85
|
+
defaults: { idleTimeoutMs: number; maxAgeMs: number },
|
|
86
|
+
): SessionBindingRecord {
|
|
87
|
+
const idleExpiresAt =
|
|
88
|
+
defaults.idleTimeoutMs > 0 ? record.lastActivityAt + defaults.idleTimeoutMs : undefined;
|
|
89
|
+
const maxAgeExpiresAt = defaults.maxAgeMs > 0 ? record.boundAt + defaults.maxAgeMs : undefined;
|
|
90
|
+
const expiresAt =
|
|
91
|
+
idleExpiresAt != null && maxAgeExpiresAt != null
|
|
92
|
+
? Math.min(idleExpiresAt, maxAgeExpiresAt)
|
|
93
|
+
: (idleExpiresAt ?? maxAgeExpiresAt);
|
|
94
|
+
return {
|
|
95
|
+
bindingId: resolveBindingKey({
|
|
96
|
+
accountId: record.accountId,
|
|
97
|
+
conversationId: record.conversationId,
|
|
98
|
+
}),
|
|
99
|
+
targetSessionKey: record.targetSessionKey,
|
|
100
|
+
targetKind: toSessionBindingTargetKind(record.targetKind),
|
|
101
|
+
conversation: {
|
|
102
|
+
channel: "feishu",
|
|
103
|
+
accountId: record.accountId,
|
|
104
|
+
conversationId: record.conversationId,
|
|
105
|
+
parentConversationId: record.parentConversationId,
|
|
106
|
+
},
|
|
107
|
+
status: "active",
|
|
108
|
+
boundAt: record.boundAt,
|
|
109
|
+
expiresAt,
|
|
110
|
+
metadata: {
|
|
111
|
+
agentId: record.agentId,
|
|
112
|
+
label: record.label,
|
|
113
|
+
boundBy: record.boundBy,
|
|
114
|
+
deliveryTo: record.deliveryTo,
|
|
115
|
+
deliveryThreadId: record.deliveryThreadId,
|
|
116
|
+
lastActivityAt: record.lastActivityAt,
|
|
117
|
+
idleTimeoutMs: defaults.idleTimeoutMs,
|
|
118
|
+
maxAgeMs: defaults.maxAgeMs,
|
|
119
|
+
},
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
export function createFeishuThreadBindingManager(params: {
|
|
124
|
+
accountId?: string;
|
|
125
|
+
cfg: OpenClawConfig;
|
|
126
|
+
}): FeishuThreadBindingManager {
|
|
127
|
+
const accountId = normalizeAccountId(params.accountId);
|
|
128
|
+
const existing = getState().managersByAccountId.get(accountId);
|
|
129
|
+
if (existing) {
|
|
130
|
+
return existing;
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
const idleTimeoutMs = resolveThreadBindingIdleTimeoutMsForChannel({
|
|
134
|
+
cfg: params.cfg,
|
|
135
|
+
channel: "feishu",
|
|
136
|
+
accountId,
|
|
137
|
+
});
|
|
138
|
+
const maxAgeMs = resolveThreadBindingMaxAgeMsForChannel({
|
|
139
|
+
cfg: params.cfg,
|
|
140
|
+
channel: "feishu",
|
|
141
|
+
accountId,
|
|
142
|
+
});
|
|
143
|
+
|
|
144
|
+
const manager: FeishuThreadBindingManager = {
|
|
145
|
+
accountId,
|
|
146
|
+
getByConversationId: (conversationId) =>
|
|
147
|
+
getState().bindingsByAccountConversation.get(
|
|
148
|
+
resolveBindingKey({ accountId, conversationId }),
|
|
149
|
+
),
|
|
150
|
+
listBySessionKey: (targetSessionKey) =>
|
|
151
|
+
[...getState().bindingsByAccountConversation.values()].filter(
|
|
152
|
+
(record) => record.accountId === accountId && record.targetSessionKey === targetSessionKey,
|
|
153
|
+
),
|
|
154
|
+
bindConversation: ({
|
|
155
|
+
conversationId,
|
|
156
|
+
parentConversationId,
|
|
157
|
+
targetKind,
|
|
158
|
+
targetSessionKey,
|
|
159
|
+
metadata,
|
|
160
|
+
}) => {
|
|
161
|
+
const normalizedConversationId = conversationId.trim();
|
|
162
|
+
const normalizedTargetSessionKey = targetSessionKey.trim();
|
|
163
|
+
if (!normalizedConversationId || !normalizedTargetSessionKey) {
|
|
164
|
+
return null;
|
|
165
|
+
}
|
|
166
|
+
const existing = getState().bindingsByAccountConversation.get(
|
|
167
|
+
resolveBindingKey({ accountId, conversationId: normalizedConversationId }),
|
|
168
|
+
);
|
|
169
|
+
const now = Date.now();
|
|
170
|
+
const record: FeishuThreadBindingRecord = {
|
|
171
|
+
accountId,
|
|
172
|
+
conversationId: normalizedConversationId,
|
|
173
|
+
parentConversationId:
|
|
174
|
+
normalizeOptionalString(parentConversationId) ?? existing?.parentConversationId,
|
|
175
|
+
deliveryTo:
|
|
176
|
+
typeof metadata?.deliveryTo === "string" && metadata.deliveryTo.trim()
|
|
177
|
+
? metadata.deliveryTo.trim()
|
|
178
|
+
: existing?.deliveryTo,
|
|
179
|
+
deliveryThreadId:
|
|
180
|
+
typeof metadata?.deliveryThreadId === "string" && metadata.deliveryThreadId.trim()
|
|
181
|
+
? metadata.deliveryThreadId.trim()
|
|
182
|
+
: existing?.deliveryThreadId,
|
|
183
|
+
targetKind: toFeishuTargetKind(targetKind),
|
|
184
|
+
targetSessionKey: normalizedTargetSessionKey,
|
|
185
|
+
agentId:
|
|
186
|
+
typeof metadata?.agentId === "string" && metadata.agentId.trim()
|
|
187
|
+
? metadata.agentId.trim()
|
|
188
|
+
: (existing?.agentId ?? resolveAgentIdFromSessionKey(normalizedTargetSessionKey)),
|
|
189
|
+
label:
|
|
190
|
+
typeof metadata?.label === "string" && metadata.label.trim()
|
|
191
|
+
? metadata.label.trim()
|
|
192
|
+
: existing?.label,
|
|
193
|
+
boundBy:
|
|
194
|
+
typeof metadata?.boundBy === "string" && metadata.boundBy.trim()
|
|
195
|
+
? metadata.boundBy.trim()
|
|
196
|
+
: existing?.boundBy,
|
|
197
|
+
boundAt: now,
|
|
198
|
+
lastActivityAt: now,
|
|
199
|
+
};
|
|
200
|
+
getState().bindingsByAccountConversation.set(
|
|
201
|
+
resolveBindingKey({ accountId, conversationId: normalizedConversationId }),
|
|
202
|
+
record,
|
|
203
|
+
);
|
|
204
|
+
return record;
|
|
205
|
+
},
|
|
206
|
+
touchConversation: (conversationId, at = Date.now()) => {
|
|
207
|
+
const key = resolveBindingKey({ accountId, conversationId });
|
|
208
|
+
const existingRecord = getState().bindingsByAccountConversation.get(key);
|
|
209
|
+
if (!existingRecord) {
|
|
210
|
+
return null;
|
|
211
|
+
}
|
|
212
|
+
const updated = { ...existingRecord, lastActivityAt: at };
|
|
213
|
+
getState().bindingsByAccountConversation.set(key, updated);
|
|
214
|
+
return updated;
|
|
215
|
+
},
|
|
216
|
+
unbindConversation: (conversationId) => {
|
|
217
|
+
const key = resolveBindingKey({ accountId, conversationId });
|
|
218
|
+
const existingRecord = getState().bindingsByAccountConversation.get(key);
|
|
219
|
+
if (!existingRecord) {
|
|
220
|
+
return null;
|
|
221
|
+
}
|
|
222
|
+
getState().bindingsByAccountConversation.delete(key);
|
|
223
|
+
return existingRecord;
|
|
224
|
+
},
|
|
225
|
+
unbindBySessionKey: (targetSessionKey) => {
|
|
226
|
+
const removed: FeishuThreadBindingRecord[] = [];
|
|
227
|
+
for (const record of getState().bindingsByAccountConversation.values()) {
|
|
228
|
+
if (record.accountId !== accountId || record.targetSessionKey !== targetSessionKey) {
|
|
229
|
+
continue;
|
|
230
|
+
}
|
|
231
|
+
getState().bindingsByAccountConversation.delete(
|
|
232
|
+
resolveBindingKey({ accountId, conversationId: record.conversationId }),
|
|
233
|
+
);
|
|
234
|
+
removed.push(record);
|
|
235
|
+
}
|
|
236
|
+
return removed;
|
|
237
|
+
},
|
|
238
|
+
stop: () => {
|
|
239
|
+
for (const key of getState().bindingsByAccountConversation.keys()) {
|
|
240
|
+
if (key.startsWith(`${accountId}:`)) {
|
|
241
|
+
getState().bindingsByAccountConversation.delete(key);
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
getState().managersByAccountId.delete(accountId);
|
|
245
|
+
unregisterSessionBindingAdapter({
|
|
246
|
+
channel: "feishu",
|
|
247
|
+
accountId,
|
|
248
|
+
adapter: sessionBindingAdapter,
|
|
249
|
+
});
|
|
250
|
+
},
|
|
251
|
+
};
|
|
252
|
+
|
|
253
|
+
const sessionBindingAdapter: SessionBindingAdapter = {
|
|
254
|
+
channel: "feishu",
|
|
255
|
+
accountId,
|
|
256
|
+
capabilities: {
|
|
257
|
+
placements: ["current"],
|
|
258
|
+
},
|
|
259
|
+
bind: async (input) => {
|
|
260
|
+
if (input.conversation.channel !== "feishu" || input.placement === "child") {
|
|
261
|
+
return null;
|
|
262
|
+
}
|
|
263
|
+
const bound = manager.bindConversation({
|
|
264
|
+
conversationId: input.conversation.conversationId,
|
|
265
|
+
parentConversationId: input.conversation.parentConversationId,
|
|
266
|
+
targetKind: input.targetKind,
|
|
267
|
+
targetSessionKey: input.targetSessionKey,
|
|
268
|
+
metadata: input.metadata,
|
|
269
|
+
});
|
|
270
|
+
return bound ? toSessionBindingRecord(bound, { idleTimeoutMs, maxAgeMs }) : null;
|
|
271
|
+
},
|
|
272
|
+
listBySession: (targetSessionKey) =>
|
|
273
|
+
manager
|
|
274
|
+
.listBySessionKey(targetSessionKey)
|
|
275
|
+
.map((entry) => toSessionBindingRecord(entry, { idleTimeoutMs, maxAgeMs })),
|
|
276
|
+
resolveByConversation: (ref) => {
|
|
277
|
+
if (ref.channel !== "feishu") {
|
|
278
|
+
return null;
|
|
279
|
+
}
|
|
280
|
+
const found = manager.getByConversationId(ref.conversationId);
|
|
281
|
+
return found ? toSessionBindingRecord(found, { idleTimeoutMs, maxAgeMs }) : null;
|
|
282
|
+
},
|
|
283
|
+
touch: (bindingId, at) => {
|
|
284
|
+
const conversationId = resolveThreadBindingConversationIdFromBindingId({
|
|
285
|
+
accountId,
|
|
286
|
+
bindingId,
|
|
287
|
+
});
|
|
288
|
+
if (conversationId) {
|
|
289
|
+
manager.touchConversation(conversationId, at);
|
|
290
|
+
}
|
|
291
|
+
},
|
|
292
|
+
unbind: async (input) => {
|
|
293
|
+
if (input.targetSessionKey?.trim()) {
|
|
294
|
+
return manager
|
|
295
|
+
.unbindBySessionKey(input.targetSessionKey.trim())
|
|
296
|
+
.map((entry) => toSessionBindingRecord(entry, { idleTimeoutMs, maxAgeMs }));
|
|
297
|
+
}
|
|
298
|
+
const conversationId = resolveThreadBindingConversationIdFromBindingId({
|
|
299
|
+
accountId,
|
|
300
|
+
bindingId: input.bindingId,
|
|
301
|
+
});
|
|
302
|
+
if (!conversationId) {
|
|
303
|
+
return [];
|
|
304
|
+
}
|
|
305
|
+
const removed = manager.unbindConversation(conversationId);
|
|
306
|
+
return removed ? [toSessionBindingRecord(removed, { idleTimeoutMs, maxAgeMs })] : [];
|
|
307
|
+
},
|
|
308
|
+
};
|
|
309
|
+
|
|
310
|
+
registerSessionBindingAdapter(sessionBindingAdapter);
|
|
311
|
+
|
|
312
|
+
getState().managersByAccountId.set(accountId, manager);
|
|
313
|
+
return manager;
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
export function getFeishuThreadBindingManager(
|
|
317
|
+
accountId?: string,
|
|
318
|
+
): FeishuThreadBindingManager | null {
|
|
319
|
+
return getState().managersByAccountId.get(normalizeAccountId(accountId)) ?? null;
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
export const __testing = {
|
|
323
|
+
resetFeishuThreadBindingsForTests() {
|
|
324
|
+
for (const manager of getState().managersByAccountId.values()) {
|
|
325
|
+
manager.stop();
|
|
326
|
+
}
|
|
327
|
+
getState().managersByAccountId.clear();
|
|
328
|
+
getState().bindingsByAccountConversation.clear();
|
|
329
|
+
},
|
|
330
|
+
};
|
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import { registerFeishuBitableTools } from "./bitable.js";
|
|
4
|
-
import { registerFeishuDriveTools } from "./drive.js";
|
|
5
|
-
import { registerFeishuPermTools } from "./perm.js";
|
|
1
|
+
import { beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
|
|
2
|
+
import type { OpenClawPluginApi } from "../runtime-api.js";
|
|
6
3
|
import { createToolFactoryHarness } from "./tool-factory-test-harness.js";
|
|
7
|
-
import { registerFeishuWikiTools } from "./wiki.js";
|
|
8
4
|
|
|
9
5
|
const createFeishuClientMock = vi.fn((account: { appId?: string } | undefined) => ({
|
|
10
6
|
__appId: account?.appId,
|
|
@@ -14,6 +10,11 @@ vi.mock("./client.js", () => ({
|
|
|
14
10
|
createFeishuClient: (account: { appId?: string } | undefined) => createFeishuClientMock(account),
|
|
15
11
|
}));
|
|
16
12
|
|
|
13
|
+
let registerFeishuBitableTools: typeof import("./bitable.js").registerFeishuBitableTools;
|
|
14
|
+
let registerFeishuDriveTools: typeof import("./drive.js").registerFeishuDriveTools;
|
|
15
|
+
let registerFeishuPermTools: typeof import("./perm.js").registerFeishuPermTools;
|
|
16
|
+
let registerFeishuWikiTools: typeof import("./wiki.js").registerFeishuWikiTools;
|
|
17
|
+
|
|
17
18
|
function createConfig(params: {
|
|
18
19
|
toolsA?: {
|
|
19
20
|
wiki?: boolean;
|
|
@@ -50,6 +51,17 @@ function createConfig(params: {
|
|
|
50
51
|
}
|
|
51
52
|
|
|
52
53
|
describe("feishu tool account routing", () => {
|
|
54
|
+
beforeAll(async () => {
|
|
55
|
+
({ registerFeishuBitableTools, registerFeishuDriveTools, registerFeishuPermTools } =
|
|
56
|
+
await import("./bitable.js").then(async ({ registerFeishuBitableTools }) => ({
|
|
57
|
+
registerFeishuBitableTools,
|
|
58
|
+
...(await import("./drive.js")),
|
|
59
|
+
...(await import("./perm.js")),
|
|
60
|
+
...(await import("./wiki.js")),
|
|
61
|
+
})));
|
|
62
|
+
({ registerFeishuWikiTools } = await import("./wiki.js"));
|
|
63
|
+
});
|
|
64
|
+
|
|
53
65
|
beforeEach(() => {
|
|
54
66
|
vi.clearAllMocks();
|
|
55
67
|
});
|
|
@@ -69,7 +81,7 @@ describe("feishu tool account routing", () => {
|
|
|
69
81
|
expect(createFeishuClientMock.mock.calls.at(-1)?.[0]?.appId).toBe("app-b");
|
|
70
82
|
});
|
|
71
83
|
|
|
72
|
-
test("wiki tool prefers
|
|
84
|
+
test("wiki tool prefers the active contextual account over configured defaultAccount", async () => {
|
|
73
85
|
const { api, resolveTool } = createToolFactoryHarness(
|
|
74
86
|
createConfig({
|
|
75
87
|
defaultAccount: "b",
|
|
@@ -82,7 +94,7 @@ describe("feishu tool account routing", () => {
|
|
|
82
94
|
const tool = resolveTool("feishu_wiki", { agentAccountId: "a" });
|
|
83
95
|
await tool.execute("call", { action: "search" });
|
|
84
96
|
|
|
85
|
-
expect(createFeishuClientMock.mock.calls.at(-1)?.[0]?.appId).toBe("app-
|
|
97
|
+
expect(createFeishuClientMock.mock.calls.at(-1)?.[0]?.appId).toBe("app-a");
|
|
86
98
|
});
|
|
87
99
|
|
|
88
100
|
test("drive tool registers when first account disables it and routes to agentAccountId", async () => {
|
|
@@ -126,4 +138,50 @@ describe("feishu tool account routing", () => {
|
|
|
126
138
|
expect(createFeishuClientMock.mock.calls[0]?.[0]?.appId).toBe("app-b");
|
|
127
139
|
expect(createFeishuClientMock.mock.calls[1]?.[0]?.appId).toBe("app-a");
|
|
128
140
|
});
|
|
141
|
+
|
|
142
|
+
test("falls back to the configured Feishu default selection when agentAccountId is not a real account", async () => {
|
|
143
|
+
const { api, resolveTool } = createToolFactoryHarness(
|
|
144
|
+
createConfig({
|
|
145
|
+
toolsA: { wiki: true },
|
|
146
|
+
toolsB: { wiki: true },
|
|
147
|
+
}),
|
|
148
|
+
);
|
|
149
|
+
registerFeishuWikiTools(api);
|
|
150
|
+
|
|
151
|
+
const tool = resolveTool("feishu_wiki", { agentAccountId: "agent-spawner" });
|
|
152
|
+
await tool.execute("call", { action: "search" });
|
|
153
|
+
|
|
154
|
+
expect(createFeishuClientMock.mock.calls.at(-1)?.[0]?.appId).toBe("app-a");
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
test("does not silently fall back when the contextual account is real but uses non-env SecretRefs", async () => {
|
|
158
|
+
const { api, resolveTool } = createToolFactoryHarness({
|
|
159
|
+
channels: {
|
|
160
|
+
feishu: {
|
|
161
|
+
enabled: true,
|
|
162
|
+
accounts: {
|
|
163
|
+
a: {
|
|
164
|
+
appId: "app-a",
|
|
165
|
+
appSecret: "sec-a", // pragma: allowlist secret
|
|
166
|
+
tools: { wiki: true },
|
|
167
|
+
},
|
|
168
|
+
b: {
|
|
169
|
+
appId: "app-b",
|
|
170
|
+
appSecret: { source: "file", provider: "default", id: "feishu/b-secret" },
|
|
171
|
+
tools: { wiki: true },
|
|
172
|
+
} as never,
|
|
173
|
+
},
|
|
174
|
+
},
|
|
175
|
+
},
|
|
176
|
+
} as OpenClawPluginApi["config"]);
|
|
177
|
+
registerFeishuWikiTools(api);
|
|
178
|
+
|
|
179
|
+
const tool = resolveTool("feishu_wiki", { agentAccountId: "b" });
|
|
180
|
+
const result = await tool.execute("call", { action: "search" });
|
|
181
|
+
|
|
182
|
+
expect(createFeishuClientMock).not.toHaveBeenCalled();
|
|
183
|
+
expect(typeof result.details.error === "string" ? result.details.error : "").toContain(
|
|
184
|
+
"Resolve this command against an active gateway runtime snapshot before reading it.",
|
|
185
|
+
);
|
|
186
|
+
});
|
|
129
187
|
});
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { resolveFeishuToolAccount } from "./tool-account.js";
|
|
3
|
+
|
|
4
|
+
describe("resolveFeishuToolAccount", () => {
|
|
5
|
+
const cfg = {
|
|
6
|
+
channels: {
|
|
7
|
+
feishu: {
|
|
8
|
+
enabled: true,
|
|
9
|
+
defaultAccount: "ops",
|
|
10
|
+
appId: "base-app-id",
|
|
11
|
+
appSecret: "base-app-secret", // pragma: allowlist secret
|
|
12
|
+
accounts: {
|
|
13
|
+
ops: {
|
|
14
|
+
enabled: true,
|
|
15
|
+
appId: "ops-app-id",
|
|
16
|
+
appSecret: "ops-app-secret", // pragma: allowlist secret
|
|
17
|
+
},
|
|
18
|
+
work: {
|
|
19
|
+
enabled: true,
|
|
20
|
+
appId: "work-app-id",
|
|
21
|
+
appSecret: "work-app-secret", // pragma: allowlist secret
|
|
22
|
+
},
|
|
23
|
+
},
|
|
24
|
+
},
|
|
25
|
+
},
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
it("prefers the active contextual account over configured defaultAccount", () => {
|
|
29
|
+
const resolved = resolveFeishuToolAccount({
|
|
30
|
+
api: { config: cfg },
|
|
31
|
+
defaultAccountId: "work",
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
expect(resolved.accountId).toBe("work");
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
it("falls back to configured defaultAccount when there is no contextual account", () => {
|
|
38
|
+
const resolved = resolveFeishuToolAccount({
|
|
39
|
+
api: { config: cfg },
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
expect(resolved.accountId).toBe("ops");
|
|
43
|
+
});
|
|
44
|
+
});
|
package/src/tool-account.ts
CHANGED
|
@@ -1,24 +1,50 @@
|
|
|
1
1
|
import type * as Lark from "@larksuiteoapi/node-sdk";
|
|
2
|
-
import
|
|
3
|
-
import {
|
|
2
|
+
import { normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
|
|
3
|
+
import type { OpenClawPluginApi } from "../runtime-api.js";
|
|
4
|
+
import {
|
|
5
|
+
listFeishuAccountIds,
|
|
6
|
+
resolveFeishuAccount,
|
|
7
|
+
resolveFeishuRuntimeAccount,
|
|
8
|
+
} from "./accounts.js";
|
|
4
9
|
import { createFeishuClient } from "./client.js";
|
|
5
10
|
import { resolveToolsConfig } from "./tools-config.js";
|
|
6
11
|
import type { FeishuToolsConfig, ResolvedFeishuAccount } from "./types.js";
|
|
7
12
|
|
|
8
13
|
type AccountAwareParams = { accountId?: string };
|
|
9
14
|
|
|
10
|
-
function
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
15
|
+
function resolveImplicitToolAccountId(params: {
|
|
16
|
+
api: Pick<OpenClawPluginApi, "config">;
|
|
17
|
+
executeParams?: AccountAwareParams;
|
|
18
|
+
defaultAccountId?: string;
|
|
19
|
+
}): string | undefined {
|
|
20
|
+
const explicitAccountId = normalizeOptionalString(params.executeParams?.accountId);
|
|
21
|
+
if (explicitAccountId) {
|
|
22
|
+
return explicitAccountId;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
const contextualAccountId = normalizeOptionalString(params.defaultAccountId);
|
|
26
|
+
if (
|
|
27
|
+
contextualAccountId &&
|
|
28
|
+
listFeishuAccountIds(params.api.config).includes(contextualAccountId)
|
|
29
|
+
) {
|
|
30
|
+
const contextualAccount = resolveFeishuAccount({
|
|
31
|
+
cfg: params.api.config,
|
|
32
|
+
accountId: contextualAccountId,
|
|
33
|
+
});
|
|
34
|
+
if (contextualAccount.enabled) {
|
|
35
|
+
return contextualAccountId;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
14
38
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
39
|
+
const configuredDefaultAccountId = normalizeOptionalString(
|
|
40
|
+
(params.api.config?.channels?.feishu as { defaultAccount?: unknown } | undefined)
|
|
41
|
+
?.defaultAccount,
|
|
42
|
+
);
|
|
43
|
+
if (configuredDefaultAccountId) {
|
|
44
|
+
return configuredDefaultAccountId;
|
|
20
45
|
}
|
|
21
|
-
|
|
46
|
+
|
|
47
|
+
return undefined;
|
|
22
48
|
}
|
|
23
49
|
|
|
24
50
|
export function resolveFeishuToolAccount(params: {
|
|
@@ -29,12 +55,9 @@ export function resolveFeishuToolAccount(params: {
|
|
|
29
55
|
if (!params.api.config) {
|
|
30
56
|
throw new Error("Feishu config unavailable");
|
|
31
57
|
}
|
|
32
|
-
return
|
|
58
|
+
return resolveFeishuRuntimeAccount({
|
|
33
59
|
cfg: params.api.config,
|
|
34
|
-
accountId:
|
|
35
|
-
normalizeOptionalAccountId(params.executeParams?.accountId) ??
|
|
36
|
-
readConfiguredDefaultAccountId(params.api.config) ??
|
|
37
|
-
normalizeOptionalAccountId(params.defaultAccountId),
|
|
60
|
+
accountId: resolveImplicitToolAccountId(params),
|
|
38
61
|
});
|
|
39
62
|
}
|
|
40
63
|
|
|
@@ -1,27 +1,30 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { OpenClawPluginApi } from "../runtime-api.js";
|
|
2
2
|
|
|
3
3
|
type ToolContextLike = {
|
|
4
4
|
agentAccountId?: string;
|
|
5
5
|
};
|
|
6
6
|
|
|
7
|
-
type ToolFactoryLike = (ctx: ToolContextLike) => AnyAgentTool | AnyAgentTool[] | null | undefined;
|
|
8
|
-
|
|
9
7
|
export type ToolLike = {
|
|
10
8
|
name: string;
|
|
11
|
-
execute: (
|
|
9
|
+
execute: (
|
|
10
|
+
toolCallId: string,
|
|
11
|
+
params: unknown,
|
|
12
|
+
) => Promise<{ details: Record<string, unknown> }> | { details: Record<string, unknown> };
|
|
12
13
|
};
|
|
13
14
|
|
|
14
15
|
type RegisteredTool = {
|
|
15
|
-
tool:
|
|
16
|
+
tool: unknown;
|
|
16
17
|
opts?: { name?: string };
|
|
17
18
|
};
|
|
18
19
|
|
|
19
|
-
function toToolList(value:
|
|
20
|
-
if (!value)
|
|
20
|
+
function toToolList(value: unknown): unknown[] {
|
|
21
|
+
if (!value) {
|
|
22
|
+
return [];
|
|
23
|
+
}
|
|
21
24
|
return Array.isArray(value) ? value : [value];
|
|
22
25
|
}
|
|
23
26
|
|
|
24
|
-
function asToolLike(tool:
|
|
27
|
+
function asToolLike(tool: unknown, fallbackName?: string): ToolLike {
|
|
25
28
|
const candidate = tool as Partial<ToolLike>;
|
|
26
29
|
const name = candidate.name ?? fallbackName;
|
|
27
30
|
const execute = candidate.execute;
|
package/src/tool-result.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
|
|
2
|
+
|
|
1
3
|
export function jsonToolResult(data: unknown) {
|
|
2
4
|
return {
|
|
3
5
|
content: [{ type: "text" as const, text: JSON.stringify(data, null, 2) }],
|
|
@@ -10,5 +12,5 @@ export function unknownToolActionResult(action: unknown) {
|
|
|
10
12
|
}
|
|
11
13
|
|
|
12
14
|
export function toolExecutionErrorResult(error: unknown) {
|
|
13
|
-
return jsonToolResult({ error:
|
|
15
|
+
return jsonToolResult({ error: formatErrorMessage(error) });
|
|
14
16
|
}
|
package/src/tools-config.ts
CHANGED
|
@@ -5,7 +5,7 @@ import type { FeishuToolsConfig } from "./types.js";
|
|
|
5
5
|
* - doc, chat, wiki, drive, scopes: enabled by default
|
|
6
6
|
* - perm: disabled by default (sensitive operation)
|
|
7
7
|
*/
|
|
8
|
-
|
|
8
|
+
const DEFAULT_TOOLS_CONFIG: Required<FeishuToolsConfig> = {
|
|
9
9
|
doc: true,
|
|
10
10
|
chat: true,
|
|
11
11
|
wiki: true,
|