opencode-discord-notify 0.5.0 → 0.6.0

package/README-JP.md

@@ -65,7 +65,8 @@ OpenCode を再起動してください。
   - **指定可能キー**: `sessionID`, `permissionID`, `type`, `pattern`, `messageID`, `callID`, `partID`, `role`, `directory`, `projectID`
   - **デフォルト動作**（未設定・空文字）: 全て無効化（何も送信しない）
   - **全て送信したい場合**: 全キーを列挙してください
-  - **注意**: `session.created` は `DISCORD_SEND_PARAMS` に関わらず `sessionID`, `projectID`, `directory` を必ず含みます
+  - **注意**: `session.created` は `DISCORD_SEND_PARAMS` に関わらず `sessionID` を必ず含みます
+- `DISCORD_WEBHOOK_FALLBACK_URL`: フォールバック先のテキストチャネル webhook URL（任意。設定すると、`@everyone` または `@here` を含むメッセージが自動的にこの webhook にも送信されます。Forum webhook ではメンションが ping しない Discord の仕様上、有用）
 
 ## 仕様メモ
 
@@ -91,6 +92,11 @@ OpenCode を再起動してください。
   - `tool`: 通知しない
   - `reasoning`: 通知しない（内部思考が含まれる可能性があるため）
 - `DISCORD_SEND_PARAMS` の制御対象は embed の fields のみです（title/description/content/timestamp などは対象外）。また `share` は fields としては送りません（Session started の embed URL には `shareUrl` を使います）。
+- `DISCORD_WEBHOOK_FALLBACK_URL` が設定されている場合:
+  - `@everyone` または `@here` を含むメッセージ（`DISCORD_WEBHOOK_COMPLETE_MENTION` または `DISCORD_WEBHOOK_PERMISSION_MENTION` 経由）は、Forum webhook（スレッド投稿）とフォールバック先のテキストチャネル webhook の両方に自動的に送信されます。
+  - これにより、Forum webhook ではメンションが ping しない Discord の仕様上、確実に通知を届けることができます。
+  - フォールバックメッセージには、`DISCORD_SEND_PARAMS` の設定に関わらず、常に `sessionID` と `thread title` フィールドが含まれます（テキストチャネルでのコンテキスト提供のため）。`thread title` は Forum のスレッド名と同じ値（最初のユーザーテキスト、または存在しない場合はセッションタイトル）です。
+  - フォールバック送信は Forum スレッドキューとは独立しており、即座に実行されます。
 
 ## 動作確認（手動）
 

package/README.md

@@ -67,7 +67,8 @@ Optional:
   - **Allowed keys**: `sessionID`, `permissionID`, `type`, `pattern`, `messageID`, `callID`, `partID`, `role`, `directory`, `projectID`
   - **Default behavior** (unset/empty): all fields are disabled (nothing sent)
   - **To send all fields**: list all keys explicitly
-  - **Note**: `session.created` always includes `sessionID`, `projectID`, `directory` regardless
+  - **Note**: `session.created` always includes `sessionID` regardless
+- `DISCORD_WEBHOOK_FALLBACK_URL`: fallback webhook URL for text channel (optional; when set, messages containing `@everyone` or `@here` are automatically sent to this webhook as well; useful because Forum webhooks may not ping mentions due to Discord behavior)
 
 ## Notes / behavior
 
@@ -93,6 +94,11 @@ Optional:
   - `tool`: not posted
   - `reasoning`: not posted (to avoid exposing internal thoughts)
 - `DISCORD_SEND_PARAMS` controls embed fields only (it does not affect title/description/content/timestamp). `share` is not an embed field (but Session started uses `shareUrl` as the embed URL).
+- When `DISCORD_WEBHOOK_FALLBACK_URL` is set:
+  - Messages containing `@everyone` or `@here` (via `DISCORD_WEBHOOK_COMPLETE_MENTION` or `DISCORD_WEBHOOK_PERMISSION_MENTION`) are automatically sent to both the Forum webhook (as a thread post) and the fallback text channel webhook.
+  - This ensures reliable notifications while maintaining thread structure in Forums, since Forum webhooks may not ping mentions due to Discord behavior.
+  - Fallback messages always include `sessionID` and `thread title` fields, regardless of `DISCORD_SEND_PARAMS` settings, to provide context in the text channel. The `thread title` is the same as the Forum thread name (first user text, or session title if unavailable).
+  - Fallback sending is independent of the Forum thread queue and happens immediately.
 
 ## Manual test
 

package/dist/index.js

@@ -260,6 +260,49 @@ async function postDiscordWebhook(input, deps) {
     `Discord webhook failed: ${response.status} ${response.statusText} ${text}`
   );
 }
+async function postFallbackIfNeeded(input, deps) {
+  const {
+    body,
+    mention,
+    sessionID,
+    fallbackUrl,
+    firstUserTextBySession,
+    lastSessionInfo
+  } = input;
+  if (!fallbackUrl || !mention) return;
+  const fallbackBody = {
+    ...body,
+    // thread_nameは削除（テキストチャネルでは不要）
+    thread_name: void 0
+  };
+  if (fallbackBody.embeds && fallbackBody.embeds.length > 0) {
+    const originalEmbed = fallbackBody.embeds[0];
+    const threadTitle = firstUserTextBySession.get(sessionID) || lastSessionInfo.get(sessionID)?.title;
+    const additionalFields = buildFields([
+      ["sessionID", sessionID],
+      ["thread title", threadTitle]
+    ]);
+    fallbackBody.embeds = [
+      {
+        ...originalEmbed,
+        fields: [
+          ...originalEmbed.fields ?? [],
+          ...additionalFields ?? []
+        ]
+      }
+    ];
+  }
+  try {
+    await postDiscordWebhook(
+      {
+        webhookUrl: fallbackUrl,
+        body: fallbackBody
+      },
+      deps
+    );
+  } catch (e) {
+  }
+}
 var GLOBAL_GUARD_KEY = "__opencode_discord_notify_registered__";
 var plugin = async ({ client }) => {
   const globalWithGuard = globalThis;
@@ -281,6 +324,7 @@ var plugin = async ({ client }) => {
   const showErrorAlert = showErrorAlertRaw !== "0";
   const waitOnRateLimitMs = DEFAULT_RATE_LIMIT_WAIT_MS;
   const sendParams = parseSendParams(getEnv("DISCORD_SEND_PARAMS"));
+  const fallbackWebhookUrl = (getEnv("DISCORD_WEBHOOK_FALLBACK_URL") ?? "").trim() || void 0;
   const lastAlertAtByKey = /* @__PURE__ */ new Map();
   const sentTextPartIds = /* @__PURE__ */ new Set();
   const showToast = async ({ title, message, variant }) => {
@@ -517,11 +561,7 @@ var plugin = async ({ client }) => {
                     ["directory", info?.directory],
                     ["share", shareUrl]
                   ],
-                  withForcedSendParams(sendParams, [
-                    "sessionID",
-                    "projectID",
-                    "directory"
-                  ])
+                  withForcedSendParams(sendParams, ["sessionID"])
                 )
               )
             };
@@ -533,6 +573,7 @@ var plugin = async ({ client }) => {
             const p = event.properties;
             const sessionID = p?.sessionID;
             if (!sessionID) return;
+            const mention = buildPermissionMention();
             const embed = {
               title: "Permission required",
               description: p?.title,
@@ -552,33 +593,56 @@ var plugin = async ({ client }) => {
                 )
               )
             };
-            const mention = buildPermissionMention();
-            enqueueToThread(sessionID, {
+            const body = {
               content: mention ? `${mention.content}` : void 0,
               allowed_mentions: mention?.allowed_mentions,
               embeds: [embed]
-            });
+            };
+            enqueueToThread(sessionID, body);
+            await postFallbackIfNeeded(
+              {
+                body,
+                mention,
+                sessionID,
+                fallbackUrl: fallbackWebhookUrl,
+                firstUserTextBySession,
+                lastSessionInfo
+              },
+              postDeps
+            );
             return;
           }
           case "session.idle": {
             const sessionID = event.properties?.sessionID;
             if (!sessionID) return;
+            const mention = buildCompleteMention();
             const embed = {
               title: "Session completed",
               color: COLORS.success,
               fields: buildFields(
                 filterSendFields(
                   [["sessionID", sessionID]],
-                  withForcedSendParams(sendParams, ["sessionID"])
+                  sendParams
                 )
               )
             };
-            const mention = buildCompleteMention();
-            enqueueToThread(sessionID, {
+            const body = {
               content: mention ? `${mention.content}` : void 0,
               allowed_mentions: mention?.allowed_mentions,
               embeds: [embed]
-            });
+            };
+            enqueueToThread(sessionID, body);
+            await postFallbackIfNeeded(
+              {
+                body,
+                mention,
+                sessionID,
+                fallbackUrl: fallbackWebhookUrl,
+                firstUserTextBySession,
+                lastSessionInfo
+              },
+              postDeps
+            );
             return;
           }
           case "session.error": {
@@ -605,11 +669,24 @@ var plugin = async ({ client }) => {
             };
             if (!sessionID) return;
             const mention = buildCompleteMention();
-            enqueueToThread(sessionID, {
-              content: mention ? `$Session error` : void 0,
+            const body = {
+              // 🐛 既存バグ修正: `$Session error` → `${mention.content}`
+              content: mention ? `${mention.content}` : void 0,
               allowed_mentions: mention?.allowed_mentions,
               embeds: [embed]
-            });
+            };
+            enqueueToThread(sessionID, body);
+            await postFallbackIfNeeded(
+              {
+                body,
+                mention,
+                sessionID,
+                fallbackUrl: fallbackWebhookUrl,
+                firstUserTextBySession,
+                lastSessionInfo
+              },
+              postDeps
+            );
             await flushPending(sessionID);
             return;
           }
@@ -691,7 +768,8 @@ plugin.__test__ = {
   toIsoTimestamp,
   postDiscordWebhook,
   parseSendParams,
-  getTodoStatusMarker
+  getTodoStatusMarker,
+  postFallbackIfNeeded
 };
 var index_default = plugin;
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-discord-notify",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "A plugin that posts OpenCode events to a Discord webhook.",
   "license": "MIT",
   "type": "module",