botmux 2.62.0 → 2.63.0

package/dist/dashboard/web/ui.d.ts

@@ -1,25 +1,39 @@
 import { type DashboardLocale } from './i18n.js';
-import { type ResolvedTheme, type ThemeMode } from './preferences.js';
+import { type ResolvedTheme, type ThemeMode, type SkinId } from './preferences.js';
 type UiListener = () => void;
 declare class DashboardUiState {
     locale: DashboardLocale;
     themeMode: ThemeMode;
     resolvedTheme: ResolvedTheme;
+    skin: SkinId;
     private listeners;
     private translate;
     private mediaQuery;
     init(): void;
     t(key: string, params?: Record<string, string | number>): string;
     setLocale(locale: DashboardLocale): void;
-    setThemeMode(mode: ThemeMode): void;
+    get theme(): string;
+    setTheme(value: string): void;
     on(fn: UiListener): () => void;
     private emit;
     private applyTheme;
+    private applySkin;
     private applyLocale;
 }
 export declare const ui: DashboardUiState;
 export declare function t(key: string, params?: Record<string, string | number>): string;
 export declare function escapeHtml(s: string): string;
 export declare function relTime(ms: number): string;
+export declare function botOrbStyle(name: string): string;
+export declare function loadNameMaps(): Promise<void>;
+/** 会话所属 bot 的显示名：注册表友好名 → 会话自带 botName（非 id 时）→ id。 */
+export declare function botDisplayName(s: Record<string, any>): string;
+/** 会话所在群聊的标题；单聊或群列表里查不到时返回 null（由调用方回退）。 */
+export declare function chatDisplayTitle(s: Record<string, any>): string | null;
+/** 话题首条消息常以 "@bot " 开头（群里要 @ 才能触发）——展示时剥掉开头的
+ *  连续 mention，只留真正的消息内容；剥空了（纯 @ 消息）就保留原文。 */
+export declare function stripMentionPrefix(title: unknown): string;
+/** 会话当前是否卡在等人，以及等什么（全局 strip 和工作台共用同一判定）。 */
+export declare function attentionReason(s: Record<string, any>): string | null;
 export {};
 //# sourceMappingURL=ui.d.ts.map

package/dist/dashboard/web/ui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../src/dashboard/web/ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,WAAW,CAAC;AACnB,OAAO,EAIL,KAAK,aAAa,EAClB,KAAK,SAAS,EACf,MAAM,kBAAkB,CAAC;AAE1B,KAAK,UAAU,GAAG,MAAM,IAAI,CAAC;AAE7B,cAAM,gBAAgB;IACpB,MAAM,EAAE,eAAe,CAAQ;IAC/B,SAAS,EAAE,SAAS,CAAY;IAChC,aAAa,EAAE,aAAa,CAAW;IACvC,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,SAAS,CAA0C;IAC3D,OAAO,CAAC,UAAU,CAA+B;IAEjD,IAAI,IAAI,IAAI;IAcZ,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM;IAIhE,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IASxC,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAQnC,EAAE,CAAC,EAAE,EAAE,UAAU,GAAG,MAAM,IAAI;IAK9B,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,WAAW;CAGpB;AAOD,eAAO,MAAM,EAAE,kBAAyB,CAAC;AAEzC,wBAAgB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM,CAE/E;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAO1C"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../src/dashboard/web/ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,WAAW,CAAC;AACnB,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,MAAM,EACZ,MAAM,kBAAkB,CAAC;AAI1B,KAAK,UAAU,GAAG,MAAM,IAAI,CAAC;AAE7B,cAAM,gBAAgB;IACpB,MAAM,EAAE,eAAe,CAAQ;IAC/B,SAAS,EAAE,SAAS,CAAY;IAChC,aAAa,EAAE,aAAa,CAAW;IACvC,IAAI,EAAE,MAAM,CAAa;IACzB,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,SAAS,CAA0C;IAC3D,OAAO,CAAC,UAAU,CAA+B;IAEjD,IAAI,IAAI,IAAI;IAgBZ,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM;IAIhE,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IAWxC,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAiB7B,EAAE,CAAC,EAAE,EAAE,UAAU,GAAG,MAAM,IAAI;IAK9B,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,WAAW;CAGpB;AAoBD,eAAO,MAAM,EAAE,kBAAyB,CAAC;AAEzC,wBAAgB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM,CAE/E;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAO1C;AAeD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMhD;AAWD,wBAAgB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAqB5C;AAED,uDAAuD;AACvD,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAK7D;AAED,4CAA4C;AAC5C,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,GAAG,IAAI,CAEtE;AAED;6CAC6C;AAC7C,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAIzD;AAED,6CAA6C;AAC7C,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,GAAG,IAAI,CAMrE"}

package/dist/dashboard/web/ui.js

@@ -1,9 +1,12 @@
 import { DASHBOARD_LOCALE_STORAGE_KEY, createDashboardTranslator, readStoredDashboardLocale, } from './i18n.js';
-import { THEME_STORAGE_KEY, readStoredThemeMode, resolveThemeMode, } from './preferences.js';
+import { THEME_STORAGE_KEY, SKIN_STORAGE_KEY, readStoredThemeMode, readStoredSkin, resolveThemeMode, } from './preferences.js';
+import { applyCyberFx } from './cyber-fx.js';
+import { playSkinIntro } from './skin-intro.js';
 class DashboardUiState {
     locale = 'zh';
     themeMode = 'system';
     resolvedTheme = 'light';
+    skin = 'default';
     listeners = new Set();
     translate = createDashboardTranslator(this.locale);
     mediaQuery = null;
@@ -12,12 +15,14 @@ class DashboardUiState {
         this.locale = readStoredDashboardLocale(w?.localStorage, navigatorLanguages());
         this.translate = createDashboardTranslator(this.locale);
         this.themeMode = readStoredThemeMode(w?.localStorage);
+        this.skin = readStoredSkin(w?.localStorage);
         this.mediaQuery = w?.matchMedia?.('(prefers-color-scheme: dark)') ?? null;
         this.mediaQuery?.addEventListener('change', () => {
             this.applyTheme();
             this.emit();
         });
         this.applyTheme();
+        this.applySkin();
         this.applyLocale();
     }
     t(key, params) {
@@ -32,12 +37,25 @@ class DashboardUiState {
         this.applyLocale();
         this.emit();
     }
-    setThemeMode(mode) {
-        if (this.themeMode === mode)
-            return;
-        this.themeMode = mode;
-        window.localStorage.setItem(THEME_STORAGE_KEY, mode);
+    // The topbar exposes a single "Theme" dropdown whose value is either a base
+    // colour mode (system/light/dark → the `default` skin) or a named skin id.
+    get theme() {
+        return this.skin === 'default' ? this.themeMode : this.skin;
+    }
+    setTheme(value) {
+        const isMode = value === 'system' || value === 'light' || value === 'dark';
+        const nextSkin = isMode ? 'default' : value;
+        const skinChanged = nextSkin !== this.skin;
+        if (isMode && this.themeMode !== value) {
+            this.themeMode = value;
+            window.localStorage.setItem(THEME_STORAGE_KEY, this.themeMode);
+        }
+        if (skinChanged) {
+            this.skin = nextSkin;
+            window.localStorage.setItem(SKIN_STORAGE_KEY, this.skin);
+        }
         this.applyTheme();
+        this.applySkin(skinChanged);
         this.emit();
     }
     on(fn) {
@@ -50,13 +68,40 @@ class DashboardUiState {
     }
     applyTheme() {
         this.resolvedTheme = resolveThemeMode(this.themeMode, !!this.mediaQuery?.matches);
-        document.documentElement.dataset.theme = this.resolvedTheme;
+        // A named skin ships its own light/dark palette, so drive data-theme from the
+        // skin's intrinsic mode — that way the base theme's light/dark component rules
+        // (incl. PR #123's dark-only overrides) match the skin instead of fighting it.
+        // The default skin follows the user's system/light/dark choice.
+        const themeAttr = this.skin === 'default' ? this.resolvedTheme : SKIN_THEME[this.skin];
+        document.documentElement.dataset.theme = themeAttr;
         document.documentElement.dataset.themeMode = this.themeMode;
     }
+    // `animate` plays the boot loader — true when the user actively switches in,
+    // false on initial load so a refresh doesn't replay the 3s decrypt overlay.
+    applySkin(animate = false) {
+        document.documentElement.dataset.skin = this.skin;
+        applyCyberFx(this.skin === 'cyber', animate);
+        // 2077 plays its own boot loader; the other skins get a themed switch-in intro.
+        if (animate && this.skin !== 'cyber' && this.skin !== 'default') {
+            playSkinIntro(this.skin);
+        }
+    }
     applyLocale() {
         document.documentElement.lang = this.locale === 'zh' ? 'zh-CN' : 'en';
     }
 }
+// Each named skin's intrinsic light/dark mode (drives the data-theme attribute).
+const SKIN_THEME = {
+    default: 'light',
+    cyber: 'dark',
+    genshin: 'light',
+    fallout: 'dark',
+    prts: 'dark',
+    bluearchive: 'dark',
+    zzz: 'dark',
+    dragonball: 'light',
+    ikun: 'dark',
+};
 function navigatorLanguages() {
     if (typeof navigator === 'undefined')
         return [];
@@ -81,4 +126,89 @@ export function relTime(ms) {
         return Math.floor(diff / 3_600_000) + 'h';
     return Math.floor(diff / 86_400_000) + 'd';
 }
+// ── 数字员工视觉：每个 bot 一颗专属色相的"数字生命球" ─────────────────────
+// 按名字 hash 从固定色板取渐变对，同名永远同色，跨页面一致。
+const ORB_PALETTE = [
+    { c1: '#5be3ff', c2: '#4f8bff' },
+    { c1: '#b89bff', c2: '#6b4df0' },
+    { c1: '#7ce0c3', c2: '#2e9e8f' },
+    { c1: '#8fb4ff', c2: '#3b62d8' },
+    { c1: '#ffd28f', c2: '#d8783b' },
+    { c1: '#7df0a8', c2: '#1f9e63' },
+    { c1: '#9fd0ff', c2: '#4878c8' },
+    { c1: '#ff9fb8', c2: '#d84a78' },
+];
+export function botOrbStyle(name) {
+    let h = 0;
+    const key = String(name ?? '');
+    for (let i = 0; i < key.length; i++)
+        h = (h * 31 + key.charCodeAt(i)) >>> 0;
+    const { c1, c2 } = ORB_PALETTE[h % ORB_PALETTE.length];
+    return `--c1:${c1};--c2:${c2}`;
+}
+// ── 跨页共享的展示名解析（bot 友好名 / 群聊标题）────────────────────────────
+// daemon IPC 上报的 SessionRow.botName 历史上填的是 larkAppId（friendly name
+// probe 回来只回写了注册表 descriptor，没回填 IPC 的 cachedBotName），这里用
+// /api/groups 的注册表 + 群列表把 id 解析成人话。加载失败静默降级显示原值——
+// 纯展示增强，不挡核心功能。
+const botNameByAppId = new Map();
+const chatNameById = new Map();
+let nameMapsPromise = null;
+export function loadNameMaps() {
+    nameMapsPromise ??= (async () => {
+        try {
+            const r = await fetch('/api/groups');
+            if (!r.ok)
+                throw new Error(`HTTP ${r.status}`);
+            const data = await r.json();
+            for (const b of data.bots ?? []) {
+                if (b.larkAppId && b.botName && b.botName !== b.larkAppId) {
+                    botNameByAppId.set(b.larkAppId, String(b.botName));
+                }
+            }
+            for (const c of data.chats ?? []) {
+                if (c.chatId && c.name)
+                    chatNameById.set(c.chatId, String(c.name));
+            }
+        }
+        catch {
+            // 失败不缓存（dashboard 刚启动 /api/groups 可能短暂 503）——
+            // 清掉 memo，下一个页面 mount / strip 重绘再重试；期间显示原始 id。
+            nameMapsPromise = null;
+        }
+    })();
+    return nameMapsPromise;
+}
+/** 会话所属 bot 的显示名：注册表友好名 → 会话自带 botName（非 id 时）→ id。 */
+export function botDisplayName(s) {
+    const mapped = s.larkAppId ? botNameByAppId.get(s.larkAppId) : undefined;
+    if (mapped)
+        return mapped;
+    if (s.botName && s.botName !== s.larkAppId)
+        return String(s.botName);
+    return String(s.botName ?? s.larkAppId ?? '-');
+}
+/** 会话所在群聊的标题；单聊或群列表里查不到时返回 null（由调用方回退）。 */
+export function chatDisplayTitle(s) {
+    return (s.chatId && chatNameById.get(s.chatId)) || null;
+}
+/** 话题首条消息常以 "@bot " 开头（群里要 @ 才能触发）——展示时剥掉开头的
+ *  连续 mention，只留真正的消息内容；剥空了（纯 @ 消息）就保留原文。 */
+export function stripMentionPrefix(title) {
+    const raw = String(title ?? '');
+    const out = raw.replace(/^(?:@\S+\s*)+/, '').trim();
+    return out || raw;
+}
+/** 会话当前是否卡在等人，以及等什么（全局 strip 和工作台共用同一判定）。 */
+export function attentionReason(s) {
+    if (s.status === 'closed')
+        return null;
+    if (s.pendingRepo)
+        return t('sessions.board.signalRepo');
+    if (s.tuiPromptActive)
+        return t('sessions.board.signalPrompt');
+    if (s.status === 'limited')
+        return t('sessions.board.signalLimited');
+    return null;
+}
 //# sourceMappingURL=ui.js.map

package/dist/dashboard/web/ui.js.map

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

package/dist/dashboard/webhook-routes.d.ts

@@ -1,6 +1,5 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { type ConnectorDefinition } from '../services/connector-store.js';
-import { type WebhookLifecycleRecord } from '../services/webhook-lifecycle-store.js';
 import { type TriggerApiDeps } from './trigger-api.js';
 export type WebhookRouteDeps = TriggerApiDeps & {
     createLifecycleGroup?: (connector: ConnectorDefinition, args: {
@@ -9,11 +8,8 @@ export type WebhookRouteDeps = TriggerApiDeps & {
         chatId: string;
         creatorLarkAppId?: string;
     }>;
-    closeLifecycleGroup?: (connector: ConnectorDefinition, record: WebhookLifecycleRecord) => Promise<{
-        ok: boolean;
-        error?: string;
-    }>;
 };
 export declare function verifyWebhookSignature(secret: string, ts: string, rawBody: Buffer, sig: string): boolean;
+export declare function verifyWebhookToken(secret: string, presented: string): boolean;
 export declare function handleWebhookRoute(req: IncomingMessage, res: ServerResponse, url: URL, deps: WebhookRouteDeps): Promise<boolean>;
 //# sourceMappingURL=webhook-routes.d.ts.map

package/dist/dashboard/webhook-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook-routes.d.ts","sourceRoot":"","sources":["../../src/dashboard/webhook-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAgB,KAAK,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAKxF,OAAO,EAKL,KAAK,sBAAsB,EAC5B,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAwC,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAK7F,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG;IAC9C,oBAAoB,CAAC,EAAE,CACrB,SAAS,EAAE,mBAAmB,EAC9B,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,KACvB,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5D,mBAAmB,CAAC,EAAE,CACpB,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,sBAAsB,KAC3B,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/C,CAAC;AAgCF,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAQxG;AAkGD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,OAAO,CAAC,CAuMlB"}
+{"version":3,"file":"webhook-routes.d.ts","sourceRoot":"","sources":["../../src/dashboard/webhook-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAgB,KAAK,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAWxF,OAAO,EAAwC,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAK7F,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG;IAC9C,oBAAoB,CAAC,EAAE,CACrB,SAAS,EAAE,mBAAmB,EAC9B,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,KACvB,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC7D,CAAC;AAgCF,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAQxG;AAKD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAK7E;AAkHD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,OAAO,CAAC,CAuNlB"}

package/dist/dashboard/webhook-routes.js

@@ -1,9 +1,9 @@
-import { createHmac, timingSafeEqual } from 'node:crypto';
+import { createHmac, randomUUID, timingSafeEqual } from 'node:crypto';
 import { getConnector } from '../services/connector-store.js';
 import { getWebhookSecret } from '../services/webhook-key.js';
 import { appendTriggerLog } from '../services/trigger-log-store.js';
-import { extractWebhookLifecycle } from '../services/webhook-lifecycle-extractors.js';
-import { activateWebhookLifecycleGroup, beginWebhookLifecycleFiring, failWebhookLifecycleGroup, resolveWebhookLifecycleGroup, } from '../services/webhook-lifecycle-store.js';
+import { extractDedupKey } from '../services/webhook-lifecycle-extractors.js';
+import { activateWebhookLifecycleGroup, beginWebhookLifecycleFiring, failWebhookLifecycleGroup, } from '../services/webhook-lifecycle-store.js';
 import { jsonRes } from './workflow-api.js';
 import { dispatchTriggerRequest, newTriggerId } from './trigger-api.js';
 const replayNonces = new Map();
@@ -46,6 +46,35 @@ export function verifyWebhookSignature(secret, ts, rawBody, sig) {
     const got = parseSignature(sig);
     return !!got && got.length === expected.length && timingSafeEqual(got, expected);
 }
+// Bearer-token mode: the presented token IS the secret. Constant-time compare,
+// no body integrity / replay protection (that's the usability/security trade —
+// see `token` verify mode). Empty presented token never matches.
+export function verifyWebhookToken(secret, presented) {
+    if (!secret || !presented)
+        return false;
+    const a = Buffer.from(secret, 'utf-8');
+    const b = Buffer.from(presented, 'utf-8');
+    return a.length === b.length && timingSafeEqual(a, b);
+}
+// Token carriers, in priority order: path segment > ?token= query > Authorization
+// Bearer > x-botmux-token header. Path is the default (whole URL = credential).
+function extractWebhookToken(req, url, pathToken) {
+    if (pathToken)
+        return pathToken;
+    const fromQuery = url.searchParams.get('token');
+    if (fromQuery)
+        return fromQuery;
+    const auth = headerValue(req, 'authorization');
+    if (auth) {
+        const m = auth.match(/^Bearer\s+(.+)$/i);
+        if (m)
+            return m[1].trim();
+    }
+    const fromHeader = headerValue(req, 'x-botmux-token');
+    if (fromHeader)
+        return fromHeader;
+    return undefined;
+}
 function timestampOk(ts, toleranceSeconds) {
     const n = Number(ts);
     if (!Number.isFinite(n))
@@ -136,7 +165,10 @@ function webhookOkLog(connectorId, action, message) {
     return { ok: true, triggerId, action, message };
 }
 export async function handleWebhookRoute(req, res, url, deps) {
-    const m = url.pathname.match(/^\/webhook\/([^/]+)$/);
+    // Second path segment (optional) carries the bearer token for `token` mode:
+    //   /webhook/<connectorId>            → token via query / Authorization header
+    //   /webhook/<connectorId>/<token>    → token baked into the URL (default)
+    const m = url.pathname.match(/^\/webhook\/([^/]+)(?:\/([^/]+))?$/);
     if (!m)
         return false;
     if (req.method !== 'POST') {
@@ -144,6 +176,7 @@ export async function handleWebhookRoute(req, res, url, deps) {
         return true;
     }
     const connectorId = decodeURIComponent(m[1]);
+    const pathToken = m[2] ? decodeURIComponent(m[2]) : undefined;
     const connector = getConnector(connectorId);
     if (!connector || !connector.enabled) {
         webhookError(res, 404, connectorId, 'bad_request', 'unknown or disabled connector');
@@ -161,92 +194,108 @@ export async function handleWebhookRoute(req, res, url, deps) {
         webhookError(res, 413, connectorId, 'bad_request', 'request body too large');
         return true;
     }
+    // `requestId` becomes source.requestId on the trigger. HMAC mode reuses the
+    // caller's nonce; token mode has no nonce so we mint one.
     const verify = connector.verify;
-    const ts = headerValue(req, verify.timestampHeader);
-    const nonce = headerValue(req, verify.nonceHeader);
-    const sig = headerValue(req, verify.signatureHeader);
-    if (!ts || !nonce || !sig) {
-        webhookError(res, 401, connectorId, 'invalid_signature', 'missing signature, timestamp, or nonce header');
-        return true;
-    }
-    if (!timestampOk(ts, verify.toleranceSeconds)) {
-        webhookError(res, 401, connectorId, 'replay', 'timestamp outside tolerance window');
-        return true;
-    }
-    if (!claimNonce(connector.id, nonce, verify.toleranceSeconds)) {
-        webhookError(res, 409, connectorId, 'replay', 'nonce replay detected');
-        return true;
-    }
-    const secret = getWebhookSecret(verify.secretRef);
-    if (!secret || !verifyWebhookSignature(secret, ts, rawBody, sig)) {
-        webhookError(res, 401, connectorId, 'invalid_signature', 'signature verification failed');
-        return true;
+    let requestId;
+    if (verify.type === 'token') {
+        const presented = extractWebhookToken(req, url, pathToken);
+        const secret = getWebhookSecret(verify.secretRef);
+        if (!presented || !secret || !verifyWebhookToken(secret, presented)) {
+            webhookError(res, 401, connectorId, 'invalid_signature', 'token verification failed');
+            return true;
+        }
+        requestId = `whk_${randomUUID()}`;
     }
-    const parsed = parsePayload(rawBody);
-    if (connector.target.mode === 'new-group') {
-        const extracted = extractWebhookLifecycle(parsed.payload, connector.lifecycleExtractors);
-        if (!extracted.ok) {
-            webhookError(res, 400, connectorId, 'lifecycle_extract_failed', extracted.error);
+    else {
+        const ts = headerValue(req, verify.timestampHeader);
+        const nonce = headerValue(req, verify.nonceHeader);
+        const sig = headerValue(req, verify.signatureHeader);
+        if (!ts || !nonce || !sig) {
+            webhookError(res, 401, connectorId, 'invalid_signature', 'missing signature, timestamp, or nonce header');
             return true;
         }
-        const { dedupKey, status } = extracted.lifecycle;
-        if (status === 'resolved') {
-            const resolved = await resolveWebhookLifecycleGroup(connector.id, dedupKey);
-            let closeResult;
-            if (resolved.action === 'close' && resolved.record?.chatId) {
-                closeResult = deps.closeLifecycleGroup
-                    ? await deps.closeLifecycleGroup(connector, resolved.record)
-                    : { ok: false, error: 'closeLifecycleGroup hook not configured' };
-            }
-            const body = webhookOkLog(connector.id, 'ignored', `lifecycle ${resolved.action}`);
-            jsonRes(res, closeResult?.ok === false ? 502 : 200, {
-                ...body,
-                lifecycle: { dedupKey, status, action: resolved.action, chatId: resolved.record?.chatId },
-                ...(closeResult?.ok === false ? { ok: false, errorCode: 'trigger_failed', error: closeResult.error } : {}),
-            });
+        if (!timestampOk(ts, verify.toleranceSeconds)) {
+            webhookError(res, 401, connectorId, 'replay', 'timestamp outside tolerance window');
+            return true;
+        }
+        if (!claimNonce(connector.id, nonce, verify.toleranceSeconds)) {
+            webhookError(res, 409, connectorId, 'replay', 'nonce replay detected');
             return true;
         }
-        const begun = await beginWebhookLifecycleFiring(connector.id, dedupKey);
-        if (begun.action === 'creating') {
-            jsonRes(res, 202, {
-                ...webhookOkLog(connector.id, 'ignored', 'lifecycle group creation already in progress'),
-                lifecycle: { dedupKey, status, action: 'creating' },
-            });
+        const secret = getWebhookSecret(verify.secretRef);
+        if (!secret || !verifyWebhookSignature(secret, ts, rawBody, sig)) {
+            webhookError(res, 401, connectorId, 'invalid_signature', 'signature verification failed');
             return true;
         }
-        let chatId = begun.action === 'reuse' ? begun.record.chatId : undefined;
-        if (begun.action === 'create') {
+        requestId = nonce;
+    }
+    const parsed = parsePayload(rawBody);
+    if (connector.target.mode === 'new-group') {
+        // Dedup is optional. Configured → events with the same extracted value share
+        // one group (create once, reuse after). Not configured → every event spins
+        // up a fresh group. (No firing/resolved status; groups are never auto-closed.)
+        const dedupPath = connector.lifecycleExtractors?.dedupKey;
+        let chatId;
+        let dedupKey;
+        let action = 'create';
+        if (dedupPath) {
+            const value = extractDedupKey(parsed.payload, dedupPath);
+            if (!value) {
+                webhookError(res, 400, connectorId, 'lifecycle_extract_failed', 'dedup_key_not_found');
+                return true;
+            }
+            dedupKey = value;
+            const begun = await beginWebhookLifecycleFiring(connector.id, dedupKey);
+            if (begun.action === 'creating') {
+                jsonRes(res, 202, {
+                    ...webhookOkLog(connector.id, 'ignored', 'lifecycle group creation already in progress'),
+                    lifecycle: { dedupKey, action: 'creating' },
+                });
+                return true;
+            }
+            if (begun.action === 'reuse') {
+                action = 'reuse';
+                chatId = begun.record.chatId;
+            }
+            else {
+                if (!deps.createLifecycleGroup) {
+                    await failWebhookLifecycleGroup(connector.id, dedupKey, begun.record.lifecycleId);
+                    webhookError(res, 501, connector.id, 'group_create_failed', 'createLifecycleGroup hook not configured');
+                    return true;
+                }
+                let created;
+                try {
+                    created = await deps.createLifecycleGroup(connector, { dedupKey });
+                }
+                catch (e) {
+                    await failWebhookLifecycleGroup(connector.id, dedupKey, begun.record.lifecycleId);
+                    webhookError(res, 502, connector.id, 'group_create_failed', e?.message ?? String(e));
+                    return true;
+                }
+                const activated = await activateWebhookLifecycleGroup(connector.id, dedupKey, begun.record.lifecycleId, created.chatId, { creatorLarkAppId: created.creatorLarkAppId });
+                if (activated.status !== 'active' || !activated.record?.chatId) {
+                    webhookError(res, 409, connector.id, 'replay', 'lifecycle record was replaced before activation');
+                    return true;
+                }
+                chatId = activated.record.chatId;
+            }
+        }
+        else {
+            // No dedup: a brand-new group per event (the group name uses the requestId
+            // for uniqueness). No lifecycle store record is kept — nothing to reuse.
             if (!deps.createLifecycleGroup) {
-                await failWebhookLifecycleGroup(connector.id, dedupKey, begun.record.lifecycleId);
                 webhookError(res, 501, connector.id, 'group_create_failed', 'createLifecycleGroup hook not configured');
                 return true;
             }
-            let created;
             try {
-                created = await deps.createLifecycleGroup(connector, { dedupKey });
+                const created = await deps.createLifecycleGroup(connector, { dedupKey: requestId.slice(0, 16) });
+                chatId = created.chatId;
             }
             catch (e) {
-                await failWebhookLifecycleGroup(connector.id, dedupKey, begun.record.lifecycleId);
                 webhookError(res, 502, connector.id, 'group_create_failed', e?.message ?? String(e));
                 return true;
             }
-            const activated = await activateWebhookLifecycleGroup(connector.id, dedupKey, begun.record.lifecycleId, created.chatId, { creatorLarkAppId: created.creatorLarkAppId });
-            if (activated.status === 'pending_resolved') {
-                const closeResult = deps.closeLifecycleGroup && activated.record
-                    ? await deps.closeLifecycleGroup(connector, activated.record)
-                    : { ok: true };
-                jsonRes(res, closeResult.ok ? 200 : 502, {
-                    ...webhookOkLog(connector.id, 'ignored', 'lifecycle resolved before group activation'),
-                    lifecycle: { dedupKey, status: 'resolved', action: 'closed', chatId: created.chatId },
-                    ...(closeResult.ok ? {} : { ok: false, errorCode: 'trigger_failed', error: closeResult.error }),
-                });
-                return true;
-            }
-            if (activated.status !== 'active' || !activated.record?.chatId) {
-                webhookError(res, 409, connector.id, 'replay', 'lifecycle record was replaced before activation');
-                return true;
-            }
-            chatId = activated.record.chatId;
         }
         if (!chatId) {
             webhookError(res, 500, connector.id, 'trigger_failed', 'lifecycle group has no chatId');
@@ -256,7 +305,7 @@ export async function handleWebhookRoute(req, res, url, deps) {
             source: {
                 type: 'webhook',
                 connectorId: connector.id,
-                requestId: nonce,
+                requestId,
                 receivedAt: new Date().toISOString(),
             },
             target: {
@@ -273,10 +322,11 @@ export async function handleWebhookRoute(req, res, url, deps) {
                 payload: parsed.payload,
                 ...(connector.promptEnvelope.includeRawText ? { rawText: parsed.rawText } : {}),
             },
-            options: { dedupKey, status },
+            ...(connector.promptEnvelope.instruction ? { instruction: connector.promptEnvelope.instruction } : {}),
+            options: dedupKey ? { dedupKey } : {},
         };
         const result = await dispatchTriggerRequest(trigger, deps);
-        jsonRes(res, result.status, { ...result.body, lifecycle: { dedupKey, action: begun.action, chatId } });
+        jsonRes(res, result.status, { ...result.body, lifecycle: { ...(dedupKey ? { dedupKey } : {}), action, chatId } });
         return true;
     }
     const chatId = connector.target.mode === 'fixed'
@@ -295,7 +345,7 @@ export async function handleWebhookRoute(req, res, url, deps) {
         source: {
             type: 'webhook',
             connectorId: connector.id,
-            requestId: nonce,
+            requestId,
             receivedAt: new Date().toISOString(),
         },
         target: {
@@ -312,6 +362,7 @@ export async function handleWebhookRoute(req, res, url, deps) {
             payload: parsed.payload,
             ...(connector.promptEnvelope.includeRawText ? { rawText: parsed.rawText } : {}),
         },
+        ...(connector.promptEnvelope.instruction ? { instruction: connector.promptEnvelope.instruction } : {}),
         options: {},
     };
     const result = await dispatchTriggerRequest(trigger, deps);