@mrrisega/dsh-remote 0.7.12-beta.4 → 0.7.12-beta.6

package/clients/dsh-remote/wecom-bot.mjs

@@ -53,6 +53,9 @@ import WebSocket from "ws";
 import { createEventSubscriber, NODE_KINDS } from "./dsh-events.mjs";
 // 通道感知格式化（2026-11-08：企微/钉钉 markdown 不支持表格，发前统一适配；飞书/微信各有分支）
 import { formatForChannel } from "./im-format.mjs";
+// 命令层（2026-11-08）：/help /status /stop /ls /use /unbind 在**进模型前**拦下执行；
+// 解析/文案/能力门禁三家共用（与会员升级文案同口径）。
+import { executeImCommand, writeImBotsSession } from "./im-commands.mjs";
 // 会员能力表 = **单一真相源**：直接复用微信通道那套（WECHAT_CAPABILITY_TABLE / limitsFor / grantsCap），
 // 不另造一套。企微/飞书/钉钉将来都套同一套判定（见 research/.../im-channel-membership-design.md）。
 import {
@@ -716,8 +719,8 @@ export function createWecomBot(options = {}) {
   const approvalCardTtlMs = positiveNumber(options.approvalCardTtlMs, APPROVAL_CARD_TTL_MS);
   const onApprovalDecision = typeof options.onApprovalDecision === "function" ? options.onApprovalDecision : null;
   // 会话可选绑定（task-24）：配置固定的会话（空 = 跟随活跃会话）
-  const configuredSessionId = String(options.configuredSessionId || "").trim();
-  const configuredSessionTitle = truncateText(options.configuredSessionTitle || "", 60);
+  let configuredSessionId = String(options.configuredSessionId || "").trim();
+  let configuredSessionTitle = truncateText(options.configuredSessionTitle || "", 60);
   // ── 会员判定（2026-11-07 业主拍板：通知免费、审批免费、互动半阉割）──
   // capsProvider 由 bridge 注入（复用微信通道的 resolveWechatTier：字符串档位或 {plan,caps,limits,rev}）；
   // 拿不到 / 未注入 → **按 free fail-closed**。
@@ -1367,8 +1370,87 @@ export function createWecomBot(options = {}) {
   }
 
   /** 把入站文本转给 DSH 会话（尽力，失败给用户一句人话）。 */
+  /**
+   * 命令层（三家共用 `im-commands.mjs`）：命中返回 true（已回复，调用方直接 return）。
+   * 回复走被动回复/主动推送（replyText），不经过模型、不计额度。
+   */
+  async function handleCommand(frame, info) {
+    const text = String((info && info.text) || "");
+    if (!/^\s*\//.test(text)) return false; // 快路径：非命令不构造 ctx
+    const cmd = await executeImCommand({
+      text,
+      ctx: {
+        caps: capsNow(),
+        tier: tierNow(),
+        appUrl,
+        channelLabel: "企业微信",
+        sessions: async () => {
+          try { await refreshSessions({ force: true }); } catch { /* 忽略 */ }
+          return sessionList.map((x) => ({ sessionId: x.id, title: x.title, updatedAt: x.updatedAt, running: false }));
+        },
+        currentSessionId: () => {
+          const known = boundSessionId || activeSession.id || "";
+          if (known) return known;
+          if (configuredSessionId && canCap("sessions")) return configuredSessionId;
+          if (sessionList.length) return sessionList[0].id;
+          const sub = subscriber;
+          try {
+            if (sub && typeof sub.sessions === "function") {
+              const ids = sub.sessions();
+              if (Array.isArray(ids) && ids.length) return String(ids[0]);
+            }
+          } catch { /* 忽略 */ }
+          return "";
+        },
+        currentSessionTitle: () => titleOfSession(boundSessionId || activeSession.id, activeSession.title || ""),
+        cancelSession: async ({ sessionId }) => {
+          const sub = subscriber;
+          if (!sub || typeof sub.cancelSession !== "function") return { ok: false, message: "订阅器未就绪" };
+          try {
+            const r = await sub.cancelSession({ sessionId });
+            return r && typeof r === "object" ? r : { ok: Boolean(r) };
+          } catch (e) { return { ok: false, message: e && e.message ? e.message : String(e) }; }
+        },
+        switchSession: async ({ sessionId, title }) => {
+          const r = writeImBotsSession(relayDir, "wecom", { sessionId, sessionTitle: title });
+          if (r.ok) {
+            configuredSessionId = sessionId;
+            configuredSessionTitle = truncateText(title || "", 60);
+            writeStatus();
+          }
+          return r;
+        },
+        unbind: async () => {
+          state.boundChatId = "";
+          writeStatus();
+          return { ok: true };
+        },
+        statusSnapshot: async () => ({
+          connected: state.connected === true,
+          authenticated: state.authenticated === true,
+          state: state.connected ? "connected" : "idle",
+          lastError: state.lastError || "",
+          tier: tierNow(),
+          usage: { month: monthKey(), messages: usageThisMonth() },
+          messagesPerMonth: messageLimitNow(),
+          remainingMessages: messageLimitNow() ? Math.max(0, messageLimitNow() - usageThisMonth()) : null,
+          currentSessionId: boundSessionId || activeSession.id || "",
+          currentSessionTitle: titleOfSession(boundSessionId || activeSession.id, activeSession.title || "")
+        })
+      }
+    });
+    if (!cmd || !cmd.handled) return false;
+    replyText(frame, cmd.text);
+    emitter.emit("command", { ...info, command: cmd.command, ok: cmd.ok === true, gated: cmd.gated === true });
+    log.info(`命令 ${cmd.command}${cmd.gated ? "（会员闸拦截）" : ""} 已回复（不转模型）`);
+    return true;
+  }
+
   async function dispatchInbound(frame, info) {
     const sub = subscriber;
+    // ⓪ 命令层：命中即执行并回复，**绝不进模型**，也不计入额度（/stop、/unbind 永远免费）
+    const cmd = await handleCommand(frame, info);
+    if (cmd) return;
     // ① 会员闸（通知/审批免费；派活受能力与月度额度约束，fail-closed）
     const gated = await membershipGate(frame, info);
     if (gated) return;

package/dsh-setup.mjs

@@ -149,7 +149,7 @@ function findDepWs(startDir) {
  * 漏同步就会出现「入口脚本在、依赖不在」的半装运行时（插件半据此判定「运行环境已就绪」，
  * 却永远起不来 bridge —— 2026-09-23 用户反馈的现场）。`src/channel-ref.mjs` 同理（本安装器也 import）。
  */
-const RUNTIME_CLIENT_FILES = ["mobile-adapter.mjs", "dsh-bridge.mjs", "e2ee-shim.mjs", "e2ee-client.mjs", "e2ee-shim-script.js", "mobile-adapter.test.mjs", "wechat-channel.mjs", "dsh-events.mjs", "wechat-runtime.mjs", "wecom-bot.mjs", "im-format.mjs", "dingtalk-bot.mjs", "feishu-bot.mjs", "src/lifecycle.mjs", "src/channel-ref.mjs"];
+const RUNTIME_CLIENT_FILES = ["mobile-adapter.mjs", "dsh-bridge.mjs", "e2ee-shim.mjs", "e2ee-client.mjs", "e2ee-shim-script.js", "mobile-adapter.test.mjs", "wechat-channel.mjs", "dsh-events.mjs", "wechat-runtime.mjs", "wecom-bot.mjs", "im-format.mjs", "dingtalk-bot.mjs", "dingtalk-auth.mjs", "im-commands.mjs", "feishu-bot.mjs", "src/lifecycle.mjs", "src/channel-ref.mjs"];
 
 /**
  * 把"客户端脚本"补齐到配置目录。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrisega/dsh-remote",
-  "version": "0.7.12-beta.4",
+  "version": "0.7.12-beta.6",
   "description": "手机远程控制 DeepSeek Harness · Remote control DeepSeek Harness (dsh web) from any phone browser — 100% 全功能 App 级体验：发消息、看工具执行、审批权限、改设置、管凭据，含特权操作，免内网穿透。一条命令安装 npx @mrrisega/dsh-remote。Mobile remote control for DSH, self-host or SaaS, no server needed on LAN.",
   "keywords": [
     "deepseek-harness",
@@ -56,7 +56,7 @@
     "test:plugin": "DSH_PROFILE_DIR= DSH_REMOTE_TELEMETRY=0 DSH_RELAY_SKIP_SERVICE=1 DSH_RELAY_DEFAULT_API=http://127.0.0.1:1 DSH_RELAY_BUNDLED_RUNTIME=/nonexistent-dsh-bundled NODE_OPTIONS=\"--require $PWD/scripts/test-net-guard.cjs ${NODE_OPTIONS:-}\" node --test --test-concurrency=1 packages/dsh-remote-web/test/*.test.mjs",
     "_comment:test:bridge": "⚠️ 必须 --test-concurrency=1（与 test:plugin 对齐）：tunnel-auth 有一条「bridge 5 秒内必须重连」的硬期限，并行跑时新增用例抢 CPU 会把它撞破 → 偶发假红（实测单独跑 2/2 通过、并发跑偶发 0/2）。假红比慢更贵。",
     "test:bridge": "DSH_PROFILE_DIR= DSH_RELAY_DEFAULT_API=http://127.0.0.1:1 NODE_OPTIONS=\"--require $PWD/scripts/test-net-guard.cjs ${NODE_OPTIONS:-}\" node --test --test-concurrency=1 clients/dsh-remote/test/*.test.mjs",
-    "check": "node --check scripts/check-profile-activation.mjs && node --check clients/dsh-remote/dsh-bridge.mjs && node --check clients/dsh-remote/wechat-channel.mjs && node --check clients/dsh-remote/wechat-runtime.mjs && node --check clients/dsh-remote/dsh-events.mjs && node --check clients/dsh-remote/agent/index.mjs && node --check clients/dsh-remote/agent/version.mjs && node --check clients/dsh-remote/agent/detect.mjs && node --check clients/dsh-remote/agent/permission-bridge.mjs && node --check clients/dsh-remote/agent/proc.mjs && node --check clients/dsh-remote/agent/events.mjs && node --check clients/dsh-remote/agent/codex.mjs && node --check clients/dsh-remote/agent/gemini.mjs && node --check clients/dsh-remote/agent/opencode.mjs && node --check clients/dsh-remote/agent/agent-e2e-codex.mjs && node --check clients/dsh-remote/agent/agent-e2e-real.mjs && node --check clients/dsh-remote/push-reporter.mjs && node --check clients/dsh-remote/decision-poller.mjs && node --check clients/dsh-remote/approval-coordinator.mjs && node --check clients/dsh-remote/wecom-bot.mjs && node --check clients/dsh-remote/im-format.mjs && node --check clients/dsh-remote/dingtalk-bot.mjs && node --check clients/dsh-remote/feishu-bot.mjs && node --check clients/dsh-remote/e2ee-shim.mjs && node --check dsh-setup.mjs && node --check packages/dsh-remote-web/lib/index.js && node --check packages/dsh-remote-web/lib/client.js && node --check packages/relay-router/src/index.mjs && node --check packages/relay-router/src/logger.mjs && bash -n deploy/install-open.sh && grep -q 'command -v setsid' deploy/install-open.sh && grep -q 'command -v ss' deploy/install-open.sh",
+    "check": "node --check scripts/check-profile-activation.mjs && node --check clients/dsh-remote/dsh-bridge.mjs && node --check clients/dsh-remote/wechat-channel.mjs && node --check clients/dsh-remote/wechat-runtime.mjs && node --check clients/dsh-remote/dsh-events.mjs && node --check clients/dsh-remote/agent/index.mjs && node --check clients/dsh-remote/agent/version.mjs && node --check clients/dsh-remote/agent/detect.mjs && node --check clients/dsh-remote/agent/permission-bridge.mjs && node --check clients/dsh-remote/agent/proc.mjs && node --check clients/dsh-remote/agent/events.mjs && node --check clients/dsh-remote/agent/codex.mjs && node --check clients/dsh-remote/agent/gemini.mjs && node --check clients/dsh-remote/agent/opencode.mjs && node --check clients/dsh-remote/agent/agent-e2e-codex.mjs && node --check clients/dsh-remote/agent/agent-e2e-real.mjs && node --check clients/dsh-remote/push-reporter.mjs && node --check clients/dsh-remote/decision-poller.mjs && node --check clients/dsh-remote/approval-coordinator.mjs && node --check clients/dsh-remote/wecom-bot.mjs && node --check clients/dsh-remote/im-format.mjs && node --check clients/dsh-remote/dingtalk-bot.mjs && node --check clients/dsh-remote/feishu-bot.mjs && node --check clients/dsh-remote/dingtalk-auth.mjs && node --check clients/dsh-remote/im-commands.mjs && node --check clients/dsh-remote/e2ee-shim.mjs && node --check dsh-setup.mjs && node --check packages/dsh-remote-web/lib/index.js && node --check packages/dsh-remote-web/lib/client.js && node --check packages/relay-router/src/index.mjs && node --check packages/relay-router/src/logger.mjs && bash -n deploy/install-open.sh && grep -q 'command -v setsid' deploy/install-open.sh && grep -q 'command -v ss' deploy/install-open.sh",
     "release:tarballs": "bash scripts/release-tarballs.sh",
     "sync:local": "node scripts/sync-local.mjs"
   },

package/packages/dsh-remote-web/lib/client.js

@@ -3593,7 +3593,7 @@ window.__ModuleLoader__.load({
       var imDingIdArr = useState(""); var imDingId = imDingIdArr[0]; var setImDingId = imDingIdArr[1];
       var imDingSecretArr = useState(""); var imDingSecret = imDingSecretArr[0]; var setImDingSecret = imDingSecretArr[1];
       var imDingRobotArr = useState(""); var imDingRobot = imDingRobotArr[0]; var setImDingRobot = imDingRobotArr[1];
-      // 钉钉扫码一键创建（2026-11-08）：authId/授权链接/等待态；手动配置默认折叠
+      // 钉钉扫码一键创建（2026-11-08，委托桥侧持久化授权）：本地只留等待态/链接/剩余时间；手动配置默认折叠
       var imDingAuthArr = useState(null); var imDingAuth = imDingAuthArr[0]; var setImDingAuth = imDingAuthArr[1];
       var imDingManualArr = useState(false); var imDingManual = imDingManualArr[0]; var setImDingManual = imDingManualArr[1];
       var imFeishuAppIdArr = useState(""); var imFeishuAppId = imFeishuAppIdArr[0]; var setImFeishuAppId = imFeishuAppIdArr[1];
@@ -6027,6 +6027,16 @@ window.__ModuleLoader__.load({
             var deps = b && b.status && b.status.deps && b.status.deps.feishu;
             if (deps) setImDeps(deps);
             loadImDeps();
+            // 授权会话在桥里持久化：重开面板时若仍在等待，恢复展示（URL/剩余时间从状态文件读）
+            api("/dsh-remote/im-dingtalk-auth/status").then(function (a) {
+              if (a && a.state === "waiting") {
+                setImDingAuth({
+                  phase: "waiting", url: String(a.url || ""), startedAt: Date.now(),
+                  expiresAt: Number(a.expiresAt) || (Date.now() + 15 * 60 * 1000),
+                  remainingSec: Number(a.remainingSec) || 0, error: ""
+                });
+              }
+            }).catch(function () { /* 忽略 */ });
           });
         }
         // 数据加载交给下面的 effect（按"弹层是否打开"触发）：
@@ -6745,28 +6755,24 @@ window.__ModuleLoader__.load({
         return IM_HUMAN_ERR[c] || "操作失败，请稍后重试";
       }
 
-      /** 钉钉扫码授权：开始（POST begin）→ 拿授权链接；deviceCode 只在服务端，不落浏览器。
-       *  轮询由**节点半后台**跑（关面板/刷新不影响），这里只查状态。 */
+      /** 钉钉扫码授权（2026-11-08 架构修正：委托桥侧持久化授权）。
+       *  面板只做三件事：写 begin 命令 → 轮询状态文件 → 展示。授权会话在桥那边落盘续轮询，
+       *  关面板/宿主重启都不会丢（用户"钉钉说成功、我们没接住"的根因）。 */
       function startDingAuth() {
         if (imPlatBusy) return;
         setImPlatBusy("auth");
         setImPlatMsg(null);
         setImPlatErr({});
         post("/dsh-remote/im-dingtalk-auth/begin", {}).then(function (b) {
-          if (!b || b.ok !== true || !b.url) {
+          if (!b || b.ok !== true) {
             setImDingAuth(null);
             setImPlatMsg({ kind: "err", text: "发起授权失败：" + imHumanErr(b && b.code, b && b.message) });
             return;
           }
-          var expiresIn = Math.max(60, Math.min(7200, Number(b.expiresIn) || 7200));
+          // begin 只写命令文件；URL/剩余时间要等桥跑完写进状态文件 → 由轮询拿
           setImDingAuth({
-            authId: String(b.authId || ""),
-            url: String(b.url || ""),
-            interval: Math.max(1, Math.min(10, Number(b.interval) || 3)),
-            expiresAt: Date.now() + expiresIn * 1000,
-            startedAt: Date.now(),
-            phase: "waiting",
-            error: ""
+            phase: "waiting", url: "", startedAt: Date.now(),
+            expiresAt: Date.now() + 15 * 60 * 1000, remainingSec: 0, error: ""
           });
         }).catch(function (e) {
           setImDingAuth(null);
@@ -6774,13 +6780,13 @@ window.__ModuleLoader__.load({
           setImPlatMsg({ kind: "err", text: "发起授权失败：" + imHumanErr(body.code || (e && e.code), body.message || (e && e.message)) });
         }).finally(function () { setImPlatBusy(""); });
       }
-      /** 查询一次授权状态；manual=true = 用户点「我已完成授权，检查一下」（立刻让服务端补轮一次）。 */
+      /** 读一次桥写的授权进度（GET status → 状态文件；不自己 poll 钉钉）。 */
       function pollDingAuth(manual) {
         var a = imDingAuth;
-        if (!a || !a.authId || a.phase !== "waiting") return;
-        var qs = "?id=" + encodeURIComponent(a.authId) + (manual ? "&check=1" : "");
-        api("/dsh-remote/im-dingtalk-auth/status" + qs).then(function (b) {
-          if (b && b.status === "success") {
+        if (!a || a.phase !== "waiting") return;
+        api("/dsh-remote/im-dingtalk-auth/status").then(function (b) {
+          var st2 = String((b && b.state) || "idle");
+          if (st2 === "success") {
             setImDingAuth(null);   // 成功后自动收起授权块
             setImPlatMsg({
               kind: "ok",
@@ -6789,31 +6795,49 @@ window.__ModuleLoader__.load({
             loadImBots();
             return;
           }
-          if (b && (b.status === "failed" || b.status === "expired")) {
-            setImDingAuth({ authId: a.authId, url: a.url, interval: a.interval, expiresAt: a.expiresAt, startedAt: a.startedAt, phase: "failed", error: imHumanErr(b.code, b.message) });
+          if (st2 === "failed" || st2 === "expired") {
+            setImDingAuth({
+              phase: "failed", url: a.url, startedAt: a.startedAt, expiresAt: a.expiresAt,
+              remainingSec: 0, error: imHumanErr(st2, b && b.message)
+            });
             return;
           }
-          // waiting：换新对象触发下一轮（服务端后台仍在推进，这里只负责刷新展示）
-          setImDingAuth({ authId: a.authId, url: a.url, interval: a.interval, expiresAt: a.expiresAt, startedAt: a.startedAt, phase: "waiting", error: "", polledAt: Date.now() });
+          // waiting / idle（桥还没开始）：刷新 url 与剩余时间，继续等
+          setImDingAuth({
+            phase: "waiting",
+            url: String((b && b.url) || a.url || ""),
+            startedAt: a.startedAt || Date.now(),
+            expiresAt: Number(b && b.expiresAt) || a.expiresAt || (Date.now() + 15 * 60 * 1000),
+            remainingSec: Number(b && b.remainingSec) || 0,
+            error: "", polledAt: Date.now()
+          });
         }).catch(function (e) {
-          // 网络抖动：不打断等待（手动按钮仍在），仅在自动轮询里静默
           if (manual) {
             var body = (e && e.body) || {};
             setImPlatMsg({ kind: "warn", text: "检查失败：" + imHumanErr(body.code, body.message || (e && e.message)) + "（可再试）" });
           }
         });
       }
-      /** 等待确认中：自动轮询 ~3s/次；**最多自动轮 10 分钟**，之后保留状态由用户手动检查。 */
+      /** 等待确认中：每 2s 读一次状态（桥后台在推进）；**最多自动看 15 分钟后停止**，手动按钮仍在。 */
       useEffect(function () {
         if (iaModal !== "channel" || iaChStep !== "dingtalk") return undefined;
         if (!imDingAuth || imDingAuth.phase !== "waiting") return undefined;
         var waited = Date.now() - (imDingAuth.startedAt || Date.now());
-        if (waited > 10 * 60 * 1000) return undefined;   // 停止自动轮询（不再"2 分钟就判死"）
+        if (waited > 15 * 60 * 1000) return undefined;
         var t = null;
-        try { t = setTimeout(function () { pollDingAuth(false); }, Math.max(1000, (imDingAuth.interval || 3) * 1000)); } catch (e) { /* 忽略 */ }
+        try { t = setTimeout(function () { pollDingAuth(false); }, 2000); } catch (e) { /* 忽略 */ }
         return function () { try { if (t) clearTimeout(t); } catch (e) { /* 忽略 */ } };
       }, [iaModal, iaChStep, imDingAuth]);
 
+      /** 取消授权：写 cancel 命令（桥停轮询 + 删持久化会话）。 */
+      function cancelDingAuth() {
+        post("/dsh-remote/im-dingtalk-auth/cancel", {}).catch(function () { /* 桥不在也不影响面板收起 */ })
+          .finally(function () {
+            setImDingAuth(null);
+            setImPlatMsg({ kind: "ok", text: "已取消本次扫码授权" });
+          });
+      }
+
       /** 钉钉手动创建 7 步（2026-11-08 业主给的官方链接；每步一句 + 链接）。 */
       var DINGTALK_STEPS = [
         { t: "用钉钉账号登录开发者后台", url: "https://open-dev.dingtalk.com/" },
@@ -6849,6 +6873,7 @@ window.__ModuleLoader__.load({
         var st = (imBots && imBots.status && imBots.status.dingtalk) || {};
         var err = imPlatErr || {};
         var auth = imDingAuth;
+        var authStatus = st.auth || {};
         var sourceText = (st.credentialSource || d.credentialSource) === "scan" ? "扫码创建"
           : (st.credentialSource || d.credentialSource) === "manual" ? "手动填写" : "";
         var clientTail = String(d.clientId || "").length > 4 ? String(d.clientId).slice(-4) : String(d.clientId || "");
@@ -6881,6 +6906,13 @@ window.__ModuleLoader__.load({
           //   · 有凭据/已连接 → 「已连接 · Client ID 尾号 · 来源：…」
           (function () {
             var configured = !!d.enabled || !!d.hasSecret || !!String(d.credentialSource || "").trim();
+            // 授权会话状态优先：failed/expired 是"授权"失败，不是"连接"失败（措辞不能混）
+            if (authStatus.state === "failed") {
+              return h("div", { className: "dru-ia-state is-err", role: "status" }, "授权失败：" + imHumanErr("", String(authStatus.message || "")));
+            }
+            if (authStatus.state === "expired") {
+              return h("div", { className: "dru-ia-state is-warn", role: "status" }, "授权已过期：" + imHumanErr("expired", String(authStatus.message || "")) + "（点下方按钮可重新获取链接）");
+            }
             var failState = st.state === "failed" || st.state === "error";
             if (!configured) return h("div", { className: "dru-ia-state" }, druIcon("chat"), "未配置：点下方按钮扫码创建机器人");
             if (failState) {
@@ -6892,38 +6924,43 @@ window.__ModuleLoader__.load({
             if (st.connected) return h("div", { className: "dru-ia-state is-ok" }, druIcon("check"), "已连接" + tailBit + srcBit);
             return h("div", { className: "dru-ia-state" }, druIcon("chat"), "已保存凭据，等待连接…" + tailBit + srcBit);
           })(),
-          // 扫码授权中：链接 + 提示 + 复制/打开（无 QR 库 → 降级，明确告知用手机钉钉扫码）
+          // 扫码授权中（桥侧持久化：begin 只写命令，URL 等桥跑完写进状态 → 轮询拿）
           (auth && auth.phase === "waiting")
             ? h("div", { className: "dru-ia-field" },
                 h("div", { className: "dru-ia-state", role: "status" }, h("span", { className: "dru-spin" }),
-                  "等待你在钉钉里确认…（用手机钉钉扫下方链接，或复制到手机打开）"),
+                  !auth.url
+                    ? "正在生成授权链接…（桥正在创建，约需几秒）"
+                    : (auth.remainingSec > 0
+                        ? "等待你在钉钉里确认…（剩余约 " + Math.max(1, Math.round(auth.remainingSec / 60)) + " 分钟；用手机钉钉扫码或打开链接）"
+                        : "等待你在钉钉里确认…（用手机钉钉扫码，或复制链接到手机打开）")),
+                h("div", { className: "dru-ia-hint" }, "关掉面板也不影响：桥会继续等你在钉钉里确认，回来点「我已完成授权，检查一下」即可。"),
                 (function () {
                   var waitedMin = Math.floor((Date.now() - (auth.startedAt || Date.now())) / 60000);
-                  return h("div", { className: "dru-ia-hint" },
-                    waitedMin >= 10
-                      ? "已等待 " + waitedMin + " 分钟：自动刷新先停下（后台仍在继续），完成授权后点「我已完成授权，检查一下」。"
-                      : "授权链接 2 小时内有效；关掉面板也不影响，回来点「我已完成授权，检查一下」即可。");
+                  return waitedMin >= 15
+                    ? h("div", { className: "dru-ia-hint" }, "已等待 " + waitedMin + " 分钟：自动刷新先停下（桥仍在继续），完成确认后点「我已完成授权，检查一下」。")
+                    : null;
                 })(),
-                h("button", {
-                  type: "button", className: "dru-ia-btn is-primary", style: { alignSelf: "flex-start" },
-                  onClick: function () { pollDingAuth(true); }
-                }, "我已完成授权，检查一下"),
-                h("div", { className: "dru-copy-row" },
-                  h("div", { className: "dru-copy-box" },
-                    h("span", { className: "dru-link-val" }, auth.url),
-                    h("button", {
-                      type: "button", className: "dru-copy-btn", "aria-label": "复制授权链接",
-                      onClick: function () {
-                        copyText(auth.url).then(function (ok) { if (!ok) setImPlatMsg({ kind: "err", text: "复制失败：请手动选中链接复制" }); });
-                      }
-                    }, "复制授权链接")),
-                  h("div", { className: "dru-actions", style: { marginTop: 8 } },
-                    h("a", { className: "dru-ia-btn is-primary", href: auth.url, target: "_blank", rel: "noopener" }, "在浏览器打开授权页"),
-                    h("button", { type: "button", className: "dru-ia-btn", onClick: function () { setImDingAuth(null); setImPlatMsg({ kind: "ok", text: "已取消本次扫码授权" }); } }, "取消授权"))))
+                auth.url
+                  ? h("div", { className: "dru-copy-row" },
+                      h("div", { className: "dru-copy-box" },
+                        h("span", { className: "dru-link-val" }, auth.url),
+                        h("button", {
+                          type: "button", className: "dru-copy-btn", "aria-label": "复制授权链接",
+                          onClick: function () {
+                            copyText(auth.url).then(function (ok) { if (!ok) setImPlatMsg({ kind: "err", text: "复制失败：请手动选中链接复制" }); });
+                          }
+                        }, "复制授权链接")),
+                      h("div", { className: "dru-actions", style: { marginTop: 8 } },
+                        h("a", { className: "dru-ia-btn is-primary", href: auth.url, target: "_blank", rel: "noopener" }, "在浏览器打开授权页"),
+                        h("button", { type: "button", className: "dru-ia-btn is-primary", onClick: function () { pollDingAuth(true); } }, "我已完成授权，检查一下"),
+                        h("button", { type: "button", className: "dru-ia-btn", onClick: cancelDingAuth }, "取消授权")))
+                  : h("div", { className: "dru-actions", style: { marginTop: 8 } },
+                      h("button", { type: "button", className: "dru-ia-btn is-primary", onClick: function () { pollDingAuth(true); } }, "我已完成授权，检查一下"),
+                      h("button", { type: "button", className: "dru-ia-btn", onClick: cancelDingAuth }, "取消授权")))
             : null,
           (auth && auth.phase === "failed")
             ? h("div", { className: "dru-ia-field" },
-                h("div", { className: "dru-ia-state is-err", role: "alert" }, auth.error || "授权失败"),
+                h("div", { className: "dru-ia-state is-err", role: "alert" }, "授权失败：" + (imHumanErr("", auth.error) || "请重试")),
                 h("button", { type: "button", className: "dru-ia-btn", onClick: function () { startDingAuth(); } }, "重试扫码授权"))
             : null,
           // 能力：主动推送 / 卡片（缺 Robot Code 时置灰，提示补 Robot Code）