@inventec/dsh-copilot-auth 1.2.8 → 1.2.9

package/README.md

@@ -33,7 +33,8 @@
 
 | 本插件 | DSH 实测版本 | authorization 服务 | 说明 |
 |---|---|---|---|
-| v1.2.8+ | `0.1.7-rc.2`+（`0.2.0-rc.1` web 与 `0.2.0-rc.2` desktop 已实测） | runtime 内置，插件不挂载 | **协议 v2：诚实的授权语义＋补充/重建双入口**。授权侧：等待中可「请求撤回」（结果如实显示待核实）、退出/重新授权在宿主可证明安全前禁用并说明、单实例 attempt、15 分钟等待上限、晚到授权成功不再写配置；模型侧：旧「刷新」拆为「补充模型」（候选默认不勾选、非破坏）与「重建模型列表」（二次确认＋清 modelOverrides），预览 10 分钟绑定选择、operationId 幂等、配置并发编辑优先、崩溃可恢复（「结束旧配置意图」显式闭环），状态按 profile 隔离（旧全局状态只读提示）；模型路由要求 `protocolVersion:2`，GET `/status` 零写探针；v1 函数族已从 state.mjs 移除 |
+| v1.2.9+ | `0.1.7-rc.2`+（`0.2.0-rc.1` web 与 `0.2.0-rc.2` desktop 已实测） | runtime 内置，插件不挂载 | **修复 v1.2.8 授权页显示回归**：授权状态机漏接 `fetch`，页面恒显「未登录」、点「授权登录」恒「失败」且请求根本不发出（2026-10-04 实机实证，nginx 全量零 `POST /copilot-auth/start`）。另加：/status 加载失败退避自愈重试（60 秒转手动＋「查询状态」）、失败原因分层展示（网络/网关/响应，不再裸「失败」）、已登录时服务端拒绝替换性授权（409 `already-configured`）且客户端自动恢复已登录视图 |
+| v1.2.8 | `0.1.7-rc.2`+（`0.2.0-rc.1` web 与 `0.2.0-rc.2` desktop 已实测） | runtime 内置，插件不挂载 | **协议 v2：诚实的授权语义＋补充/重建双入口**。授权侧：等待中可「请求撤回」（结果如实显示待核实）、退出/重新授权在宿主可证明安全前禁用并说明、单实例 attempt、15 分钟等待上限、晚到授权成功不再写配置；模型侧：旧「刷新」拆为「补充模型」（候选默认不勾选、非破坏）与「重建模型列表」（二次确认＋清 modelOverrides），预览 10 分钟绑定选择、operationId 幂等、配置并发编辑优先、崩溃可恢复（「结束旧配置意图」显式闭环），状态按 profile 隔离（旧全局状态只读提示）；模型路由要求 `protocolVersion:2`，GET `/status` 零写探针；v1 函数族已从 state.mjs 移除。**已知缺陷**：授权状态机漏接 fetchImpl → 授权页恒「未登录/失败」（v1.2.9 修复） |
 | v1.2.7+ | `0.1.7-rc.2`+（`0.2.0-rc.1` web 与 `0.2.0-rc.2` desktop 已实测） | runtime 内置，插件不挂载 | **重启后自动恢复**：注入后以宿主 `listModels` 复核，未端出即**净零切换**（`displayName` 改后复原；两次真内容变化 ⇒ 宿主必然重建快照，用户配置逐字节不变）触发重建；另加双路取实例 + `registryInstanceMismatch`/`registryVia` 诊断。修复 v1.2.6 的"同值写不改变配置身份 ⇒ 快照不重建" |
 | v1.2.6 | `0.1.7-rc.2`+ | runtime 内置，插件不挂载 | 首次引入宿主侧复核与 `settingsNotServed` 诊断；重启自愈用的"同值触碰"**实测不足**（同值写不改变配置对象身份），重启后模型可能仍不出现——请用 v1.2.7 |
 | v1.2.5 | `0.1.7-rc.2`+（`0.2.0-rc.1` web 与 `0.2.0-rc.2` desktop 已实测） | runtime 内置，插件不挂载 | **desktop 只读形态可刷新**：进程内目录注册表注入（ADR 0003），无需重启、不碰官方产物；`0.2.0-rc.2` desktop **实机端到端已验**（注入条目完成真实推理请求）；同批修复 pi-ai ≥0.99.0 的 `chat:` 目录键格式。**已知缺陷**：重启后若宿主快照先于注入定稿，注入条目会被丢弃（v1.2.6 修复） |

package/lib/client.js

@@ -374,12 +374,12 @@ function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = () => {
       timer = null;
     }
   };
-  const schedule = (gen, delayMs) => {
+  const schedule = (gen, delayMs, fn = () => pollTick(gen)) => {
     if (stale(gen)) return;
     clearTimer();
     timer = clock.setTimeout(() => {
       timer = null;
-      void pollTick(gen);
+      void fn();
     }, delayMs);
   };
   function applySnapshot(gen, s) {
@@ -433,12 +433,32 @@ function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = () => {
   async function init() {
     const gen = ++generation;
     clearTimer();
+    failures = 0;
+    backoffIdx = 0;
+    failureWindowStart = null;
+    await initAttempt(gen);
+  }
+  async function initAttempt(gen) {
     const status = await requestJson(fetchImpl, "/copilot-auth/status", { method: "GET" });
     if (stale(gen)) return;
     if (!status.ok) {
-      emit({ phase: "idle", error: status.error?.messageKey });
+      failures += 1;
+      if (failureWindowStart === null) failureWindowStart = clock.now();
+      const cumulative = clock.now() - failureWindowStart;
+      if (cumulative >= AUTO_RETRY_LIMIT_MS) {
+        emit({ phase: "idle", error: status.error?.messageKey, connectivity: "manual" });
+        return;
+      }
+      emit({ phase: "loading", connectivity: "retrying", error: status.error?.messageKey });
+      const delayS = BACKOFF_STEPS_S[Math.min(backoffIdx, BACKOFF_STEPS_S.length - 1)];
+      backoffIdx += 1;
+      schedule(gen, delayS * 1e3, () => initAttempt(gen));
       return;
     }
+    failures = 0;
+    backoffIdx = 0;
+    failureWindowStart = null;
+    emit({ connectivity: "online" });
     const body = status.body ?? {};
     if (body.refresh?.scopeAvailable === false) {
       emit({ phase: "unavailable" });
@@ -449,13 +469,13 @@ function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = () => {
       emit({ riskLatch: body.authorization.riskLatch });
     }
     if (body.configured === true) {
-      emit({ phase: "authorized" });
+      emit({ phase: "authorized", error: void 0 });
       return;
     }
     const r = await requestJson(fetchImpl, "/copilot-auth/state", { method: "GET" });
     if (stale(gen)) return;
     if (!r.ok) {
-      emit({ phase: "idle" });
+      emit({ phase: "idle", error: r.error?.messageKey, connectivity: "manual" });
       return;
     }
     applySnapshot(gen, r.body);
@@ -474,6 +494,10 @@ function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = () => {
       return;
     }
     const errorCode = r.error?.details?.errorCode;
+    if (errorCode === "already-configured") {
+      emit({ phase: "authorized", error: void 0, shared: false });
+      return;
+    }
     if (r.httpStatus === 409) {
       emit({ shared: true });
       beginPolling(gen);
@@ -498,13 +522,7 @@ function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = () => {
     emit({ withdrawalDelivery: "failed", error: r.error?.details?.errorCode ?? r.error?.messageKey });
   }
   function refresh() {
-    const gen = ++generation;
-    clearTimer();
-    failures = 0;
-    backoffIdx = 0;
-    failureWindowStart = null;
-    emit({ connectivity: "online" });
-    void pollTick(gen);
+    void init();
   }
   function dispose() {
     generation += 1;
@@ -545,6 +563,11 @@ var DICTS = {
     copy: "Copy",
     copied: "Copied \u2713",
     unknown: "Unknown error",
+    statusUnknown: "Status unknown",
+    errNetwork: "Network error: cannot reach the authorization service. Retrying automatically.",
+    errGateway: "Gateway error: the DSH service may be restarting. Retrying automatically.",
+    errBadResponse: "Unexpected response from the authorization service.",
+    errHttp: "The authorization request failed. Check status and retry.",
     // ---- Model management (protocol v2, design §5) ----
     supplement: "Add models",
     rebuild: "Rebuild model list",
@@ -622,6 +645,11 @@ var DICTS = {
     copy: "\u590D\u5236",
     copied: "\u5DF2\u590D\u5236 \u2713",
     unknown: "\u672A\u77E5\u9519\u8BEF",
+    statusUnknown: "\u72B6\u6001\u672A\u77E5",
+    errNetwork: "\u7F51\u7EDC\u5F02\u5E38\uFF1A\u65E0\u6CD5\u8FDE\u63A5\u6388\u6743\u670D\u52A1\uFF0C\u6B63\u5728\u81EA\u52A8\u91CD\u8BD5\u3002",
+    errGateway: "\u7F51\u5173\u9519\u8BEF\uFF1ADSH \u670D\u52A1\u53EF\u80FD\u6B63\u5728\u91CD\u542F\uFF0C\u6B63\u5728\u81EA\u52A8\u91CD\u8BD5\u3002",
+    errBadResponse: "\u6388\u6743\u670D\u52A1\u8FD4\u56DE\u5F02\u5E38\u54CD\u5E94\u3002",
+    errHttp: "\u6388\u6743\u8BF7\u6C42\u5931\u8D25\u3002\u8BF7\u67E5\u8BE2\u72B6\u6001\u540E\u91CD\u8BD5\u3002",
     // ---- 模型管理（协议 v2，设计§5） ----
     supplement: "\u8865\u5145\u6A21\u578B",
     rebuild: "\u91CD\u5EFA\u6A21\u578B\u5217\u8868",
@@ -681,6 +709,14 @@ function blockedReasonText(t, flags) {
   if (reason && t("blockedReasons")?.[reason]) return t("blockedReasons")[reason];
   return t("unavailable");
 }
+function httpErrorText(t, key) {
+  return {
+    "network-error": t("errNetwork"),
+    "bad-gateway": t("errGateway"),
+    "bad-response": t("errBadResponse"),
+    "http-error": t("errHttp")
+  }[key];
+}
 var COPILOT_ICON_SVG = '<svg aria-hidden="true" width="16" height="16" viewBox="0 0 16 16" fill="currentColor" style="flex:none"><path d="M7.998 15.035c-4.562 0-7.873-2.914-7.998-3.749V9.338c.085-.628.677-1.686 1.588-2.065.013-.07.024-.143.036-.218.029-.183.06-.384.126-.612-.201-.508-.254-1.084-.254-1.656 0-.87.128-1.769.693-2.484.579-.733 1.494-1.124 2.724-1.261 1.206-.134 2.262.034 2.944.765.05.053.096.108.139.165.044-.057.094-.112.143-.165.682-.731 1.738-.899 2.944-.765 1.23.137 2.145.528 2.724 1.261.566.715.693 1.614.693 2.484 0 .572-.053 1.148-.254 1.656.066.228.098.429.126.612.924.385 1.522 1.471 1.591 2.095v1.872c0 .766-3.351 3.795-8.002 3.795Zm0-1.485c2.28 0 4.584-1.11 5.002-1.433V7.862l-.023-.116c-.49.21-1.075.291-1.727.291-1.146 0-2.059-.327-2.71-.991A3.222 3.222 0 0 1 8 6.303a3.24 3.24 0 0 1-.544.743c-.65.664-1.563.991-2.71.991-.652 0-1.236-.081-1.727-.291l-.023.116v4.255c.419.323 2.722 1.433 5.002 1.433ZM6.762 2.83c-.193-.206-.637-.413-1.682-.297-1.019.113-1.479.404-1.713.7-.247.312-.369.789-.369 1.554 0 .793.129 1.171.308 1.371.162.181.519.379 1.442.379.853 0 1.339-.235 1.638-.54.315-.322.527-.827.617-1.553.117-.935-.037-1.395-.241-1.614Zm4.155-.297c-1.044-.116-1.488.091-1.681.297-.204.219-.359.679-.242 1.614.091.726.303 1.231.618 1.553.299.305.784.54 1.638.54.922 0 1.28-.198 1.442-.379.179-.2.308-.578.308-1.371 0-.765-.123-1.242-.37-1.554-.233-.296-.693-.587-1.713-.7Z"/><path d="M6.25 9.037a.75.75 0 0 1 .75.75v1.501a.75.75 0 0 1-1.5 0V9.787a.75.75 0 0 1 .75-.75Zm4.25.75v1.501a.75.75 0 0 1-1.5 0V9.787a.75.75 0 0 1 1.5 0Z"/></svg>';
 function enforceNavIcon(labelText) {
   if (!labelText) return;
@@ -970,7 +1006,7 @@ function CopilotSection({ t = (key) => DICTS.en[key] ?? key }) {
   const flowRef = (0, import_react.useRef)(flow);
   const authFlowRef = (0, import_react.useRef)(null);
   if (!authFlowRef.current && typeof fetch === "function") {
-    authFlowRef.current = createAuthFlow({ onState: (s) => setAuth(s) });
+    authFlowRef.current = createAuthFlow({ fetchImpl: fetch, onState: (s) => setAuth(s) });
   }
   const drive = (event) => advance(flowRef.current, event, fetch, (next) => {
     flowRef.current = next;
@@ -1012,7 +1048,7 @@ function CopilotSection({ t = (key) => DICTS.en[key] ?? key }) {
     const n = notices.find((x) => x && typeof x.code === "string" && x.code !== "");
     return n ? { code: n.code, url: n.url } : null;
   })();
-  const badgeText = t(phase === "risk" ? "riskBadge" : phase === "loading" ? "loading" : phase);
+  const badgeText = phase === "risk" ? t("riskBadge") : phase === "loading" ? t("loading") : phase === "idle" && auth.error ? t("statusUnknown") : t(phase);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.section, children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h3", { style: styles.title, children: t("title") }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: styles.intro, children: t("intro") }),
@@ -1055,6 +1091,17 @@ function CopilotSection({ t = (key) => DICTS.en[key] ?? key }) {
       t("unavailable")
     ] }),
     phase === "failed" && attempt?.error && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: styles.error, children: attempt.error }),
+    phase === "failed" && !attempt?.error && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
+        "\u26A0 ",
+        httpErrorText(t, auth.error) ?? t("unknown")
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.secondary }, onClick: checkStatus, children: t("retryNow") }) })
+    ] }),
+    phase === "idle" && auth.error && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
+      "\u26A0 ",
+      httpErrorText(t, auth.error) ?? t("unknown")
+    ] }),
     phase === "authorized" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.card, children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { display: "flex", gap: 10, alignItems: "center", flexWrap: "wrap" }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.secondary, opacity: 0.5, cursor: "not-allowed" }, disabled: true, title: t("authUnsafe"), children: t("logout") }),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@inventec/dsh-copilot-auth",
-  "version": "1.2.8",
-  "description": "为内置 Copilot 提供方补设备码登录设置页，预置开箱路由；凭据入内置凭据库，模型目录兜底不覆盖定制。v1.2.8：请求撤回/禁用不安全退出、补充模型/重建模型列表双入口（协议 v2）。适配 DSH 0.1.7+（≤0.1.5 请用 1.1.x）。",
+  "version": "1.2.9",
+  "description": "为内置 Copilot 提供方补设备码登录设置页，预置开箱路由；凭据入内置凭据库，模型目录兜底不覆盖定制。v1.2.9：修复授权页恒未登录/失败（漏传 fetchImpl）、失败原因分层展示＋自愈重试、已登录拒绝替换性授权（协议 v2）。适配 DSH 0.1.7+（≤0.1.5 请用 1.1.x）。",
   "type": "module",
   "license": "MIT",
   "author": "iasi",

package/src/auth-flow.mjs

@@ -36,12 +36,12 @@ export function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = ()
       timer = null;
     }
   };
-  const schedule = (gen, delayMs) => {
+  const schedule = (gen, delayMs, fn = () => pollTick(gen)) => {
     if (stale(gen)) return;
     clearTimer();
     timer = clock.setTimeout(() => {
       timer = null;
-      void pollTick(gen);
+      void fn();
     }, delayMs);
   };
 
@@ -100,12 +100,35 @@ export function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = ()
   async function init() {
     const gen = ++generation;
     clearTimer();
+    failures = 0;
+    backoffIdx = 0;
+    failureWindowStart = null;
+    await initAttempt(gen);
+  }
+
+  // init 内核：/status 失败时按 1/2/4/8/15 秒退避自动重试，累计 60 秒转手动；
+  // 不把加载失败伪装成「未登录」（历史缺陷：502 窗口期打开页面会显示未登录＋授权按钮）。
+  async function initAttempt(gen) {
     const status = await requestJson(fetchImpl, "/copilot-auth/status", { method: "GET" });
     if (stale(gen)) return;
     if (!status.ok) {
-      emit({ phase: "idle", error: status.error?.messageKey });
+      failures += 1;
+      if (failureWindowStart === null) failureWindowStart = clock.now();
+      const cumulative = clock.now() - failureWindowStart;
+      if (cumulative >= AUTO_RETRY_LIMIT_MS) {
+        emit({ phase: "idle", error: status.error?.messageKey, connectivity: "manual" });
+        return;
+      }
+      emit({ phase: "loading", connectivity: "retrying", error: status.error?.messageKey });
+      const delayS = BACKOFF_STEPS_S[Math.min(backoffIdx, BACKOFF_STEPS_S.length - 1)];
+      backoffIdx += 1;
+      schedule(gen, delayS * 1000, () => initAttempt(gen));
       return;
     }
+    failures = 0;
+    backoffIdx = 0;
+    failureWindowStart = null;
+    emit({ connectivity: "online" });
     const body = status.body ?? {};
     if (body.refresh?.scopeAvailable === false) {
       emit({ phase: "unavailable" });
@@ -116,14 +139,14 @@ export function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = ()
       emit({ riskLatch: body.authorization.riskLatch });
     }
     if (body.configured === true) {
-      emit({ phase: "authorized" });
+      emit({ phase: "authorized", error: undefined });
       return;
     }
     // 未配置时回查最近一次 attempt：恢复轮询或如实呈现终态
     const r = await requestJson(fetchImpl, "/copilot-auth/state", { method: "GET" });
     if (stale(gen)) return;
     if (!r.ok) {
-      emit({ phase: "idle" });
+      emit({ phase: "idle", error: r.error?.messageKey, connectivity: "manual" });
       return;
     }
     applySnapshot(gen, r.body);
@@ -143,6 +166,12 @@ export function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = ()
       return;
     }
     const errorCode = r.error?.details?.errorCode;
+    if (errorCode === "already-configured") {
+      // 后端确认已有凭据：本页是过期的未登录视图（如短暂 read-error 窗口），
+      // 直接恢复已登录视图，不发起注定失败的替换性授权
+      emit({ phase: "authorized", error: undefined, shared: false });
+      return;
+    }
     if (r.httpStatus === 409) {
       // 共同尝试：不是失败——展示 shared 并转入对现有 attempt 的轮询
       emit({ shared: true });
@@ -171,14 +200,8 @@ export function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = ()
   }
 
   function refresh() {
-    // 手动重试（60 秒上限后）：恢复自动轮询并重置失败窗口
-    const gen = ++generation;
-    clearTimer();
-    failures = 0;
-    backoffIdx = 0;
-    failureWindowStart = null;
-    emit({ connectivity: "online" });
-    void pollTick(gen);
+    // 手动「查询状态」：完整重跑 init（status→state），可从过期的未登录/失败视图恢复
+    void init();
   }
 
   function dispose() {

package/src/auth-host.mjs

@@ -40,12 +40,22 @@ export function createAuthorizationController(ctx, { scope, intentIO, clock = {
     if (!scope?.known) throw authError("SCOPE_UNAVAILABLE", "scope-unavailable");
   };
 
-  function start() {
+  async function start() {
     requireScope();
     if (riskLatch) throw authError("AUTH_UNSAFE", "auth-unsafe", { riskLatch });
     if (attempt && LIVE_STATUSES.includes(attempt.status)) {
       throw authError("ATTEMPT_RUNNING", "already running", { attemptId: attempt.attemptId });
     }
+    // 初始授权条件（设计 Q21）：已有凭据时禁止新的授权尝试——那是对既有授权的
+    // 隐式替换（历史实证：已登录状态下点「授权登录」，begin 带着已存在的凭据发起
+    // 设备流，attempt 永远停在 starting，最终以「失败」收场）。「重新授权」在宿主
+    // 可证明安全前默认禁用。describeRecord 自身失败不阻断（读不到≠存在）。
+    try {
+      const info = await ctx.credentials.describeRecord(CREDENTIAL_KEY);
+      if (info?.configured === true) throw authError("ALREADY_CONFIGURED", "already-configured");
+    } catch (err) {
+      if (err?.code === "ALREADY_CONFIGURED") throw err;
+    }
     // 先持久意图版本，失败不发 begin（安全门拒绝动作不产生副作用）
     const originIntentVersion = intentIO.bump();
     const a = {

package/src/host.mjs

@@ -501,14 +501,14 @@ export function apply(ctx, opts = {}) {
   ctx.webServer.register({
     kind: "exact",
     path: r.start,
-    handler: (req, res) => {
+    handler: async (req, res) => {
       if (!guard(req, res, "POST")) return;
       if (!scope.known) {
         json(res, 503, { ok: false, error: "scope-unavailable" });
         return;
       }
       try {
-        const { attemptId } = controller.start();
+        const { attemptId } = await controller.start();
         json(res, 202, { ok: true, attemptId });
       } catch (err) {
         if (err?.code === "ATTEMPT_RUNNING") {
@@ -519,6 +519,10 @@ export function apply(ctx, opts = {}) {
           json(res, 409, { ok: false, error: "auth-unsafe" });
           return;
         }
+        if (err?.code === "ALREADY_CONFIGURED") {
+          json(res, 409, { ok: false, error: "already-configured" });
+          return;
+        }
         json(res, 500, { ok: false, error: sanitizeAuthError(err) });
       }
     },