hiwork-core 0.0.35 → 0.0.38

package/lib/browser-login.js

@@ -146,12 +146,23 @@ export async function startBrowserLogin(opts) {
     }
     return { authorizeUrl, state };
 }
-/** 把失败写进状态并结束等待态（清 browserLogin 与请求字段）。 */
-async function failBrowserLogin(state, loginError) {
-    await state.patch({
-        set: { lastError: loginError },
-        unset: ['browserLoginRequest', 'browserLogin'],
-    }).catch(() => { });
+/**
+ * 把失败写进状态并结束等待态（清 browserLogin 与请求字段）。
+ *
+ * ⚠️ 写回可能失败（settings 尚未可写 / entry 被 HMR 摘掉）：那样等待态不会结束，界面会停在
+ * 「等待完成授权」而没有任何线索。这里不静默吞掉——`state.patch` 已带退避重试，还能抛出来
+ * 说明重试窗口也用尽了。
+ */
+async function failBrowserLogin(state, loginError, log) {
+    try {
+        await state.patch({
+            set: { lastError: loginError },
+            unset: ['browserLoginRequest', 'browserLogin'],
+        });
+    }
+    catch (error) {
+        log(`hiwork-core: 浏览器授权失败态写回被拒，界面可能停在「等待完成授权」（${error instanceof Error ? error.message : typeof error}）`);
+    }
     return loginError;
 }
 /**
@@ -161,17 +172,32 @@ async function failBrowserLogin(state, loginError) {
  * `browserLogin` 是持久化的。宿主一旦重启（应用重开、DSH 崩溃重启、开发期 HMR），
  * 两者就永久错位：所有回调都被 `completeBrowserLogin` 的「没有待完成的授权请求」丢弃，
  * 界面却仍按持久化的 `browserLogin` 停在「等待完成授权」，用户只能靠「取消」脱困。
+ * 更糟的是登录门挂载时会拿这个**已经死掉的**授权 URL 自动打开浏览器，用户无论怎么
+ * 在浏览器里完成授权都回不来——这正是「浏览器打开了但授权回不到桌面端」的成因。
  *
  * 因此启动即把这种**不可能完成**的等待态收尾成失败：写一条 lastError 并清掉等待字段，
  * 让用户回到登录入口重新发起。没有等待态时不动任何状态。
+ *
+ * ⚠️ **返回值必须被检查，调用方必须重试**：`apply()` 跑在任何 settings 写入可用之前，
+ * 此时写回会被 `settings namespace "<ns>" is not registered` 拒绝（实测 1.0.8 桌面端：
+ * apply 时刻命名空间尚未注册，约 3.7s 后才可写）。捕获后吞掉这个拒绝，等于等待态永远
+ * 清不掉——本函数原先正是 `.catch(() => {})` + 单次调用，缺陷即由此而来。
+ *
+ * @returns `true` = 已收尾（原本就没有等待态，或已成功清掉）；`false` = 写回被拒，需重试。
  */
 export async function reconcileStaleBrowserLogin(state, value) {
     if (value.browserLogin === undefined)
-        return;
-    await state.patch({
-        set: { lastError: { code: 'AUTH_FAILED', message: '上次浏览器授权未完成，请重新登录' } },
-        unset: ['browserLoginRequest', 'browserLogin'],
-    }).catch(() => { });
+        return true;
+    try {
+        await state.patch({
+            set: { lastError: { code: 'AUTH_FAILED', message: '上次浏览器授权未完成，请重新登录' } },
+            unset: ['browserLoginRequest', 'browserLogin'],
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
 }
 /**
  * 处理 `hiwork://auth/callback`：校验 state → 兑换一次性 code → 写会话凭据 → 复用供给尾部。
@@ -201,20 +227,20 @@ export async function completeBrowserLogin(input, opts) {
     try {
         if (now() - pending.startedAt > BROWSER_LOGIN_TTL_MS) {
             log('hiwork-core: 浏览器授权回调已超时（超过 10 分钟），已拒绝');
-            return await failBrowserLogin(opts.state, { code: 'AUTH_FAILED', message: '授权已超时，请重新登录' });
+            return await failBrowserLogin(opts.state, { code: 'AUTH_FAILED', message: '授权已超时，请重新登录' }, log);
         }
         if (typeof input.error === 'string' && input.error !== '') {
             // 授权页拒绝 / 网关下发 error：不兑换 code。error 截断后入日志，防日志注入。
             log(`hiwork-core: 浏览器授权被拒绝（${input.error.slice(0, 64)}）`);
-            return await failBrowserLogin(opts.state, { code: 'AUTH_FAILED', message: '授权被取消或失败，请重新登录' });
+            return await failBrowserLogin(opts.state, { code: 'AUTH_FAILED', message: '授权被取消或失败，请重新登录' }, log);
         }
         if (typeof input.code !== 'string' || input.code === '') {
             log('hiwork-core: 浏览器授权回调缺少 code，已丢弃');
-            return await failBrowserLogin(opts.state, { code: 'AUTH_FAILED', message: '授权回调不完整，请重新登录' });
+            return await failBrowserLogin(opts.state, { code: 'AUTH_FAILED', message: '授权回调不完整，请重新登录' }, log);
         }
         const baseURL = opts.value.baseURL;
         if (baseURL === undefined || baseURL === '')
-            return await failBrowserLogin(opts.state, NO_BASE_URL_ERROR);
+            return await failBrowserLogin(opts.state, NO_BASE_URL_ERROR, log);
         const { sessionCookie, user } = await opts.gateway.exchangeCode({
             code: input.code,
             codeVerifier: pending.codeVerifier,
@@ -240,7 +266,7 @@ export async function completeBrowserLogin(input, opts) {
     }
     catch (error) {
         const loginError = toLoginError(error, '无法连接网关，请检查 baseURL 或网络');
-        return await failBrowserLogin(opts.state, loginError);
+        return await failBrowserLogin(opts.state, loginError, log);
     }
     finally {
         pendingAuth = undefined;

package/lib/client.js

@@ -1065,108 +1065,6 @@ function pickSettingsSectionButton(buttons, labels) {
   }
   return void 0;
 }
-var cancelPendingNavigation;
-function isVisibleSubtree(el) {
-  if (el === null) return false;
-  const style = getComputedStyle(el);
-  if (style.display === "none" || style.visibility === "hidden") return false;
-  return el.parentElement === null || isVisibleSubtree(el.parentElement);
-}
-function openSettingsSection(root, label, onMissing) {
-  const labels = typeof label === "string" ? [label] : label;
-  if (cancelPendingNavigation !== void 0 && document.querySelector('[role="dialog"]') !== null) {
-    return;
-  }
-  const trigger = root?.querySelector('[aria-haspopup="dialog"]');
-  if (trigger === null || trigger === void 0) {
-    onMissing?.();
-    return;
-  }
-  cancelPendingNavigation?.();
-  let frame;
-  let finished = false;
-  let sawPanel = false;
-  let reopenTimer;
-  let watchdog;
-  let lastSignature = "";
-  const IDLE_MS = 1500;
-  const finishFailure = () => {
-    cleanup();
-    console.warn(`[hiwork-core] \u672A\u627E\u5230\u8BBE\u7F6E\u5206\u533A\uFF1A${labels.join(" / ")}`);
-    onMissing?.();
-  };
-  const armWatchdog = () => {
-    window.clearTimeout(watchdog);
-    watchdog = window.setTimeout(() => {
-      if (finished) return;
-      if (select()) return;
-      finishFailure();
-    }, IDLE_MS);
-  };
-  const observer = new MutationObserver(() => {
-    schedule();
-  });
-  const cleanup = () => {
-    if (finished) return;
-    finished = true;
-    observer.disconnect();
-    window.clearTimeout(watchdog);
-    window.clearTimeout(reopenTimer);
-    if (frame !== void 0) window.cancelAnimationFrame(frame);
-    if (cancelPendingNavigation === cleanup) cancelPendingNavigation = void 0;
-  };
-  const select = () => {
-    if (finished) return false;
-    const panels = Array.from(document.querySelectorAll('[role="dialog"]')).filter((panel) => isVisibleSubtree(panel));
-    const buttons = panels.flatMap((panel) => Array.from(panel.querySelectorAll("nav button")));
-    const target = panels.length === 0 ? void 0 : pickSettingsSectionButton(buttons, labels);
-    const targetActive = target !== void 0 && (target.className.includes("active") || target.getAttribute("aria-current") === "true");
-    const signature = `${panels.length}:${targetActive ? 1 : 0}`;
-    if (signature !== lastSignature) {
-      lastSignature = signature;
-      armWatchdog();
-    }
-    if (panels.length === 0) {
-      if (sawPanel) {
-        sawPanel = false;
-        reopenTimer = window.setTimeout(() => {
-          reopenTimer = void 0;
-          if (finished || sawPanel) return;
-          if (typeof document === "undefined" || document.querySelector('[role="dialog"]') !== null) return;
-          trigger.click();
-        }, 300);
-        return false;
-      }
-      trigger.click();
-      return false;
-    }
-    sawPanel = true;
-    if (target === void 0) return false;
-    if (targetActive) {
-      cleanup();
-      return true;
-    }
-    target.click();
-    return false;
-  };
-  const schedule = () => {
-    if (finished || frame !== void 0) return;
-    frame = window.requestAnimationFrame(() => {
-      frame = void 0;
-      select();
-    });
-  };
-  armWatchdog();
-  observer.observe(document.body, {
-    childList: true,
-    subtree: true,
-    // 壳把激活态应用到导航钮是纯属性变更（class/aria-current），必须监听才能复核收敛
-    attributes: true,
-    attributeFilter: ["class", "aria-current", "aria-expanded"]
-  });
-  cancelPendingNavigation = cleanup;
-  schedule();
-}
 
 // src/client/user-badge.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");
@@ -1388,11 +1286,27 @@ function LogoutIcon() {
     }
   );
 }
-function openGatewaySettings() {
-  openSettingsSection(
-    document.querySelector("[data-dsh-sidebar-settings]") ?? document.querySelector('[class*="settingsArea"]'),
-    AI_ROUTER_SECTION_LABEL
-  );
+function openGatewaySettings(openSettings) {
+  openSettings();
+  selectSettingsSection([AI_ROUTER_SECTION_LABEL]);
+}
+function selectSettingsSection(labels) {
+  const started = Date.now();
+  const tick = () => {
+    const dialog = document.querySelector('[role="dialog"]');
+    if (dialog !== null) {
+      const button = pickSettingsSectionButton(
+        Array.from(dialog.querySelectorAll("button")),
+        labels
+      );
+      if (button !== void 0) {
+        button.click();
+        return;
+      }
+    }
+    if (Date.now() - started < 3e3) window.setTimeout(tick, 120);
+  };
+  tick();
 }
 function LogoutConfirm(props) {
   const { onCancel } = props;
@@ -1500,7 +1414,9 @@ function UserBadge(props) {
           style: railRowStyle,
           title: displayName,
           "aria-label": "\u6253\u5F00\u8BBE\u7F6E",
-          onClick: openGatewaySettings,
+          onClick: () => {
+            openGatewaySettings(props.openSettings);
+          },
           children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: avatarStyle(24), children: initial })
         }
       ),
@@ -1517,7 +1433,9 @@ function UserBadge(props) {
           style: profileButtonStyle,
           title: "\u6253\u5F00\u8BBE\u7F6E",
           "aria-label": `\u6253\u5F00\u8BBE\u7F6E\uFF08${displayName}\uFF09`,
-          onClick: openGatewaySettings,
+          onClick: () => {
+            openGatewaySettings(props.openSettings);
+          },
           children: [
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: avatarStyle(24), children: initial }),
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: nameTextStyle, children: displayName })
@@ -1532,7 +1450,9 @@ function UserBadge(props) {
           style: iconButtonStyle,
           title: "\u8BBE\u7F6E",
           "aria-label": "\u8BBE\u7F6E",
-          onClick: openGatewaySettings,
+          onClick: () => {
+            openGatewaySettings(props.openSettings);
+          },
           children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives.IconSettingsOutlineMedium, { size: 16 })
         }
       ),
@@ -1876,6 +1796,8 @@ function AboutSection({ appVersion }) {
 // src/client/daily-data.ts
 var DAILY_CHANNEL = "/hiwork-daily";
 var DAILY_FAILURE_TTL_MS = 5 * 6e4;
+var DAILY_LOCAL_RETRY_MS = 2e3;
+var DAILY_LOCAL_FAILURE_CODES = ["SESSION_EXPIRED", "GATEWAY_UNREACHABLE"];
 var DailyRpcError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -1947,27 +1869,38 @@ var DailyDataStore = class {
     this.now = options.now ?? (() => Date.now());
     this.localDay = options.localDay ?? (() => localDayIndex());
     this.failureTtlMs = options.failureTtlMs ?? DAILY_FAILURE_TTL_MS;
+    this.localRetryMs = options.localRetryMs ?? DAILY_LOCAL_RETRY_MS;
   }
   entry;
   failureAt;
+  /** 上一次失败是否为宿主本地前置失败（{@link DAILY_LOCAL_FAILURE_CODES}）——决定节流用哪个 TTL。 */
+  localFailure = false;
   pending;
   now;
   localDay;
   failureTtlMs;
+  localRetryMs;
   /** 清空缓存与防抖状态（登出 / 换账号时调用）。 */
   clear() {
     this.entry = void 0;
     this.failureAt = void 0;
+    this.localFailure = false;
     this.pending = void 0;
   }
   /**
-   * 当日条目：同一本地日内命中缓存直接返回（不发 RPC）；失败防抖期内返回 null 不
-   * 重复打网关；并发调用合并为同一次 RPC。返回 null 即「暂无可展示内容」。
+   * 当日条目：同一本地日内命中缓存直接返回（不发 RPC）；节流期内返回 null 不重复打网关；
+   * 并发调用合并为同一次 RPC。返回 null 即「暂无可展示内容」。
+   *
+   * 节流时长分两档：宿主本地前置失败（未登录 / 网关未配置）只等 {@link DAILY_LOCAL_RETRY_MS}，
+   * 其余失败等 {@link DAILY_FAILURE_TTL_MS}——理由见两个常量的说明（首次安装必先启动后登录）。
    */
   async getToday() {
     const day = this.localDay();
     if (this.entry !== void 0 && this.entry.day === day) return this.entry.view;
-    if (this.failureAt !== void 0 && this.now() - this.failureAt < this.failureTtlMs) return null;
+    if (this.failureAt !== void 0) {
+      const ttl = this.localFailure ? this.localRetryMs : this.failureTtlMs;
+      if (this.now() - this.failureAt < ttl) return null;
+    }
     if (this.pending === void 0) {
       this.pending = this.fetchToday(day).finally(() => {
         this.pending = void 0;
@@ -1989,17 +1922,25 @@ var DailyDataStore = class {
       return null;
     }
   }
-  /** 单次 today 拉取：成功（含池空）写缓存；任何失败进入 5 分钟防抖并返回 null。 */
+  /**
+   * 单次 today 拉取：成功（含池空）写缓存；任何失败进入节流并返回 null。
+   *
+   * 失败分两档记：{@link DAILY_LOCAL_FAILURE_CODES} 是宿主在打网之前判定的（无网关流量、登录后必然变化），
+   * 只记短节流；其余（网关透传失败、形状非法、未知错误）记满 {@link DAILY_FAILURE_TTL_MS}。
+   */
   async fetchToday(day) {
     try {
       const raw = await this.rpc.call(DAILY_CHANNEL, "today", {});
       const response = parseTodayResponse(unwrapDailyResult(raw));
       if (response === void 0) throw new DailyRpcError("internal", "\u6BCF\u65E5\u4E00\u53E5\u4E3B\u673A\u8FD4\u56DE\u4E86\u65E0\u6548\u54CD\u5E94\u3002");
       this.failureAt = void 0;
+      this.localFailure = false;
       const view = response.item === null ? null : { ...response.item, date: response.date };
       this.entry = { view, day };
       return view;
-    } catch {
+    } catch (error) {
+      const code = error instanceof DailyRpcError ? error.code : "";
+      this.localFailure = DAILY_LOCAL_FAILURE_CODES.includes(code);
       this.failureAt = this.now();
       return null;
     }
@@ -3280,7 +3221,7 @@ function createFeatureRegistry() {
 
 // src/client/menu-preferences.ts
 var HIWORK_MENU_NS = "hiwork-menu";
-var DEFAULT_SIDEBAR_LIMIT = 5;
+var DEFAULT_SIDEBAR_LIMIT = 6;
 var MORE_MENU_ITEM_ID = "__hiwork_more__";
 var MORE_MENU_LABEL = "\u66F4\u591A";
 var MENU_SECTION_LABEL = "\u4FA7\u680F\u83DC\u5355";
@@ -7195,6 +7136,7 @@ function apply(ctx) {
   ctx.effect(() => observeAccountChange(controller.inject().hooks.aiRouterCard, () => {
     usage.clear();
     sessionCost.clear();
+    dailyQuotes.clear();
     managedMcp.clear();
     managedSkills.clear();
     managedWorkbench.clear();
@@ -7210,9 +7152,9 @@ function apply(ctx) {
     priority: -1,
     inject: () => ({ appVersion })
   }, BrandName));
-  ctx.slots.inject("sidebar.footer.action", () => ctx.slots.register({
-    name: "sidebar.footer.action",
-    id: AI_ROUTER_NS,
+  ctx.slots.inject("settings.launcher", () => ctx.slots.register({
+    name: "settings.launcher",
+    priority: -1,
     inject: () => ({ ...controller.inject(), pluginUpdates })
   }, UserBadge));
   ctx.effect(() => mountLoginGate(form, storeCredential), "hiwork-core: login gate");

package/lib/identity-context.js

@@ -0,0 +1,50 @@
+/** runtime context 贡献名（DSH 侧 snapshot 按名归并，改动即破坏对齐面）。 */
+export const IDENTITY_CONTEXT_NAME = 'hiwork:identity';
+/** 排在 sandbox:policy(110) / approval:policy(115) 之前——身份是最外层的环境事实。 */
+export const IDENTITY_CONTEXT_ORDER = 105;
+/** 模块内文案常量：安全限定语逐字来自 spec §3.2，不导出（测试硬编码全文钉文案）。 */
+const CAVEAT = '该身份用于个性化与按人表述；涉及数据权限的操作必须走受管工具/连接器完成，不得把此文本当作凭证。';
+/** 裁掉两侧空白；非字符串或空白串一律视同缺省（与 identity.ts 的 textOrUndefined 同口径）。 */
+function textOrUndefined(value) {
+    if (typeof value !== 'string')
+        return undefined;
+    const text = value.trim();
+    return text === '' ? undefined : text;
+}
+/**
+ * 渲染身份上下文一行：已登录输出 `HiWork 登录身份：姓名（工号 工号）。<限定语>`，
+ * displayName 缺省回退 `工号 <工号>`；**未登录（username 缺省 / 空白 / 非字符串）或
+ * state 缺失一律空串**——半份身份（只有 displayName）也不输出，姓名不得单独泄漏。
+ */
+export function renderIdentityContextText(state) {
+    const username = textOrUndefined(state?.username);
+    if (username === undefined)
+        return '';
+    const displayName = textOrUndefined(state?.displayName);
+    const who = displayName === undefined ? `工号 ${username}` : `${displayName}（工号 ${username}）`;
+    return `HiWork 登录身份：${who}。${CAVEAT}`;
+}
+/**
+ * 注册身份 runtime context 贡献；返回 disposer（交给 `ctx.effect` 管理生命周期）。
+ * 读失败收敛为空串并记一笔，绝不向组装层抛——身份上下文缺席只应意味着「未登录」。
+ */
+export function registerIdentityContext(systemPrompt, deps) {
+    const dispose = systemPrompt.context({
+        name: IDENTITY_CONTEXT_NAME,
+        order: IDENTITY_CONTEXT_ORDER,
+        text: () => {
+            try {
+                // enabled 的判断也在 try 内：真实接线里 enabled 与 current 读同一个命名空间，
+                // 任一侧抛异常都收敛为空串（身份上下文缺席只应意味着「未登录」）。
+                if (!deps.enabled())
+                    return '';
+                return renderIdentityContextText(deps.current());
+            }
+            catch (error) {
+                deps.log?.(`hiwork-core: 登录身份上下文读取失败（${error instanceof Error ? error.name : typeof error}）`);
+                return '';
+            }
+        },
+    });
+    return typeof dispose === 'function' ? dispose : () => { };
+}