botmux 2.97.0 → 2.98.0

package/dist/core/dashboard-url.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Builds the public URL for the web dashboard, given a token.
+ *
+ * When 远程访问 is enabled AND this machine is bound to the central platform, the
+ * URL routes through the machine subdomain
+ * (`https://m-<machineId>.<platformHost>/?t=<token>`): the platform
+ * reverse-proxies that subdomain to this host's local dashboard, which still
+ * enforces the `?t=` token itself, so the link is reachable centrally with no
+ * `:port`. When 远程访问 is off (or the machine isn't bound) the platform base is
+ * null and we fall back to the local `http://<externalHost>:<port>/` form.
+ *
+ * Mirrors buildTerminalUrl (terminal-url.ts) and publicWebhookUrl
+ * (dashboard/connector-api.ts) so dashboard, terminal, and webhook links all
+ * flip to the platform together under the single 远程访问 switch — instead of the
+ * dashboard link being the one place that always stays local.
+ */
+export declare function buildDashboardUrl(opts: {
+    host: string;
+    port: number | string;
+    token?: string;
+}): string;
+//# sourceMappingURL=dashboard-url.d.ts.map

package/dist/core/dashboard-url.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dashboard-url.d.ts","sourceRoot":"","sources":["../../src/core/dashboard-url.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAIvG"}

package/dist/core/dashboard-url.js

@@ -0,0 +1,24 @@
+import { platformMachineBaseUrl } from '../platform/binding.js';
+import { isRemoteAccessEnabled } from '../global-config.js';
+/**
+ * Builds the public URL for the web dashboard, given a token.
+ *
+ * When 远程访问 is enabled AND this machine is bound to the central platform, the
+ * URL routes through the machine subdomain
+ * (`https://m-<machineId>.<platformHost>/?t=<token>`): the platform
+ * reverse-proxies that subdomain to this host's local dashboard, which still
+ * enforces the `?t=` token itself, so the link is reachable centrally with no
+ * `:port`. When 远程访问 is off (or the machine isn't bound) the platform base is
+ * null and we fall back to the local `http://<externalHost>:<port>/` form.
+ *
+ * Mirrors buildTerminalUrl (terminal-url.ts) and publicWebhookUrl
+ * (dashboard/connector-api.ts) so dashboard, terminal, and webhook links all
+ * flip to the platform together under the single 远程访问 switch — instead of the
+ * dashboard link being the one place that always stays local.
+ */
+export function buildDashboardUrl(opts) {
+    const platformBase = isRemoteAccessEnabled() ? platformMachineBaseUrl() : null;
+    const origin = platformBase ?? `http://${opts.host}:${opts.port}`;
+    return opts.token ? `${origin}/?t=${opts.token}` : `${origin}/`;
+}
+//# sourceMappingURL=dashboard-url.js.map

package/dist/core/dashboard-url.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dashboard-url.js","sourceRoot":"","sources":["../../src/core/dashboard-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAA6D;IAC7F,MAAM,YAAY,GAAG,qBAAqB,EAAE,CAAC,CAAC,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/E,MAAM,MAAM,GAAG,YAAY,IAAI,UAAU,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;IAClE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC;AAClE,CAAC"}

package/dist/daemon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../src/daemon.ts"],"names":[],"mappings":"AAkBA,OAAO,EAA8G,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAkBhK,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAiGrD,OAAO,EAAE,oBAAoB,EAA6B,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,sBAAsB,EAAiB,MAAM,wBAAwB,CAAC;AAqPpF,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmClK;AAED,iBAAe,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,MAAe,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA8D3I;AAMD,eAAO,MAAM,uBAAuB,qBAAe,CAAC;AACpD,eAAO,MAAM,yBAAyB,4BAAiB,CAAC;AAqCxD,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,CA6ClB;AAED,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAMpB;AAoKD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,CA0C5G;AA65CD;;;;;;;;;;;GAWG;AACH,iBAAe,uBAAuB,CAAC,GAAG,EAAE;IAC1C,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB;;;;GAiBA;AAED,eAAO,MAAM,kCAAkC,gCAA0B,CAAC;AAq/C1E,wBAAsB,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAidlE"}
+{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../src/daemon.ts"],"names":[],"mappings":"AAmBA,OAAO,EAA8G,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAkBhK,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAiGrD,OAAO,EAAE,oBAAoB,EAA6B,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,sBAAsB,EAAiB,MAAM,wBAAwB,CAAC;AAqPpF,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmClK;AAED,iBAAe,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,MAAe,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA8D3I;AAMD,eAAO,MAAM,uBAAuB,qBAAe,CAAC;AACpD,eAAO,MAAM,yBAAyB,4BAAiB,CAAC;AAqCxD,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,CA6ClB;AAED,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAIpB;AAED,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,SAAS,CAMpB;AAoKD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,CA0C5G;AA65CD;;;;;;;;;;;GAWG;AACH,iBAAe,uBAAuB,CAAC,GAAG,EAAE;IAC1C,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB;;;;GAiBA;AAED,eAAO,MAAM,kCAAkC,gCAA0B,CAAC;AAy/C1E,wBAAsB,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAidlE"}

package/dist/daemon.js

@@ -8,6 +8,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 import { config, getDashboardExternalHost } from './config.js';
 import { repoPickerScanOptions } from './global-config.js';
+import { buildDashboardUrl } from './core/dashboard-url.js';
 import { writeHeartbeat } from './core/daemon-heartbeat.js';
 import { botmuxWrapperFiles } from './core/botmux-wrapper.js';
 import { startMaintenance, stopMaintenance } from './core/maintenance.js';
@@ -2173,7 +2174,7 @@ async function handleNewTopic(data, ctx) {
             // chat-granted users (who only pass canTalk) management commands like
             // /cd /restart /oncall bind. Previously this gate only fired in oncall chats,
             // which left a hole once per-chat grants flow through canTalk.
-            if (!canOperate(larkAppId, chatId, senderOpenId)) {
+            if (!canOperate(larkAppId, chatId, senderOpenId, senderUnionId)) {
                 await sessionReply(anchor, tr('daemon.cmd_allowed_users_only', { cmd }, localeForBot(larkAppId)), 'text', larkAppId);
                 return;
             }
@@ -2675,6 +2676,11 @@ async function handleThreadReply(data, ctx) {
     // Strip leading @<bot> mentions so "@bot /restart" is recognized as a command.
     const cmdContent = stripLeadingMentions(content, parsed.mentions);
     const threadSenderOpenId = parsed.senderId || data?.sender?.sender_id?.open_id;
+    // Tenant-stable union_id of the thread sender — lets canOperate recognise a
+    // cross-deployment TEAM peer bot (isTeamBot) and grant it daemon-command
+    // operate, parity with same-deployment siblings (option B). undefined for
+    // senders Lark didn't stamp a union_id on → no team-operate, falls back.
+    const threadSenderUnionId = data?.sender?.sender_id?.union_id;
     const threadChatId = ctxChatId ?? data?.message?.chat_id;
     const clearAgentAttentionForHumanInbound = () => {
         if (isForeignBot || isBotSenderType)
@@ -2796,7 +2802,7 @@ async function handleThreadReply(data, ctx) {
             }
             // canOperate gate for thread-reply daemon commands — required in every chat
             // (see spawn-path gate above). Denies chat-granted users management commands.
-            if (!canOperate(larkAppId, effectiveThreadChatId, threadSenderOpenId)) {
+            if (!canOperate(larkAppId, effectiveThreadChatId, threadSenderOpenId, threadSenderUnionId)) {
                 sessionReply(anchor, tr('daemon.cmd_allowed_users_only', { cmd }, localeForBot(larkAppId)), 'text', larkAppId);
                 return;
             }
@@ -3361,13 +3367,11 @@ function dashboardUrlForReport() {
         const portFile = join(dir, '.dashboard-port');
         const tokenFile = join(dir, '.dashboard-token');
         const port = existsSync(portFile) ? readFileSync(portFile, 'utf8').trim() : String(config.dashboard.port);
-        const base = `http://${getDashboardExternalHost()}:${port}/`;
-        if (existsSync(tokenFile)) {
-            const tok = readFileSync(tokenFile, 'utf8').trim();
-            if (tok)
-                return `${base}?t=${tok}`;
-        }
-        return base;
+        const tok = existsSync(tokenFile) ? readFileSync(tokenFile, 'utf8').trim() : '';
+        // buildDashboardUrl swaps in the central-platform machine subdomain when
+        // 远程访问 is on and this host is bound, so the restart-report DM links to the
+        // platform dashboard instead of an unreachable local host:port.
+        return buildDashboardUrl({ host: getDashboardExternalHost(), port, token: tok || undefined });
     }
     catch {
         return undefined;