Skip to content

Commit d8bf51b

Browse files
steipetesteipete
authored
fix(discord): single-source thread-binding default placement and guard artifact parity (#104342)
* fix(discord): single-source thread-binding default placement and guard artifact parity * fix(tests): load thread-binding parity artifacts via sanctioned contract test helpers
1 parent eb2f763 commit d8bf51b

9 files changed

Lines changed: 87 additions & 6 deletions

File tree

‎extensions/discord/src/channel.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ import { discordSetupAdapter } from "./setup-adapter.js";
8383
import { createDiscordPluginBase, discordConfigAdapter } from "./shared.js";
8484
import { collectDiscordStatusIssues } from "./status-issues.js";
8585
import { parseDiscordTarget } from "./target-parsing.js";
86+
import { defaultTopLevelPlacement } from "./thread-binding-api.js";
8687

8788
const DISCORD_ACCOUNT_STARTUP_STAGGER_MS = 10_000;
8889
const discordMessageAdapter = createChannelMessageAdapterFromOutbound({
@@ -479,7 +480,7 @@ export const discordPlugin: ChannelPlugin<ResolvedDiscordAccount, DiscordProbe>
479480
},
480481
conversationBindings: {
481482
supportsCurrentConversationBinding: true,
482-
defaultTopLevelPlacement: "child",
483+
defaultTopLevelPlacement,
483484
createManager: async ({ cfg, accountId }) =>
484485
(await loadDiscordThreadBindingsManagerModule()).createThreadBindingManager({
485486
cfg,

‎extensions/discord/src/thread-binding-api.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// Discord API module exposes the plugin public contract.
2+
// Single source for the top-level artifact and the runtime plugin so the
3+
// fast-path placement hint cannot drift from conversationBindings.
4+
export const defaultTopLevelPlacement = "child" as const;

‎extensions/discord/thread-binding-api.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// Discord API module exposes the plugin public contract.
2-
export const defaultTopLevelPlacement = "child" as const;
2+
export { defaultTopLevelPlacement } from "./src/thread-binding-api.js";

‎extensions/matrix/src/channel.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ import {
7979
} from "./setup-contract.js";
8080
import { createMatrixSetupWizardProxy, matrixSetupAdapter } from "./setup-core.js";
8181
import { runMatrixStartupMaintenance } from "./startup-maintenance.js";
82-
import { resolveMatrixInboundConversation } from "./thread-binding-api.js";
82+
import {
83+
defaultTopLevelPlacement,
84+
resolveMatrixInboundConversation,
85+
} from "./thread-binding-api.js";
8386
import type { CoreConfig } from "./types.js";
8487
// Mutex for serializing account startup (workaround for concurrent dynamic import race condition)
8588
let matrixStartupLock: Promise<void> = Promise.resolve();
@@ -454,7 +457,7 @@ export const matrixPlugin: ChannelPlugin<ResolvedMatrixAccount, MatrixProbe> =
454457
},
455458
conversationBindings: {
456459
supportsCurrentConversationBinding: true,
457-
defaultTopLevelPlacement: "child",
460+
defaultTopLevelPlacement,
458461
setIdleTimeoutBySessionKey: ({ targetSessionKey, accountId, idleTimeoutMs }) =>
459462
setMatrixThreadBindingIdleTimeoutBySessionKey({
460463
targetSessionKey,

‎scripts/test-projects.test-support.mjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2388,6 +2388,7 @@ const CHANNEL_CONTRACT_CONFIG_PATTERNS = new Map([
23882388
"src/channels/plugins/contracts/plugins-core.resolve-config-writes.contract.test.ts",
23892389
"src/channels/plugins/contracts/registry.contract.test.ts",
23902390
"src/channels/plugins/contracts/session-binding.registry-backed.contract.test.ts",
2391+
"src/channels/plugins/contracts/thread-binding-artifact.contract.test.ts",
23912392
"src/channels/plugins/contracts/*-shard-d.contract.test.ts",
23922393
"src/channels/plugins/contracts/*-shard-h.contract.test.ts",
23932394
],

‎src/channels/plugins/contracts/test-helpers/bundled-channel-plugin-loader.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,3 +294,27 @@ export async function getBundledChannelDirectoryPluginAsync(
294294
channelDirectoryPluginPromiseCache.set(id, loading);
295295
return (await loading) ?? undefined;
296296
}
297+
298+
type ChannelThreadBindingArtifactModule = { defaultTopLevelPlacement?: unknown };
299+
300+
function isMissingBundledThreadBindingArtifact(error: unknown, id: ChannelId): boolean {
301+
return (
302+
error instanceof Error &&
303+
error.message === `Unable to resolve bundled plugin public surface ${id}/thread-binding-api.js`
304+
);
305+
}
306+
307+
/** Returns a bundled channel's thread-binding artifact, or null when it ships none. */
308+
export async function getBundledChannelThreadBindingArtifactAsync(
309+
id: ChannelId,
310+
): Promise<ChannelThreadBindingArtifactModule | null> {
311+
return await loadBundledPluginPublicSurface<ChannelThreadBindingArtifactModule>({
312+
pluginId: id,
313+
artifactBasename: "thread-binding-api.js",
314+
}).catch((error: unknown) => {
315+
if (isMissingBundledThreadBindingArtifact(error, id)) {
316+
return null;
317+
}
318+
throw error;
319+
});
320+
}

‎src/channels/plugins/contracts/thread-binding-artifact.contract.test.ts‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Thread-binding artifact parity contract for bundled channel plugins.
2+
//
3+
// Core resolves default thread placement from lightweight `thread-binding-api`
4+
// artifacts before full plugin loading (src/channels/plugins/thread-binding-api.ts).
5+
// This suite pins artifact exports to the runtime plugin's conversationBindings
6+
// so the fast path cannot drift from loaded-plugin behavior.
7+
import { beforeAll, describe, expect, it } from "vitest";
8+
import {
9+
getBundledChannelPluginAsync,
10+
getBundledChannelThreadBindingArtifactAsync,
11+
listBundledChannelPluginIds,
12+
} from "./test-helpers/bundled-channel-plugin-loader.js";
13+
14+
// Bundled channels expected to ship a top-level thread-binding artifact.
15+
const THREAD_BINDING_ARTIFACT_PLUGIN_IDS = ["discord", "matrix"] as const;
16+
17+
describe("bundled channel thread-binding artifact parity", () => {
18+
const artifactPlacements = new Map<string, unknown>();
19+
20+
beforeAll(async () => {
21+
for (const id of listBundledChannelPluginIds()) {
22+
const artifact = await getBundledChannelThreadBindingArtifactAsync(id);
23+
if (artifact) {
24+
artifactPlacements.set(id, artifact.defaultTopLevelPlacement);
25+
}
26+
}
27+
});
28+
29+
it("keeps the artifact table in sync with bundled channels that ship one", () => {
30+
expect([...artifactPlacements.keys()].toSorted()).toEqual([
31+
...THREAD_BINDING_ARTIFACT_PLUGIN_IDS,
32+
]);
33+
});
34+
35+
it.each(THREAD_BINDING_ARTIFACT_PLUGIN_IDS)(
36+
"keeps the %s artifact placement equal to the runtime plugin default",
37+
async (id) => {
38+
const artifactPlacement = artifactPlacements.get(id);
39+
expect(["current", "child"]).toContain(artifactPlacement);
40+
41+
const plugin = await getBundledChannelPluginAsync(id);
42+
expect(plugin?.conversationBindings?.defaultTopLevelPlacement).toBe(artifactPlacement);
43+
},
44+
);
45+
});

‎src/channels/plugins/thread-binding-api.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,12 @@ describe("bundled channel thread binding fast path", () => {
6868
});
6969

7070
it("treats missing artifacts as absent hints", () => {
71-
expect(resolveBundledChannelThreadBindingDefaultPlacement("discord")).toBeUndefined();
71+
// "absent" is a synthetic channel; real bundled artifacts are covered by
72+
// the thread-binding artifact parity contract test.
73+
expect(resolveBundledChannelThreadBindingDefaultPlacement("absent")).toBeUndefined();
7274
expect(
7375
resolveBundledChannelThreadBindingInboundConversation({
74-
channelId: "discord",
76+
channelId: "absent",
7577
to: "channel:general",
7678
isGroup: true,
7779
}),

‎test/vitest/vitest.contracts-shared.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export const channelSessionContractPatterns = [
3636
"src/channels/plugins/contracts/plugins-core.resolve-config-writes.contract.test.ts",
3737
"src/channels/plugins/contracts/registry.contract.test.ts",
3838
"src/channels/plugins/contracts/session-binding.registry-backed.contract.test.ts",
39+
"src/channels/plugins/contracts/thread-binding-artifact.contract.test.ts",
3940
"src/channels/plugins/contracts/*-shard-d.contract.test.ts",
4041
"src/channels/plugins/contracts/*-shard-h.contract.test.ts",
4142
];

0 commit comments

Comments
 (0)