@copilotkit/channels-discord 0.11.1 → 0.13.0-rc.0

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/README.md CHANGED
@@ -10,7 +10,7 @@ You write your UI as JSX once (`@copilotkit/channels-ui`) and drive the bot with
10
10
 
11
11
  The adapter keeps its own Discord credentials (`botToken` / `appId` / …) — in
12
12
  the managed path the Channel runs inside a CopilotKit Intelligence-configured
13
- `CopilotRuntime` (free plan available), which starts and owns the channel's
13
+ `CopilotKitRuntime` (free plan available), which starts and owns the channel's
14
14
  lifecycle. Building and operating your own channel runner on the SDK primitives
15
15
  is also a supported path.
16
16
 
@@ -29,8 +29,8 @@ import {
29
29
  defaultDiscordTools,
30
30
  defaultDiscordContext,
31
31
  } from "@copilotkit/channels-discord";
32
- import { CopilotRuntime, CopilotKitIntelligence } from "@copilotkit/runtime/v2";
33
- import { createCopilotNodeListener } from "@copilotkit/runtime/v2/node";
32
+ import { CopilotKitRuntime, CopilotKitIntelligence } from "@copilotkit/runtime";
33
+ import { createCopilotKitNodeListener } from "@copilotkit/runtime/node";
34
34
 
35
35
  const bot = createChannel({
36
36
  identifyUser: "platform",
@@ -59,7 +59,7 @@ const bot = createChannel({
59
59
  bot.onMention(({ thread }) => thread.runAgent());
60
60
 
61
61
  // The runtime owns the channel's lifecycle — there is no `bot.start()`.
62
- const runtime = new CopilotRuntime({
62
+ const runtime = new CopilotKitRuntime({
63
63
  intelligence: new CopilotKitIntelligence({
64
64
  // apiUrl and wsUrl default to cloud-hosted CopilotKit Intelligence — override
65
65
  // both together only for a self-hosted deployment.
@@ -69,7 +69,7 @@ const runtime = new CopilotRuntime({
69
69
  });
70
70
 
71
71
  // Creating the listener starts the Channel's connection.
72
- const listener = createCopilotNodeListener({ runtime });
72
+ const listener = createCopilotKitNodeListener({ runtime });
73
73
  // Optional: await that activation so a broken config fails startup loudly.
74
74
  await listener.channels.ready(); // listener.channels.stop() tears it down
75
75
  ```
@@ -300,7 +300,7 @@ in `ctx.text`.
300
300
 
301
301
  > **App setup** (OAuth scopes, bot permissions, invite URL) is done via the
302
302
  > Discord Developer Portal and the OAuth2 invite flow. A complete wiring example
303
- > lives in [`examples/slack`](../../examples/slack) — one bot app that runs
303
+ > lives in [`examples/templates/slack`](../../examples/templates/slack) — one bot app that runs
304
304
  > Slack and/or Discord depending on which secrets you set.
305
305
 
306
306
  ## What's NOT in v1
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
package/dist/adapter.js CHANGED
@@ -123,10 +123,11 @@ export class DiscordAdapter {
123
123
  }
124
124
  }
125
125
  async start(sink) {
126
- this.client.once("ready", async () => {
126
+ this.client.once("ready", () => {
127
127
  this.botUserId = this.client.user?.id ?? "";
128
128
  this.isReady = true;
129
- await this.publishCommands();
129
+ // publishCommands logs its own failures, so it never rejects.
130
+ void this.publishCommands();
130
131
  });
131
132
  // Slash commands ack via `deferReply` (a command's initial response is a
132
133
  // reply, not a component update), so they need a registry distinct from
@@ -199,7 +200,7 @@ export class DiscordAdapter {
199
200
  // Component interactions: register with the timer-race registry, hand the
200
201
  // decoded event to the sink (so a handler can open a modal first), then
201
202
  // settle — acking with deferUpdate if the handler never responded.
202
- this.client.on("interactionCreate", async (i) => {
203
+ const onInteraction = async (i) => {
203
204
  if (typeof i?.isButton !== "function")
204
205
  return;
205
206
  if (i.isButton() || i.isStringSelectMenu?.()) {
@@ -244,6 +245,11 @@ export class DiscordAdapter {
244
245
  console.error("[bot-discord] modal submit ack failed:", err);
245
246
  }
246
247
  }
248
+ };
249
+ // Every await above is guarded (settle swallows ack failures), so the
250
+ // handler never rejects.
251
+ this.client.on("interactionCreate", (i) => {
252
+ void onInteraction(i);
247
253
  });
248
254
  await this.client.login(this.opts.botToken);
249
255
  }
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=await-choice.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"await-choice.test.d.ts","sourceRoot":"","sources":["../src/await-choice.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,218 @@
1
+ import { describe, it, expect, vi, afterEach } from "vitest";
2
+ import { createChannel, FakeAdapter } from "@copilotkit/channels-core";
3
+ import { Actions, Button, Select } from "@copilotkit/channels-ui";
4
+ import { renderDiscordMessage } from "./render/components-v2.js";
5
+ import { decodeInteraction } from "./interaction.js";
6
+ /**
7
+ * `thread.awaitChoice` with Discord's own component encoding: posts are
8
+ * rendered by the real Components V2 renderer and clicks decoded by the real
9
+ * interaction decoder. Only the transport is faked.
10
+ */
11
+ const PENDING = Symbol("pending");
12
+ const CHANNEL_ID = "1100000000000000001";
13
+ const alice = { id: "2200000000000000001", kind: "human" };
14
+ const activeChannels = [];
15
+ const tick = async () => {
16
+ for (let i = 0; i < 10; i++)
17
+ await new Promise((r) => setTimeout(r, 0));
18
+ };
19
+ /** Every button `custom_id` on the components rendered for post `index`. */
20
+ function buttonCustomIds(fake, index) {
21
+ const json = renderDiscordMessage(fake.posted[index]).components.map((c) => c.toJSON());
22
+ const ids = [];
23
+ const visit = (value) => {
24
+ if (Array.isArray(value)) {
25
+ for (const item of value)
26
+ visit(item);
27
+ return;
28
+ }
29
+ if (typeof value !== "object" || value === null)
30
+ return;
31
+ const el = value;
32
+ // Component type 2 is a button.
33
+ if (el.type === 2 && typeof el.custom_id === "string") {
34
+ ids.push(el.custom_id);
35
+ }
36
+ for (const child of Object.values(value))
37
+ visit(child);
38
+ };
39
+ visit(json);
40
+ return ids;
41
+ }
42
+ /** Click a button the way discord.js delivers it, through the real decoder. */
43
+ function clickButton(fake, customId, messageId) {
44
+ const evt = decodeInteraction({
45
+ isButton: () => true,
46
+ isStringSelectMenu: () => false,
47
+ customId,
48
+ channelId: CHANNEL_ID,
49
+ message: { id: messageId },
50
+ user: { id: alice.id, username: "alice" },
51
+ });
52
+ if (!evt)
53
+ throw new Error("decoder rejected the click");
54
+ fake.emitInteraction({ ...evt, platform: "discord" });
55
+ }
56
+ /** Every string select rendered for post `index`, as Discord would see it. */
57
+ function selectMenus(fake, index) {
58
+ const json = renderDiscordMessage(fake.posted[index]).components.map((c) => c.toJSON());
59
+ const menus = [];
60
+ const visit = (value) => {
61
+ if (Array.isArray(value)) {
62
+ for (const item of value)
63
+ visit(item);
64
+ return;
65
+ }
66
+ if (typeof value !== "object" || value === null)
67
+ return;
68
+ const el = value;
69
+ // Component type 3 is a string select.
70
+ if (el.type === 3 && typeof el.custom_id === "string") {
71
+ menus.push({
72
+ customId: el.custom_id,
73
+ minValues: el.min_values,
74
+ maxValues: el.max_values,
75
+ });
76
+ }
77
+ for (const child of Object.values(value))
78
+ visit(child);
79
+ };
80
+ visit(json);
81
+ return menus;
82
+ }
83
+ /** Pick select option value(s) the way discord.js delivers it, through the real decoder. */
84
+ function pickSelect(fake, menu, values, messageId) {
85
+ const evt = decodeInteraction({
86
+ isButton: () => false,
87
+ isStringSelectMenu: () => true,
88
+ customId: menu.customId,
89
+ values,
90
+ component: { minValues: menu.minValues, maxValues: menu.maxValues },
91
+ channelId: CHANNEL_ID,
92
+ message: { id: messageId },
93
+ user: { id: alice.id, username: "alice" },
94
+ });
95
+ if (!evt)
96
+ throw new Error("decoder rejected the pick");
97
+ fake.emitInteraction({ ...evt, platform: "discord" });
98
+ }
99
+ async function startPicker(picker, before) {
100
+ const fake = new FakeAdapter({ platform: "discord" });
101
+ const channel = createChannel({
102
+ identifyUser: "platform",
103
+ adapters: [fake],
104
+ });
105
+ const state = { chosen: PENDING };
106
+ channel.onMention(async ({ thread }) => {
107
+ if (before)
108
+ await before((ui) => thread.post(ui));
109
+ state.chosen = await thread.awaitChoice(picker());
110
+ });
111
+ await channel.ɵruntime.start();
112
+ activeChannels.push(channel);
113
+ fake.emitTurn({
114
+ userText: "go",
115
+ conversationKey: CHANNEL_ID,
116
+ platform: "discord",
117
+ actor: alice,
118
+ });
119
+ await tick();
120
+ return { fake, state };
121
+ }
122
+ describe("Discord awaitChoice", () => {
123
+ afterEach(async () => {
124
+ vi.restoreAllMocks();
125
+ while (activeChannels.length > 0) {
126
+ await activeChannels.pop().ɵruntime.stop();
127
+ }
128
+ });
129
+ it("is answered only by the picker's own button, not an earlier value-only one", async () => {
130
+ vi.spyOn(console, "debug").mockImplementation(() => { });
131
+ const value = { approved: true };
132
+ const { fake, state } = await startPicker(() => Actions({ children: [Button({ value, children: "Approve" })] }), async (post) => {
133
+ await post(Actions({ children: [Button({ value, children: "Old" })] }));
134
+ });
135
+ const [oldId] = buttonCustomIds(fake, 0);
136
+ const [ownId] = buttonCustomIds(fake, 1);
137
+ expect(oldId).toBe(`v:${JSON.stringify(value)}`);
138
+ expect(ownId).not.toBe(oldId);
139
+ clickButton(fake, oldId, "msg-1");
140
+ await tick();
141
+ expect(state.chosen).toBe(PENDING);
142
+ clickButton(fake, ownId, "msg-2");
143
+ await tick();
144
+ expect(state.chosen).toEqual(value);
145
+ });
146
+ });
147
+ describe("Discord awaitChoice: option values the decoder would parse as JSON", () => {
148
+ afterEach(async () => {
149
+ vi.restoreAllMocks();
150
+ while (activeChannels.length > 0) {
151
+ await activeChannels.pop().ɵruntime.stop();
152
+ }
153
+ });
154
+ const tricky = ["9.90", "null", "1e2", " true "];
155
+ const picker = (offered, multi) => () => Actions({
156
+ children: [
157
+ Select({
158
+ placeholder: "Pick",
159
+ multi,
160
+ options: [
161
+ { label: "Other", value: "other" },
162
+ { label: "Tricky", value: offered },
163
+ ],
164
+ }),
165
+ ],
166
+ });
167
+ it.each(tricky)("single select answers with the offered option %j", async (offered) => {
168
+ const { fake, state } = await startPicker(picker(offered, false));
169
+ const [menu] = selectMenus(fake, 0);
170
+ pickSelect(fake, menu, [offered], "msg-1");
171
+ await tick();
172
+ expect(state.chosen).toBe(offered);
173
+ });
174
+ it.each(tricky)("multi select answers with the offered option %j", async (offered) => {
175
+ const { fake, state } = await startPicker(picker(offered, true));
176
+ const [menu] = selectMenus(fake, 0);
177
+ pickSelect(fake, menu, ["other", offered], "msg-1");
178
+ await tick();
179
+ expect(state.chosen).toEqual(["other", offered]);
180
+ });
181
+ it("tells apart two options whose values decode to the same JSON", async () => {
182
+ const { fake, state } = await startPicker(() => Actions({
183
+ children: [
184
+ Select({
185
+ placeholder: "Pick",
186
+ options: [
187
+ { label: "Short", value: "9.9" },
188
+ { label: "Long", value: "9.90" },
189
+ ],
190
+ }),
191
+ ],
192
+ }));
193
+ const [menu] = selectMenus(fake, 0);
194
+ pickSelect(fake, menu, ["9.90"], "msg-1");
195
+ await tick();
196
+ expect(state.chosen).toBe("9.90");
197
+ });
198
+ it("still refuses a single-select value the picker does not offer", async () => {
199
+ vi.spyOn(console, "warn").mockImplementation(() => { });
200
+ vi.spyOn(console, "debug").mockImplementation(() => { });
201
+ const { fake, state } = await startPicker(picker("9.90", false));
202
+ const [menu] = selectMenus(fake, 0);
203
+ // "9.9" decodes to the same number as the offered "9.90" but is not offered.
204
+ pickSelect(fake, menu, ["9.9"], "msg-1");
205
+ await tick();
206
+ expect(state.chosen).toBe(PENDING);
207
+ });
208
+ it("still refuses a multi-select value the picker does not offer", async () => {
209
+ vi.spyOn(console, "warn").mockImplementation(() => { });
210
+ vi.spyOn(console, "debug").mockImplementation(() => { });
211
+ const { fake, state } = await startPicker(picker("true", true));
212
+ const [menu] = selectMenus(fake, 0);
213
+ // " true " decodes to the same boolean as the offered "true" but is not offered.
214
+ pickSelect(fake, menu, ["other", " true "], "msg-1");
215
+ await tick();
216
+ expect(state.chosen).toBe(PENDING);
217
+ });
218
+ });
package/dist/commands.js CHANGED
@@ -85,7 +85,7 @@ export function jsonSchemaToDiscordOptions(schema) {
85
85
  const rawDescription = typeof prop.description === "string" ? prop.description : rawName;
86
86
  const description = truncateText(rawDescription, DESCRIPTION_MAX);
87
87
  const base = { name, description, required: required.has(rawName) };
88
- // zod-to-json-schema can emit a nullable type as an array (e.g. ["string", "null"]).
88
+ // A JSON Schema converter can emit a nullable type as an array (e.g. ["string", "null"]).
89
89
  // Normalize to the first non-"null" member so the switch matches the real type
90
90
  // instead of falling through to the warn+string default.
91
91
  const type = Array.isArray(prop.type)
@@ -1 +1 @@
1
- {"version":3,"file":"discord-listener.d.ts","sourceRoot":"","sources":["../src/discord-listener.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"discord-listener.d.ts","sourceRoot":"","sources":["../src/discord-listener.ts"],"names":[],"mappings":"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"}
@@ -25,7 +25,7 @@ export function attachDiscordListener(cfg) {
25
25
  raw: msg,
26
26
  })).catch((e) => console.error("[bot-discord] onTurn handler failed:", e));
27
27
  });
28
- client.on("interactionCreate", async (i) => {
28
+ const handleCommand = async (i) => {
29
29
  if (typeof i?.isChatInputCommand !== "function" || !i.isChatInputCommand())
30
30
  return;
31
31
  // Register the live interaction with the timer-race registry, arming an
@@ -77,6 +77,10 @@ export function attachDiscordListener(cfg) {
77
77
  /* interaction already gone / cleared */
78
78
  }
79
79
  }
80
+ };
81
+ // onCommand failures are caught above and settle never rejects.
82
+ client.on("interactionCreate", (i) => {
83
+ void handleCommand(i);
80
84
  });
81
85
  if (onReaction) {
82
86
  const handleReaction = (added) => async (reaction, user) => {
@@ -109,8 +113,15 @@ export function attachDiscordListener(cfg) {
109
113
  console.error("[bot-discord] onReaction handler failed:", e);
110
114
  }
111
115
  };
112
- client.on("messageReactionAdd", handleReaction(true));
113
- client.on("messageReactionRemove", handleReaction(false));
116
+ // handleReaction catches its own failures, so it never rejects.
117
+ const onReactionAdd = handleReaction(true);
118
+ const onReactionRemove = handleReaction(false);
119
+ client.on("messageReactionAdd", (reaction, user) => {
120
+ void onReactionAdd(reaction, user);
121
+ });
122
+ client.on("messageReactionRemove", (reaction, user) => {
123
+ void onReactionRemove(reaction, user);
124
+ });
114
125
  }
115
126
  }
116
127
  /** Answer @-mentions and DMs; skip our own messages and other bots. */
@@ -1 +1 @@
1
- {"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["../src/interaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,2BAA2B,CAAC;AAsBnC,2FAA2F;AAC3F,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CA0D5E;AA0FD,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,OAAO,GAAG,mBAAmB,CA+B3E;AAMD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,GACb,gBAAgB,GAAG,SAAS,CAmC9B"}
1
+ {"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["../src/interaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,2BAA2B,CAAC;AAsBnC,2FAA2F;AAC3F,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAiE5E;AA0FD,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,OAAO,GAAG,mBAAmB,CA+B3E;AAMD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,GACb,gBAAgB,GAAG,SAAS,CAmC9B"}
@@ -18,6 +18,10 @@ export function decodeInteraction(raw) {
18
18
  // (number/boolean/object) round-trips to its original type — mirroring bot-slack.
19
19
  let id = customId;
20
20
  let value;
21
+ // The chosen select value(s) exactly as Discord sent them. JSON-parsing
22
+ // `value` loses the original string ("9.90" becomes 9.9), so awaitChoice
23
+ // matches the offered option by this raw string instead.
24
+ let rawValue;
21
25
  if (isSelect) {
22
26
  // Discord sends `values: string[]` for both single and multi selects; the
23
27
  // unambiguous signal is the component's value bounds (the renderer sets
@@ -25,9 +29,9 @@ export function decodeInteraction(raw) {
25
29
  // values; single → the one value (mirrors bot-slack).
26
30
  const c = i.component;
27
31
  const multi = (c?.maxValues ?? 1) > 1 || c?.minValues === 0;
28
- value = multi
29
- ? (i.values ?? []).map(parseSelectValue)
30
- : parseSelectValue(i.values?.[0]);
32
+ const chosen = (i.values ?? []).filter((v) => typeof v === "string");
33
+ value = multi ? chosen.map(parseSelectValue) : parseSelectValue(chosen[0]);
34
+ rawValue = multi ? chosen : chosen[0];
31
35
  }
32
36
  else {
33
37
  const sep = customId.startsWith("ck:") ? customId.indexOf(";v:") : -1;
@@ -44,6 +48,7 @@ export function decodeInteraction(raw) {
44
48
  conversationKey: channelId,
45
49
  replyTarget: { channelId, ...(i.guildId ? { guildId: i.guildId } : {}) },
46
50
  value,
51
+ ...(rawValue !== undefined ? { rawValue } : {}),
47
52
  actor: actor ?? { id: "unknown", kind: "unknown" },
48
53
  identityContext: identityContext({
49
54
  guildId: i.guildId,
package/package.json CHANGED
@@ -1,8 +1,11 @@
1
1
  {
2
2
  "name": "@copilotkit/channels-discord",
3
- "version": "0.11.1",
3
+ "version": "0.13.0-rc.0",
4
4
  "description": "Discord PlatformAdapter for @copilotkit/channels.",
5
5
  "license": "MIT",
6
+ "engines": {
7
+ "node": "^20.19.3 || >=22.13.0"
8
+ },
6
9
  "repository": {
7
10
  "type": "git",
8
11
  "url": "https://github.com/CopilotKit/CopilotKit.git",
@@ -33,10 +36,10 @@
33
36
  }
34
37
  },
35
38
  "dependencies": {
36
- "@ag-ui/client": "1.0.2",
37
- "discord.js": "^14.16.0",
38
- "@copilotkit/channels-core": "^0.11.1",
39
- "@copilotkit/channels-ui": "^0.11.1"
39
+ "@ag-ui/client": "1.0.4",
40
+ "@copilotkit/channels-core": "0.13.0-rc.0",
41
+ "@copilotkit/channels-ui": "0.13.0-rc.0",
42
+ "discord.js": "^14.16.0"
40
43
  },
41
44
  "devDependencies": {
42
45
  "@types/node": "^22.10.0",