@open-everywhere/provider-discord 0.4.0 → 0.6.0

package/agent/approvals/discord-card.ts

@@ -18,8 +18,8 @@
 // DECIDED card (no buttons), and the JUDGE-LIFT NOTICE (OPE-1103) — a review surface for an action
 // that already ran, carrying the one "This should not have run" button and never a decision one.
 
-import type { PendingActionRow } from "@open-everywhere/core/agent/adapter-api.js";
-import { getSettings, grantButtonLabel, pendingCardExpiryClause, sessionGrantKind } from "@open-everywhere/core/agent/adapter-api.js";
+import type { CardOptionTone, PendingActionRow } from "@open-everywhere/core/agent/adapter-api.js";
+import { approvalLabel, optionsWithoutConfirm, pendingCardLayout, plainSummaryForRow } from "@open-everywhere/core/agent/adapter-api.js";
 
 /**
  * Every approval button custom_id this feature owns starts with this. Deliberately distinct
@@ -111,47 +111,27 @@ export function parseDiscordApprovalCustomId(customId: string): { id: string; de
   return { id, decision: decision as DiscordApprovalDecision, org };
 }
 
-/** The shared card body: header + summary + provenance. `<@id>` is Discord's user-mention
- *  syntax too, so the requester line reads identically to the Slack card. */
+/** The shared card body: the plain sentence first (OPE-2434), then the `Approval requested: <kind>` label, the summary and the provenance. `<@id>` is Discord's user-mention syntax too, so the requester line reads identically to the Slack card. The sentence went through core's `plainValue`, so it carries no markdown of its own. */
 function cardBody(row: PendingActionRow, summaryLines: readonly string[], footer: string): string {
-  return [`**Approval requested: ${row.kind}**`, ...summaryLines, footer].join("\n");
+  return [`**${plainSummaryForRow(row)}**`, `-# ${approvalLabel(row.kind)}`, ...summaryLines, footer].join("\n");
 }
 
+const OPTION_STYLE: Record<CardOptionTone, number> = { primary: BUTTON_STYLE_SUCCESS, danger: BUTTON_STYLE_DANGER, neutral: BUTTON_STYLE_SECONDARY };
+
 /**
- * The card for a still-pending action: summary + "requested by / expires" + Approve/Reject
- * buttons carrying the pending id + org in their custom_ids (see the file header for why
- * the org rides the custom_id on Discord). Mirrors card.ts's pendingCardBlocks.
+ * The card for a still-pending action: the plain sentence, the summary, "requested by / expires", and one button per layout option, each carrying the pending id + org in its custom_id (see the file header for why the org rides the custom_id on Discord). Mirrors card.ts's pendingCardBlocks.
+ * The OPTIONS come from core's card layout (OPE-53, OPE-2363: only a ROUTINE's card gets the middle grant button), so Slack, Teams and Discord can never disagree. OPE-2456's rule option needs a confirmation before the click, which a Discord button cannot show, so it is left out.
  */
 export function pendingDiscordCard(row: PendingActionRow, summaryLines: readonly string[]): DiscordCardMessage {
-  const content = cardBody(row, summaryLines, `-# Requested by <@${row.requestedBy}> · ${pendingCardExpiryClause(row.expiresAt)}`);
-  const buttons: DiscordComponent[] = [
-    {
-      type: COMPONENT_BUTTON,
-      style: BUTTON_STYLE_SUCCESS,
-      label: "Approve",
-      custom_id: buildDiscordApprovalCustomId(row, "approve"),
-    },
-  ];
-  // OPE-53, OPE-2363: only a ROUTINE's card gets the middle button — publish this one AND skip the card
-  // for the same kind on later fires of THIS routine. sessionGrantKind() (core approvals/session-grant.ts)
-  // decides the KIND (`pr.open` alone), and grantButtonLabel() decides the reach: undefined for every
-  // card in a conversation, which offers Approve and Reject only. The label and the presence both come
-  // from core, so Slack and Discord can never disagree.
-  const grantLabel = sessionGrantKind(row) !== null ? grantButtonLabel(row, getSettings().approvals.routineGrantTtlHours) : undefined;
-  if (grantLabel !== undefined) {
-    buttons.push({
-      type: COMPONENT_BUTTON,
-      style: BUTTON_STYLE_SECONDARY,
-      label: grantLabel,
-      custom_id: buildDiscordApprovalCustomId(row, "approve_session"),
-    });
-  }
-  buttons.push({
+  const layout = pendingCardLayout(row, summaryLines);
+  const content = cardBody(row, summaryLines, `-# Requested by <@${layout.requestedBy}> · ${layout.expiry}`);
+  // A Discord button sends its click with no confirmation first, so the rule option (OPE-2456) is left out here.
+  const buttons: DiscordComponent[] = optionsWithoutConfirm(layout.options).map((o) => ({
     type: COMPONENT_BUTTON,
-    style: BUTTON_STYLE_DANGER,
-    label: "Reject",
-    custom_id: buildDiscordApprovalCustomId(row, "reject"),
-  });
+    style: OPTION_STYLE[o.tone],
+    label: o.label,
+    custom_id: buildDiscordApprovalCustomId(row, o.verb),
+  }));
   return { content, components: [{ type: COMPONENT_ACTION_ROW, components: buttons }] };
 }
 

package/agent/channels/discord-channel-info.ts

@@ -18,6 +18,10 @@ export interface DiscordChannelInfo {
   /** Present (with a thread type) when the channel is a THREAD — its parent channel id. */
   readonly parentId?: string;
   readonly isThread: boolean;
+  /** The guild the channel belongs to (`guild_id`), or undefined for a DM or a guild lookup.
+   *  Read by the declared-target resolver (OPE-2419) to confirm a configured `discord/<guild>/<channel>`
+   *  names a channel that really is in that guild. */
+  readonly guildId?: string;
 }
 
 /** Injectable seams (tests swap both; live callers pass nothing). */
@@ -55,14 +59,15 @@ export function fetchDiscordInfo(
           headers: { authorization: `Bot ${token}` },
         });
         if (!res.ok) return undefined;
-        const body = (await res.json()) as { name?: unknown; parent_id?: unknown; type?: unknown };
+        const body = (await res.json()) as { name?: unknown; parent_id?: unknown; type?: unknown; guild_id?: unknown };
         const name = typeof body.name === "string" && body.name.trim() ? body.name.trim() : undefined;
         const isThread = body.type === 10 || body.type === 11 || body.type === 12;
         const parentId = isThread && typeof body.parent_id === "string" && body.parent_id ? body.parent_id : undefined;
         // A nameless channel resolves undefined wholesale — kept from the original
         // scope-label impl (its callers require the name), and harmless for the grain
         // consumer: every real guild channel/thread carries a name.
-        return name ? { name, parentId, isThread } : undefined;
+        const guildId = kind === "channels" && typeof body.guild_id === "string" && body.guild_id ? body.guild_id : undefined;
+        return name ? { name, parentId, isThread, ...(guildId ? { guildId } : {}) } : undefined;
       } catch {
         return undefined;
       }

package/agent/channels/discord-dispatch-target.ts

@@ -9,8 +9,17 @@
 // discordChannel().receive owns the send; NO Gateway websocket is involved (that transport is
 // inbound-ambient only). Target = `{ channelId }`.
 
-import type { Routine, DispatchTarget, SessionMode, UnifiedWakeOrigin } from "@open-everywhere/core/agent/adapter-api.js";
+import type {
+  Routine,
+  DispatchTarget,
+  DeclaredTargetResolution,
+  DeclaredTargetSpec,
+  SessionMode,
+  UnifiedWakeOrigin,
+} from "@open-everywhere/core/agent/adapter-api.js";
 import discord from "./discord.js";
+import { discordOpenDmChannel } from "./discord-post.js";
+import { fetchDiscordInfo } from "./discord-channel-info.js";
 
 /** One stored-target field as a non-empty string, or undefined (never a coerced non-string — the
  *  store row is data, validated on the way out, not trusted). Local copy of core dispatch.ts's
@@ -101,3 +110,55 @@ export function discordReportTargetFor(surfaceKey: string): Readonly<Record<stri
   const channelId = segs.length === 3 && segs[0] === "discord" ? segs[2] : undefined;
   return channelId && channelId.length > 0 ? { channelId } : null;
 }
+
+/**
+ * Resolve a target that config NAMES (OPE-2419 — a webhook's `target`) into the facts
+ * {@link resolveDiscordTarget} reads.
+ *
+ *   • A ROOM, `discord/<guildId>/<channelId>`: the third segment IS the channel id (the same
+ *     round-trip {@link discordReportTargetFor} relies on). The guild id is stored too, which is the
+ *     GUILD EVIDENCE resolveDiscordTarget needs before it mints a guild-shaped wake origin.
+ *     🔴 THE GUILD IS CHECKED, NOT TRUSTED. The bot token posts to a channel id in ANY guild, while the
+ *     fire's partition, domain and memory come from the guild segment. A target that names guild A
+ *     and a channel in guild B would bind guild A's domain in guild B's room. So the resolver reads
+ *     the channel's own `guild_id` and refuses on a mismatch, and also when it cannot read it.
+ *   • A PERSON, `dm:discord/<userId>`: `POST /users/@me/channels` opens (or reuses) the 1:1 DM, and
+ *     the target is stored with channel type "1", so the fire binds as a DM. The surface key's
+ *     workspace segment is the person's user id — what bindDiscord derives for a DM (`guildId ?? userId`).
+ *
+ * A DM Discord refuses (the person shares no server with the bot, or turned off DMs from server
+ * members) comes back as a refusal that says so. It is never a silent drop.
+ */
+export async function resolveDiscordDeclaredTarget(
+  spec: DeclaredTargetSpec,
+  deps: {
+    readonly openDm?: (userId: string) => Promise<string>;
+    readonly channelGuild?: (channelId: string) => Promise<string | undefined>;
+  } = {},
+): Promise<DeclaredTargetResolution> {
+  if (spec.kind === "room") {
+    const guildId = await (deps.channelGuild ?? (async (id: string) => (await fetchDiscordInfo("channels", id))?.guildId))(spec.surface).catch(() => undefined);
+    if (guildId !== spec.workspace) {
+      return {
+        ok: false,
+        reason:
+          guildId === undefined
+            ? `Discord did not confirm that channel ${spec.surface} is in guild ${spec.workspace} (the channel lookup failed, or the bot cannot see the channel). Check DISCORD_BOT_TOKEN and that the bot is in that guild.`
+            : `channel ${spec.surface} is in guild ${guildId}, not guild ${spec.workspace}. Correct the target to "discord/${guildId}/${spec.surface}".`,
+      };
+    }
+    return { ok: true, facts: { surfaceKey: `discord/${spec.workspace}/${spec.surface}`, target: { channelId: spec.surface, guildId: spec.workspace } } };
+  }
+  let channelId: string;
+  try {
+    channelId = await (deps.openDm ?? discordOpenDmChannel)(spec.principalId);
+  } catch (err) {
+    return {
+      ok: false,
+      reason:
+        `Discord could not open a DM with user ${spec.principalId} (${err instanceof Error ? err.message : String(err)}). ` +
+        `The person must share a server with the bot and allow direct messages from server members.`,
+    };
+  }
+  return { ok: true, facts: { surfaceKey: `discord/${spec.principalId}/${channelId}`, target: { channelId, channelType: "1" } } };
+}

package/agent/register.ts

@@ -54,7 +54,7 @@ import { PROVIDER_DOCS } from "./docs-generated.js";
 import { DISCORD_SURFACE_PARITY } from "./surface-parity.js";
 import { DISCORD_PROVIDER_EVENTS } from "./provider-events.js";
 import { registerDiscordOps } from "./ops.js";
-import { resolveDiscordTarget, discordReportTargetFor } from "./channels/discord-dispatch-target.js";
+import { resolveDiscordTarget, discordReportTargetFor, resolveDiscordDeclaredTarget } from "./channels/discord-dispatch-target.js";
 import { bindDiscord } from "./channels/discord-identity.js";
 import { discordPostArm } from "./channels/discord-post-arm.js";
 import { discordWakeOriginCodec } from "./channels/discord-origin-codec.js";
@@ -103,7 +103,12 @@ export function registerDiscordProvider(): void {
   // has already run and its failure is swallowed. Without this registration a judge lift on a
   // Discord-bound domain leaves audit rows and nothing a person in the room can act on.
   registerJudgeLiftNoticePoster("discord", postDiscordJudgeLiftNotice);
-  registerRoutineDispatch("discord", { resolveTarget: resolveDiscordTarget, reportTargetFor: discordReportTargetFor });
+  registerRoutineDispatch("discord", {
+    resolveTarget: resolveDiscordTarget,
+    reportTargetFor: discordReportTargetFor,
+    // OPE-2419 — a webhook target on Discord: a guild channel, or a person's DM opened at fire time.
+    resolveDeclaredTarget: (spec) => resolveDiscordDeclaredTarget(spec),
+  });
   // Native admin leg for the spend-cap bypass (spend/bypass.ts): a guild ADMINISTRATOR, REST-verified.
   registerNativeAdminCheck("discord", async (scopeKey, principalId) => {
     const guildId = guildIdFromScopeKey(scopeKey);

package/agent/surface-parity.ts

@@ -39,6 +39,10 @@ export const DISCORD_SURFACE_PARITY: SurfaceParityDeclaration = {
   // stamps `thread: true` at mint from the relay payload's channel type (OPE-1719), which is the
   // positive signal the guard needs. The DM leg keeps the raw divert: a DM has no threads.
   "owned-thread-ingress": { supported: "the guild leg only — a Discord DM carries no threads, so its divert never consults ownership" },
+  "thread-done-reaction": {
+    unsupported:
+      "a Discord thread is its own channel, and the message that started it lives in the PARENT channel, whose id the origin does not carry. Marking the thread's first message instead would put the mark on the wrong message",
+  },
 
   // wake legs and conversation shapes
   "addressed-leg": "supported",

package/dist/agent/approvals/discord-card.d.ts

@@ -51,9 +51,8 @@ export declare function parseDiscordApprovalCustomId(customId: string): {
     org: string;
 } | null;
 /**
- * The card for a still-pending action: summary + "requested by / expires" + Approve/Reject
- * buttons carrying the pending id + org in their custom_ids (see the file header for why
- * the org rides the custom_id on Discord). Mirrors card.ts's pendingCardBlocks.
+ * The card for a still-pending action: the plain sentence, the summary, "requested by / expires", and one button per layout option, each carrying the pending id + org in its custom_id (see the file header for why the org rides the custom_id on Discord). Mirrors card.ts's pendingCardBlocks.
+ * The OPTIONS come from core's card layout (OPE-53, OPE-2363: only a ROUTINE's card gets the middle grant button), so Slack, Teams and Discord can never disagree. OPE-2456's rule option needs a confirmation before the click, which a Discord button cannot show, so it is left out.
  */
 export declare function pendingDiscordCard(row: PendingActionRow, summaryLines: readonly string[]): DiscordCardMessage;
 /**

package/dist/agent/approvals/discord-card.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discord-card.d.ts","sourceRoot":"","sources":["../../../agent/approvals/discord-card.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAGnF;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,iBAAiB,CAAC;AAEzD,uHAAuH;AACvH,eAAO,MAAM,qBAAqB,MAAM,CAAC;AAYzC;4FAC4F;AAC5F,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,6FAA6F;AAC7F,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,SAAS,gBAAgB,EAAE,CAAC;CAClD;AAED;;;;;GAKG;AACH,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG,QAAQ,GAAG,iBAAiB,GAAG,YAAY,CAAC;AAM9F;;;;;;;;;;GAUG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,gBAAgB,EAAE,QAAQ,EAAE,uBAAuB,GAAG,MAAM,CAQ7G;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAcpI;AAQD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,kBAAkB,CA+B7G;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,gBAAgB,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,CAkB1I;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,CAalI;AAKD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAOlE;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAGvF"}
+{"version":3,"file":"discord-card.d.ts","sourceRoot":"","sources":["../../../agent/approvals/discord-card.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAkB,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAGnG;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,iBAAiB,CAAC;AAEzD,uHAAuH;AACvH,eAAO,MAAM,qBAAqB,MAAM,CAAC;AAYzC;4FAC4F;AAC5F,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,6FAA6F;AAC7F,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,SAAS,gBAAgB,EAAE,CAAC;CAClD;AAED;;;;;GAKG;AACH,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG,QAAQ,GAAG,iBAAiB,GAAG,YAAY,CAAC;AAM9F;;;;;;;;;;GAUG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,gBAAgB,EAAE,QAAQ,EAAE,uBAAuB,GAAG,MAAM,CAQ7G;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAcpI;AASD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,kBAAkB,CAW7G;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,gBAAgB,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,CAkB1I;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,EAAE,YAAY,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,CAalI;AAKD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAOlE;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAGvF"}

package/dist/agent/approvals/discord-card.js

@@ -17,7 +17,7 @@
 // THREE renders live here, and only the first two are a card: the PENDING card (Approve/Reject), the
 // DECIDED card (no buttons), and the JUDGE-LIFT NOTICE (OPE-1103) — a review surface for an action
 // that already ran, carrying the one "This should not have run" button and never a decision one.
-import { getSettings, grantButtonLabel, pendingCardExpiryClause, sessionGrantKind } from "@open-everywhere/core/agent/adapter-api.js";
+import { approvalLabel, optionsWithoutConfirm, pendingCardLayout, plainSummaryForRow } from "@open-everywhere/core/agent/adapter-api.js";
 /**
  * Every approval button custom_id this feature owns starts with this. Deliberately distinct
  * from BOTH the Slack action_id prefix ("oe_approval:" — a different wire format, keeping
@@ -83,46 +83,25 @@ export function parseDiscordApprovalCustomId(customId) {
         return null;
     return { id, decision: decision, org };
 }
-/** The shared card body: header + summary + provenance. `<@id>` is Discord's user-mention
- *  syntax too, so the requester line reads identically to the Slack card. */
+/** The shared card body: the plain sentence first (OPE-2434), then the `Approval requested: <kind>` label, the summary and the provenance. `<@id>` is Discord's user-mention syntax too, so the requester line reads identically to the Slack card. The sentence went through core's `plainValue`, so it carries no markdown of its own. */
 function cardBody(row, summaryLines, footer) {
-    return [`**Approval requested: ${row.kind}**`, ...summaryLines, footer].join("\n");
+    return [`**${plainSummaryForRow(row)}**`, `-# ${approvalLabel(row.kind)}`, ...summaryLines, footer].join("\n");
 }
+const OPTION_STYLE = { primary: BUTTON_STYLE_SUCCESS, danger: BUTTON_STYLE_DANGER, neutral: BUTTON_STYLE_SECONDARY };
 /**
- * The card for a still-pending action: summary + "requested by / expires" + Approve/Reject
- * buttons carrying the pending id + org in their custom_ids (see the file header for why
- * the org rides the custom_id on Discord). Mirrors card.ts's pendingCardBlocks.
+ * The card for a still-pending action: the plain sentence, the summary, "requested by / expires", and one button per layout option, each carrying the pending id + org in its custom_id (see the file header for why the org rides the custom_id on Discord). Mirrors card.ts's pendingCardBlocks.
+ * The OPTIONS come from core's card layout (OPE-53, OPE-2363: only a ROUTINE's card gets the middle grant button), so Slack, Teams and Discord can never disagree. OPE-2456's rule option needs a confirmation before the click, which a Discord button cannot show, so it is left out.
  */
 export function pendingDiscordCard(row, summaryLines) {
-    const content = cardBody(row, summaryLines, `-# Requested by <@${row.requestedBy}> · ${pendingCardExpiryClause(row.expiresAt)}`);
-    const buttons = [
-        {
-            type: COMPONENT_BUTTON,
-            style: BUTTON_STYLE_SUCCESS,
-            label: "Approve",
-            custom_id: buildDiscordApprovalCustomId(row, "approve"),
-        },
-    ];
-    // OPE-53, OPE-2363: only a ROUTINE's card gets the middle button — publish this one AND skip the card
-    // for the same kind on later fires of THIS routine. sessionGrantKind() (core approvals/session-grant.ts)
-    // decides the KIND (`pr.open` alone), and grantButtonLabel() decides the reach: undefined for every
-    // card in a conversation, which offers Approve and Reject only. The label and the presence both come
-    // from core, so Slack and Discord can never disagree.
-    const grantLabel = sessionGrantKind(row) !== null ? grantButtonLabel(row, getSettings().approvals.routineGrantTtlHours) : undefined;
-    if (grantLabel !== undefined) {
-        buttons.push({
-            type: COMPONENT_BUTTON,
-            style: BUTTON_STYLE_SECONDARY,
-            label: grantLabel,
-            custom_id: buildDiscordApprovalCustomId(row, "approve_session"),
-        });
-    }
-    buttons.push({
+    const layout = pendingCardLayout(row, summaryLines);
+    const content = cardBody(row, summaryLines, `-# Requested by <@${layout.requestedBy}> · ${layout.expiry}`);
+    // A Discord button sends its click with no confirmation first, so the rule option (OPE-2456) is left out here.
+    const buttons = optionsWithoutConfirm(layout.options).map((o) => ({
         type: COMPONENT_BUTTON,
-        style: BUTTON_STYLE_DANGER,
-        label: "Reject",
-        custom_id: buildDiscordApprovalCustomId(row, "reject"),
-    });
+        style: OPTION_STYLE[o.tone],
+        label: o.label,
+        custom_id: buildDiscordApprovalCustomId(row, o.verb),
+    }));
     return { content, components: [{ type: COMPONENT_ACTION_ROW, components: buttons }] };
 }
 /**

package/dist/agent/approvals/discord-card.js.map

@@ -1 +1 @@
-{"version":3,"file":"discord-card.js","sourceRoot":"","sources":["../../../agent/approvals/discord-card.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"discord-card.js","sourceRoot":"","sources":["../../../agent/approvals/discord-card.ts"],"names":[],"mappings":"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"}

package/dist/agent/channels/discord-channel-info.d.ts

@@ -4,6 +4,10 @@ export interface DiscordChannelInfo {
     /** Present (with a thread type) when the channel is a THREAD — its parent channel id. */
     readonly parentId?: string;
     readonly isThread: boolean;
+    /** The guild the channel belongs to (`guild_id`), or undefined for a DM or a guild lookup.
+     *  Read by the declared-target resolver (OPE-2419) to confirm a configured `discord/<guild>/<channel>`
+     *  names a channel that really is in that guild. */
+    readonly guildId?: string;
 }
 /** Injectable seams (tests swap both; live callers pass nothing). */
 export interface DiscordInfoDeps {

package/dist/agent/channels/discord-channel-info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discord-channel-info.d.ts","sourceRoot":"","sources":["../../../agent/channels/discord-channel-info.ts"],"names":[],"mappings":"AAcA,iFAAiF;AACjF,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,yFAAyF;IACzF,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAED,qEAAqE;AACrE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;IAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AASD,0FAA0F;AAC1F,wBAAgB,4BAA4B,IAAI,IAAI,CAEnD;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,UAAU,GAAG,QAAQ,EAC3B,EAAE,EAAE,MAAM,EACV,IAAI,GAAE,eAAoB,GACzB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA4BzC;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,GAAE,eAAoB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAGtH"}
+{"version":3,"file":"discord-channel-info.d.ts","sourceRoot":"","sources":["../../../agent/channels/discord-channel-info.ts"],"names":[],"mappings":"AAcA,iFAAiF;AACjF,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,yFAAyF;IACzF,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B;;wDAEoD;IACpD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,qEAAqE;AACrE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;IAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AASD,0FAA0F;AAC1F,wBAAgB,4BAA4B,IAAI,IAAI,CAEnD;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,UAAU,GAAG,QAAQ,EAC3B,EAAE,EAAE,MAAM,EACV,IAAI,GAAE,eAAoB,GACzB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA6BzC;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,GAAE,eAAoB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAGtH"}

package/dist/agent/channels/discord-channel-info.js

@@ -43,7 +43,8 @@ export function fetchDiscordInfo(kind, id, deps = {}) {
                 // A nameless channel resolves undefined wholesale — kept from the original
                 // scope-label impl (its callers require the name), and harmless for the grain
                 // consumer: every real guild channel/thread carries a name.
-                return name ? { name, parentId, isThread } : undefined;
+                const guildId = kind === "channels" && typeof body.guild_id === "string" && body.guild_id ? body.guild_id : undefined;
+                return name ? { name, parentId, isThread, ...(guildId ? { guildId } : {}) } : undefined;
             }
             catch {
                 return undefined;

package/dist/agent/channels/discord-channel-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"discord-channel-info.js","sourceRoot":"","sources":["../../../agent/channels/discord-channel-info.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,oFAAoF;AACpF,uBAAuB;AACvB,kFAAkF;AAClF,sFAAsF;AACtF,qFAAqF;AACrF,qFAAqF;AACrF,EAAE;AACF,gFAAgF;AAChF,iFAAiF;AACjF,sFAAsF;AACtF,kFAAkF;AAClF,kFAAkF;AAgBlF,uFAAuF;AACvF,wFAAwF;AACxF,qFAAqF;AACrF,qFAAqF;AACrF,uBAAuB;AACvB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAmD,CAAC;AAE7E,0FAA0F;AAC1F,MAAM,UAAU,4BAA4B;IAC1C,SAAS,CAAC,KAAK,EAAE,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAA2B,EAC3B,EAAU,EACV,IAAI,GAAoB,EAAE;IAE1B,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;IAC5B,IAAI,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YACd,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;YAC1D,IAAI,CAAC,KAAK;gBAAE,OAAO,SAAS,CAAC;YAC7B,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC;gBACtC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,+BAA+B,IAAI,IAAI,EAAE,EAAE,EAAE;oBACrE,OAAO,EAAE,EAAE,aAAa,EAAE,OAAO,KAAK,EAAE,EAAE;iBAC3C,CAAC,CAAC;gBACH,IAAI,CAAC,GAAG,CAAC,EAAE;oBAAE,OAAO,SAAS,CAAC;gBAC9B,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA4D,CAAC;gBAC3F,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC9F,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;gBAC1E,MAAM,QAAQ,GAAG,QAAQ,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC/G,2EAA2E;gBAC3E,8EAA8E;gBAC9E,4DAA4D;gBAC5D,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACzD,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QACL,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,SAAiB,EAAE,IAAI,GAAoB,EAAE;IACvF,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACjE,OAAO,IAAI,EAAE,QAAQ,CAAC;AACxB,CAAC"}
+{"version":3,"file":"discord-channel-info.js","sourceRoot":"","sources":["../../../agent/channels/discord-channel-info.ts"],"names":[],"mappings":"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"}

package/dist/agent/channels/discord-dispatch-target.d.ts

@@ -1,4 +1,4 @@
-import type { Routine, DispatchTarget } from "@open-everywhere/core/agent/adapter-api.js";
+import type { Routine, DispatchTarget, DeclaredTargetResolution, DeclaredTargetSpec } from "@open-everywhere/core/agent/adapter-api.js";
 export declare function resolveDiscordTarget(r: Routine): DispatchTarget | null;
 /**
  * Derive a post-back target for a CONFIGURED Discord report channel ({@link Domain.reportChannel},
@@ -12,4 +12,26 @@ export declare function resolveDiscordTarget(r: Routine): DispatchTarget | null;
  * "channel" arm above — capped rather than spend-exempt, which is the safe direction.
  */
 export declare function discordReportTargetFor(surfaceKey: string): Readonly<Record<string, unknown>> | null;
+/**
+ * Resolve a target that config NAMES (OPE-2419 — a webhook's `target`) into the facts
+ * {@link resolveDiscordTarget} reads.
+ *
+ *   • A ROOM, `discord/<guildId>/<channelId>`: the third segment IS the channel id (the same
+ *     round-trip {@link discordReportTargetFor} relies on). The guild id is stored too, which is the
+ *     GUILD EVIDENCE resolveDiscordTarget needs before it mints a guild-shaped wake origin.
+ *     🔴 THE GUILD IS CHECKED, NOT TRUSTED. The bot token posts to a channel id in ANY guild, while the
+ *     fire's partition, domain and memory come from the guild segment. A target that names guild A
+ *     and a channel in guild B would bind guild A's domain in guild B's room. So the resolver reads
+ *     the channel's own `guild_id` and refuses on a mismatch, and also when it cannot read it.
+ *   • A PERSON, `dm:discord/<userId>`: `POST /users/@me/channels` opens (or reuses) the 1:1 DM, and
+ *     the target is stored with channel type "1", so the fire binds as a DM. The surface key's
+ *     workspace segment is the person's user id — what bindDiscord derives for a DM (`guildId ?? userId`).
+ *
+ * A DM Discord refuses (the person shares no server with the bot, or turned off DMs from server
+ * members) comes back as a refusal that says so. It is never a silent drop.
+ */
+export declare function resolveDiscordDeclaredTarget(spec: DeclaredTargetSpec, deps?: {
+    readonly openDm?: (userId: string) => Promise<string>;
+    readonly channelGuild?: (channelId: string) => Promise<string | undefined>;
+}): Promise<DeclaredTargetResolution>;
 //# sourceMappingURL=discord-dispatch-target.d.ts.map

package/dist/agent/channels/discord-dispatch-target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discord-dispatch-target.d.ts","sourceRoot":"","sources":["../../../agent/channels/discord-dispatch-target.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAkC,MAAM,4CAA4C,CAAC;AAW1H,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CA+DtE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAInG"}
+{"version":3,"file":"discord-dispatch-target.d.ts","sourceRoot":"","sources":["../../../agent/channels/discord-dispatch-target.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,wBAAwB,EACxB,kBAAkB,EAGnB,MAAM,4CAA4C,CAAC;AAapD,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CA+DtE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAInG;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,kBAAkB,EACxB,IAAI,GAAE;IACJ,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACvE,GACL,OAAO,CAAC,wBAAwB,CAAC,CA0BnC"}

package/dist/agent/channels/discord-dispatch-target.js

@@ -9,6 +9,8 @@
 // discordChannel().receive owns the send; NO Gateway websocket is involved (that transport is
 // inbound-ambient only). Target = `{ channelId }`.
 import discord from "./discord.js";
+import { discordOpenDmChannel } from "./discord-post.js";
+import { fetchDiscordInfo } from "./discord-channel-info.js";
 /** One stored-target field as a non-empty string, or undefined (never a coerced non-string — the
  *  store row is data, validated on the way out, not trusted). Local copy of core dispatch.ts's
  *  module-private `storedString`. */
@@ -96,4 +98,48 @@ export function discordReportTargetFor(surfaceKey) {
     const channelId = segs.length === 3 && segs[0] === "discord" ? segs[2] : undefined;
     return channelId && channelId.length > 0 ? { channelId } : null;
 }
+/**
+ * Resolve a target that config NAMES (OPE-2419 — a webhook's `target`) into the facts
+ * {@link resolveDiscordTarget} reads.
+ *
+ *   • A ROOM, `discord/<guildId>/<channelId>`: the third segment IS the channel id (the same
+ *     round-trip {@link discordReportTargetFor} relies on). The guild id is stored too, which is the
+ *     GUILD EVIDENCE resolveDiscordTarget needs before it mints a guild-shaped wake origin.
+ *     🔴 THE GUILD IS CHECKED, NOT TRUSTED. The bot token posts to a channel id in ANY guild, while the
+ *     fire's partition, domain and memory come from the guild segment. A target that names guild A
+ *     and a channel in guild B would bind guild A's domain in guild B's room. So the resolver reads
+ *     the channel's own `guild_id` and refuses on a mismatch, and also when it cannot read it.
+ *   • A PERSON, `dm:discord/<userId>`: `POST /users/@me/channels` opens (or reuses) the 1:1 DM, and
+ *     the target is stored with channel type "1", so the fire binds as a DM. The surface key's
+ *     workspace segment is the person's user id — what bindDiscord derives for a DM (`guildId ?? userId`).
+ *
+ * A DM Discord refuses (the person shares no server with the bot, or turned off DMs from server
+ * members) comes back as a refusal that says so. It is never a silent drop.
+ */
+export async function resolveDiscordDeclaredTarget(spec, deps = {}) {
+    if (spec.kind === "room") {
+        const guildId = await (deps.channelGuild ?? (async (id) => (await fetchDiscordInfo("channels", id))?.guildId))(spec.surface).catch(() => undefined);
+        if (guildId !== spec.workspace) {
+            return {
+                ok: false,
+                reason: guildId === undefined
+                    ? `Discord did not confirm that channel ${spec.surface} is in guild ${spec.workspace} (the channel lookup failed, or the bot cannot see the channel). Check DISCORD_BOT_TOKEN and that the bot is in that guild.`
+                    : `channel ${spec.surface} is in guild ${guildId}, not guild ${spec.workspace}. Correct the target to "discord/${guildId}/${spec.surface}".`,
+            };
+        }
+        return { ok: true, facts: { surfaceKey: `discord/${spec.workspace}/${spec.surface}`, target: { channelId: spec.surface, guildId: spec.workspace } } };
+    }
+    let channelId;
+    try {
+        channelId = await (deps.openDm ?? discordOpenDmChannel)(spec.principalId);
+    }
+    catch (err) {
+        return {
+            ok: false,
+            reason: `Discord could not open a DM with user ${spec.principalId} (${err instanceof Error ? err.message : String(err)}). ` +
+                `The person must share a server with the bot and allow direct messages from server members.`,
+        };
+    }
+    return { ok: true, facts: { surfaceKey: `discord/${spec.principalId}/${channelId}`, target: { channelId, channelType: "1" } } };
+}
 //# sourceMappingURL=discord-dispatch-target.js.map

package/dist/agent/channels/discord-dispatch-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"discord-dispatch-target.js","sourceRoot":"","sources":["../../../agent/channels/discord-dispatch-target.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"discord-dispatch-target.js","sourceRoot":"","sources":["../../../agent/channels/discord-dispatch-target.ts"],"names":[],"mappings":"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"}

package/dist/agent/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../agent/register.ts"],"names":[],"mappings":"AAsEA;;8DAE8D;AAC9D,wBAAgB,uBAAuB,IAAI,IAAI,CAyE9C"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../agent/register.ts"],"names":[],"mappings":"AAsEA;;8DAE8D;AAC9D,wBAAgB,uBAAuB,IAAI,IAAI,CA8E9C"}

package/dist/agent/register.js

@@ -32,7 +32,7 @@ import { PROVIDER_DOCS } from "./docs-generated.js";
 import { DISCORD_SURFACE_PARITY } from "./surface-parity.js";
 import { DISCORD_PROVIDER_EVENTS } from "./provider-events.js";
 import { registerDiscordOps } from "./ops.js";
-import { resolveDiscordTarget, discordReportTargetFor } from "./channels/discord-dispatch-target.js";
+import { resolveDiscordTarget, discordReportTargetFor, resolveDiscordDeclaredTarget } from "./channels/discord-dispatch-target.js";
 import { bindDiscord } from "./channels/discord-identity.js";
 import { discordPostArm } from "./channels/discord-post-arm.js";
 import { discordWakeOriginCodec } from "./channels/discord-origin-codec.js";
@@ -80,7 +80,12 @@ export function registerDiscordProvider() {
     // has already run and its failure is swallowed. Without this registration a judge lift on a
     // Discord-bound domain leaves audit rows and nothing a person in the room can act on.
     registerJudgeLiftNoticePoster("discord", postDiscordJudgeLiftNotice);
-    registerRoutineDispatch("discord", { resolveTarget: resolveDiscordTarget, reportTargetFor: discordReportTargetFor });
+    registerRoutineDispatch("discord", {
+        resolveTarget: resolveDiscordTarget,
+        reportTargetFor: discordReportTargetFor,
+        // OPE-2419 — a webhook target on Discord: a guild channel, or a person's DM opened at fire time.
+        resolveDeclaredTarget: (spec) => resolveDiscordDeclaredTarget(spec),
+    });
     // Native admin leg for the spend-cap bypass (spend/bypass.ts): a guild ADMINISTRATOR, REST-verified.
     registerNativeAdminCheck("discord", async (scopeKey, principalId) => {
         const guildId = guildIdFromScopeKey(scopeKey);

package/dist/agent/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../agent/register.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../agent/register.ts"],"names":[],"mappings":"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"}

package/dist/agent/surface-parity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"surface-parity.d.ts","sourceRoot":"","sources":["../../agent/surface-parity.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAE3F,eAAO,MAAM,sBAAsB,EAAE,wBA+EpC,CAAC"}
+{"version":3,"file":"surface-parity.d.ts","sourceRoot":"","sources":["../../agent/surface-parity.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAE3F,eAAO,MAAM,sBAAsB,EAAE,wBAmFpC,CAAC"}

package/dist/agent/surface-parity.js

@@ -35,6 +35,9 @@ export const DISCORD_SURFACE_PARITY = {
     // stamps `thread: true` at mint from the relay payload's channel type (OPE-1719), which is the
     // positive signal the guard needs. The DM leg keeps the raw divert: a DM has no threads.
     "owned-thread-ingress": { supported: "the guild leg only — a Discord DM carries no threads, so its divert never consults ownership" },
+    "thread-done-reaction": {
+        unsupported: "a Discord thread is its own channel, and the message that started it lives in the PARENT channel, whose id the origin does not carry. Marking the thread's first message instead would put the mark on the wrong message",
+    },
     // wake legs and conversation shapes
     "addressed-leg": "supported",
     "ambient-leg": "supported",

package/dist/agent/surface-parity.js.map

@@ -1 +1 @@
-{"version":3,"file":"surface-parity.js","sourceRoot":"","sources":["../../agent/surface-parity.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,wFAAwF;AACxF,EAAE;AACF,yFAAyF;AACzF,iGAAiG;AACjG,uFAAuF;AAIvF,MAAM,CAAC,MAAM,sBAAsB,GAA6B;IAC9D,4BAA4B;IAC5B,iBAAiB,EAAE,WAAW;IAC9B,qBAAqB,EAAE,WAAW;IAClC,UAAU,EAAE,WAAW;IACvB,mBAAmB,EAAE,WAAW;IAChC,gGAAgG;IAChG,iGAAiG;IACjG,iFAAiF;IACjF,wBAAwB,EAAE,WAAW;IACrC,cAAc,EAAE,WAAW;IAC3B,0BAA0B,EAAE,WAAW;IACvC,eAAe,EAAE,WAAW;IAC5B,+FAA+F;IAC/F,8FAA8F;IAC9F,+CAA+C;IAC/C,yBAAyB,EAAE,EAAE,SAAS,EAAE,sEAAsE,EAAE;IAChH,iGAAiG;IACjG,iGAAiG;IACjG,kGAAkG;IAClG,6EAA6E;IAC7E,iGAAiG;IACjG,uFAAuF;IACvF,uBAAuB,EAAE;QACvB,WAAW,EACT,yMAAyM;KAC5M;IACD,8FAA8F;IAC9F,4FAA4F;IAC5F,+FAA+F;IAC/F,yFAAyF;IACzF,sBAAsB,EAAE,EAAE,SAAS,EAAE,8FAA8F,EAAE;IAErI,oCAAoC;IACpC,eAAe,EAAE,WAAW;IAC5B,aAAa,EAAE,WAAW;IAC1B,iGAAiG;IACjG,mGAAmG;IACnG,oGAAoG;IACpG,eAAe,EAAE,WAAW;IAC5B,+FAA+F;IAC/F,qEAAqE;IACrE,wBAAwB,EAAE,WAAW;IACrC,iGAAiG;IACjG,wEAAwE;IACxE,eAAe,EAAE,WAAW;IAC5B,iGAAiG;IACjG,iGAAiG;IACjG,4BAA4B;IAC5B,mBAAmB,EAAE,WAAW;IAChC,mBAAmB,EAAE,WAAW;IAChC,qFAAqF;IACrF,iGAAiG;IACjG,iGAAiG;IACjG,gEAAgE;IAChE,mBAAmB,EAAE,EAAE,WAAW,EAAE,2GAA2G,EAAE;IACjJ,sFAAsF;IACtF,OAAO,EAAE,EAAE,SAAS,EAAE,8BAA8B,EAAE;IACtD,KAAK,EAAE,WAAW;IAClB,EAAE,EAAE,WAAW;IACf,IAAI,EAAE,WAAW;IAEjB,oBAAoB;IACpB,KAAK,EAAE,WAAW;IAClB,UAAU,EAAE,WAAW;IACvB,8FAA8F;IAC9F,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,WAAW;IACrB,YAAY,EAAE,WAAW;IACzB,WAAW,EAAE,WAAW;IACxB,MAAM,EAAE,EAAE,WAAW,EAAE,8EAA8E,EAAE;IACvG,YAAY,EAAE,WAAW;IACzB,SAAS,EAAE,WAAW;IACtB,eAAe,EAAE,WAAW;IAC5B,IAAI,EAAE,EAAE,SAAS,EAAE,yCAAyC,EAAE;IAC9D,cAAc,EAAE,WAAW;IAC3B,eAAe,EAAE,WAAW;IAC5B,UAAU,EAAE,EAAE,SAAS,EAAE,yEAAyE,EAAE;IACpG,SAAS,EAAE,WAAW;CACvB,CAAC"}
+{"version":3,"file":"surface-parity.js","sourceRoot":"","sources":["../../agent/surface-parity.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,wFAAwF;AACxF,EAAE;AACF,yFAAyF;AACzF,iGAAiG;AACjG,uFAAuF;AAIvF,MAAM,CAAC,MAAM,sBAAsB,GAA6B;IAC9D,4BAA4B;IAC5B,iBAAiB,EAAE,WAAW;IAC9B,qBAAqB,EAAE,WAAW;IAClC,UAAU,EAAE,WAAW;IACvB,mBAAmB,EAAE,WAAW;IAChC,gGAAgG;IAChG,iGAAiG;IACjG,iFAAiF;IACjF,wBAAwB,EAAE,WAAW;IACrC,cAAc,EAAE,WAAW;IAC3B,0BAA0B,EAAE,WAAW;IACvC,eAAe,EAAE,WAAW;IAC5B,+FAA+F;IAC/F,8FAA8F;IAC9F,+CAA+C;IAC/C,yBAAyB,EAAE,EAAE,SAAS,EAAE,sEAAsE,EAAE;IAChH,iGAAiG;IACjG,iGAAiG;IACjG,kGAAkG;IAClG,6EAA6E;IAC7E,iGAAiG;IACjG,uFAAuF;IACvF,uBAAuB,EAAE;QACvB,WAAW,EACT,yMAAyM;KAC5M;IACD,8FAA8F;IAC9F,4FAA4F;IAC5F,+FAA+F;IAC/F,yFAAyF;IACzF,sBAAsB,EAAE,EAAE,SAAS,EAAE,8FAA8F,EAAE;IACrI,sBAAsB,EAAE;QACtB,WAAW,EACT,0NAA0N;KAC7N;IAED,oCAAoC;IACpC,eAAe,EAAE,WAAW;IAC5B,aAAa,EAAE,WAAW;IAC1B,iGAAiG;IACjG,mGAAmG;IACnG,oGAAoG;IACpG,eAAe,EAAE,WAAW;IAC5B,+FAA+F;IAC/F,qEAAqE;IACrE,wBAAwB,EAAE,WAAW;IACrC,iGAAiG;IACjG,wEAAwE;IACxE,eAAe,EAAE,WAAW;IAC5B,iGAAiG;IACjG,iGAAiG;IACjG,4BAA4B;IAC5B,mBAAmB,EAAE,WAAW;IAChC,mBAAmB,EAAE,WAAW;IAChC,qFAAqF;IACrF,iGAAiG;IACjG,iGAAiG;IACjG,gEAAgE;IAChE,mBAAmB,EAAE,EAAE,WAAW,EAAE,2GAA2G,EAAE;IACjJ,sFAAsF;IACtF,OAAO,EAAE,EAAE,SAAS,EAAE,8BAA8B,EAAE;IACtD,KAAK,EAAE,WAAW;IAClB,EAAE,EAAE,WAAW;IACf,IAAI,EAAE,WAAW;IAEjB,oBAAoB;IACpB,KAAK,EAAE,WAAW;IAClB,UAAU,EAAE,WAAW;IACvB,8FAA8F;IAC9F,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,WAAW;IACrB,YAAY,EAAE,WAAW;IACzB,WAAW,EAAE,WAAW;IACxB,MAAM,EAAE,EAAE,WAAW,EAAE,8EAA8E,EAAE;IACvG,YAAY,EAAE,WAAW;IACzB,SAAS,EAAE,WAAW;IACtB,eAAe,EAAE,WAAW;IAC5B,IAAI,EAAE,EAAE,SAAS,EAAE,yCAAyC,EAAE;IAC9D,cAAc,EAAE,WAAW;IAC3B,eAAe,EAAE,WAAW;IAC5B,UAAU,EAAE,EAAE,SAAS,EAAE,yEAAyE,EAAE;IACpG,SAAS,EAAE,WAAW;CACvB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-everywhere/provider-discord",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Open Everywhere Discord provider — Discord channel and DM surfaces, gateway wiring, identity mapping and approval cards.",
   "keywords": [
     "agent",
@@ -168,7 +168,7 @@
     "test": "echo 'provider-discord: its test suite runs at the APP TIER (root scripts/) because the discord surface composes deeply with core internals (a custom gateway, admin approval cards, guild-admin bypass, routine dispatch) — see the root test chain (test:discord*, test:scenarios*, test:oe-commands, and the read/dispatch/audit/wake integration tests). This keeps the core adapter-api barrel a small port surface rather than exporting test-only internals.'"
   },
   "dependencies": {
-    "@open-everywhere/core": "0.4.0",
+    "@open-everywhere/core": "0.6.0",
     "zod": "4.5.4"
   },
   "peerDependencies": {