@inventec/dsh-copilot-auth 1.2.18 → 1.2.19

package/lib/client.js

@@ -34,13 +34,12 @@ var import_react = require("react");
 
 // src/shared.mjs
 var ROUTE_PREFIX = "/copilot-auth";
-var PROTOCOL_VERSION = 2;
+var PROTOCOL_VERSION = 3;
 var routes = () => ({
   start: `${ROUTE_PREFIX}/start`,
   state: `${ROUTE_PREFIX}/state`,
   status: `${ROUTE_PREFIX}/status`,
   logout: `${ROUTE_PREFIX}/logout`,
-  cancel: `${ROUTE_PREFIX}/cancel`,
   refreshPreview: `${ROUTE_PREFIX}/refresh/preview`,
   refreshApply: `${ROUTE_PREFIX}/refresh/apply`,
   refreshRetire: `${ROUTE_PREFIX}/refresh/retire`
@@ -134,6 +133,41 @@ function refreshBlocked(flags) {
   const mode = flags?.catalogMode;
   return flags?.scopeAvailable === false || mode === "blocked" || mode === "unknown";
 }
+function selectionFields(lastSelection = {}) {
+  const out = {};
+  if (lastSelection.selectedIds !== void 0) out.selectedIds = lastSelection.selectedIds;
+  if (lastSelection.clearOverrides !== void 0) out.clearOverrides = lastSelection.clearOverrides;
+  if (lastSelection.confirmEmpty !== void 0) out.confirmEmpty = lastSelection.confirmEmpty;
+  return out;
+}
+function upgradeCandidate(state) {
+  const p = state.preview;
+  if (!p || state.liveUpgradeUsed) return null;
+  if ((p.diff?.removed?.length ?? 0) === 0) return null;
+  if (p.evidence?.source !== "cache" || p.evidence?.stale === true) return null;
+  if (p.catalogSource !== "latest") return null;
+  return {
+    type: "preview",
+    operation: p.operation,
+    catalogSource: p.catalogSource,
+    ...selectionFields(state.lastSelection)
+  };
+}
+function enterConfirming({ flags, preview, staleNotice, lastSelection }) {
+  const state = {
+    name: "confirming",
+    flags: flags ?? initial.flags,
+    preview,
+    staleNotice: staleNotice === true,
+    materializing: false,
+    awaitingUpgrade: false,
+    liveUpgradeUsed: false,
+    lastSelection: lastSelection ?? {}
+  };
+  const effect = upgradeCandidate(state);
+  if (!effect) return [state, null];
+  return [{ ...state, liveUpgradeUsed: true, awaitingUpgrade: true, materializing: true }, effect];
+}
 function reduce(state, event) {
   switch (state.name) {
     case "idle":
@@ -146,14 +180,10 @@ function reduce(state, event) {
         return [{
           name: "previewing",
           flags: state.flags ?? initial.flags,
-          operation: event.operation === "rebuild" ? "rebuild" : "supplement",
+          operation: "manage",
           catalogSource: event.catalogSource,
           stale: false
-        }, {
-          type: "preview",
-          operation: event.operation === "rebuild" ? "rebuild" : "supplement",
-          catalogSource: event.catalogSource
-        }];
+        }, { type: "preview", operation: "manage", catalogSource: event.catalogSource }];
       }
       if (event.type === "init" && state.name === "idle") return [state, { type: "status" }];
       if (event.type === "check" && state.name === "resultUnknown") {
@@ -184,7 +214,7 @@ function reduce(state, event) {
     }
     case "previewing": {
       if (event.type === "preview-ok") {
-        return [{ name: "confirming", flags: state.flags ?? initial.flags, preview: event.preview, staleNotice: state.stale === true }, null];
+        return enterConfirming({ flags: state.flags ?? initial.flags, preview: event.preview, staleNotice: state.stale === true });
       }
       if (event.type === "preview-fail") return [{ name: "failed", flags: state.flags ?? initial.flags, error: event.error }, null];
       return [state, null];
@@ -192,25 +222,63 @@ function reduce(state, event) {
     case "confirming": {
       const p = state.preview;
       if (event.type === "select") {
+        const lastSelection = { ...selectionFields({
+          selectedIds: event.selectedIds,
+          clearOverrides: event.clearOverrides,
+          confirmEmpty: event.confirmEmpty
+        }) };
         return [{
           name: "confirming",
           flags: state.flags ?? initial.flags,
           preview: p,
           materializing: true,
+          awaitingUpgrade: false,
+          liveUpgradeUsed: state.liveUpgradeUsed ?? false,
+          lastSelection,
           staleNotice: state.staleNotice
         }, {
           type: "preview",
           operation: p.operation,
           catalogSource: p.catalogSource,
           basePreviewId: p.previewId,
-          selectedIds: event.selectedIds ?? [],
-          confirmEmpty: event.confirmEmpty === true
+          ...selectionFields(lastSelection)
         }];
       }
       if (event.type === "preview-ok") {
-        return [{ name: "confirming", flags: state.flags ?? initial.flags, preview: event.preview, staleNotice: state.stale === true, materializing: false }, null];
+        const wasUpgrade = state.awaitingUpgrade === true;
+        const landed = {
+          name: "confirming",
+          flags: state.flags ?? initial.flags,
+          preview: event.preview,
+          materializing: false,
+          awaitingUpgrade: false,
+          liveUpgradeUsed: state.liveUpgradeUsed ?? false,
+          lastSelection: state.lastSelection ?? {},
+          staleNotice: wasUpgrade && event.preview?.evidence?.source !== "live" || state.staleNotice === true
+        };
+        const effect = upgradeCandidate(landed);
+        if (effect) return [{ ...landed, liveUpgradeUsed: true, awaitingUpgrade: true, materializing: true }, effect];
+        return [landed, null];
       }
       if (event.type === "preview-fail") {
+        if (state.awaitingUpgrade === true && p) {
+          return [{
+            name: "confirming",
+            flags: state.flags ?? initial.flags,
+            preview: p,
+            materializing: true,
+            awaitingUpgrade: false,
+            liveUpgradeUsed: state.liveUpgradeUsed ?? true,
+            lastSelection: state.lastSelection ?? {},
+            staleNotice: true
+          }, {
+            type: "preview",
+            operation: p.operation,
+            catalogSource: p.catalogSource,
+            basePreviewId: p.previewId,
+            ...selectionFields(state.lastSelection)
+          }];
+        }
         return [{ name: "failed", flags: state.flags ?? initial.flags, error: event.error }, null];
       }
       if (event.type === "start") {
@@ -219,19 +287,14 @@ function reduce(state, event) {
           flags: state.flags ?? initial.flags,
           preview: p,
           materializing: true,
+          awaitingUpgrade: false,
+          liveUpgradeUsed: state.liveUpgradeUsed ?? false,
+          lastSelection: state.lastSelection ?? {},
           staleNotice: state.staleNotice
-        }, {
-          type: "preview",
-          operation: event.operation === "rebuild" ? "rebuild" : p.operation,
-          catalogSource: event.catalogSource
-        }];
+        }, { type: "preview", operation: p.operation, catalogSource: event.catalogSource }];
       }
       if (event.type === "confirm") {
         if (state.materializing) return [state, null];
-        const isRebuild = p.operation === "rebuild";
-        const emptyTarget = isRebuild && (p.diff?.targetView?.models ?? []).length === 0;
-        if (isRebuild && event.second !== true) return [state, null];
-        if (emptyTarget && event.empty !== true) return [state, null];
         if (p.evidence?.stale === true) return [state, null];
         return [{ name: "applying", flags: state.flags ?? initial.flags, preview: p }, { type: "apply", previewId: p.previewId, operationId: p.operationId }];
       }
@@ -303,8 +366,10 @@ async function runEffect(effect, fetchImpl) {
     const res = await post(r.refreshPreview, {
       operation: effect.operation,
       ...effect.catalogSource ? { catalogSource: effect.catalogSource } : {},
-      ...effect.basePreviewId ? { basePreviewId: effect.basePreviewId, selectedIds: effect.selectedIds ?? [] } : {},
-      ...effect.confirmEmpty ? { confirmEmpty: true } : {}
+      ...effect.basePreviewId !== void 0 ? { basePreviewId: effect.basePreviewId } : {},
+      ...effect.selectedIds !== void 0 ? { selectedIds: effect.selectedIds } : {},
+      ...effect.clearOverrides !== void 0 ? { clearOverrides: effect.clearOverrides } : {},
+      ...effect.confirmEmpty !== void 0 ? { confirmEmpty: effect.confirmEmpty } : {}
     });
     if (res.ok) return { type: "preview-ok", preview: res.body };
     return { type: "preview-fail", error: res.error?.details?.errorCode ?? res.error?.messageKey };
@@ -406,7 +471,7 @@ function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = () => {
       emit({ phase: "failed", error: s?.error ?? "authorization-failed" });
       return;
     }
-    if (s?.status === "withdrawal-pending-unverified" || s?.status === "timed-out-unverified") {
+    if (s?.status === "timed-out-unverified") {
       emit({ phase: "risk", riskKind: s.status });
       return;
     }
@@ -486,6 +551,10 @@ function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = () => {
       emit({ phase: "idle", error: r.error?.messageKey, connectivity: "manual" });
       return;
     }
+    if (r.body?.status === "authorized" && body.configured !== true) {
+      emit({ phase: "idle" });
+      return;
+    }
     applySnapshot(gen, r.body);
   }
   async function start() {
@@ -521,14 +590,6 @@ function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = () => {
     }
     emit({ phase: "failed", error: errorCode ?? r.error?.messageKey });
   }
-  async function cancel() {
-    const r = await requestJson(fetchImpl, "/copilot-auth/cancel", { method: "POST" });
-    if (r.ok) {
-      emit({ withdrawalDelivery: r.body?.withdrawalDelivery ?? "unavailable" });
-      return;
-    }
-    emit({ withdrawalDelivery: "failed", error: r.error?.details?.errorCode ?? r.error?.messageKey });
-  }
   async function logout() {
     const gen = ++generation;
     clearTimer();
@@ -553,7 +614,7 @@ function createAuthFlow({ fetchImpl, clock = defaultClock(), onState = () => {
     generation += 1;
     clearTimer();
   }
-  return { init, start, cancel, logout, refresh, dispose };
+  return { init, start, logout, refresh, dispose };
 }
 
 // src/client.jsx
@@ -572,9 +633,6 @@ var DICTS = {
     loading: "\u2026",
     login: "Sign in",
     logout: "Sign out",
-    withdrawAuth: "Request withdrawal",
-    withdrawal: "Withdrawal requested; the outcome remains unverified.",
-    withdrawalUnavailable: "The withdrawal request could not be sent to the host; the outcome remains unverified.",
     authUnsafe: "Safe completion of the authorization flow is unconfirmed. Sign-out and a new authorization attempt are unavailable.",
     attemptTimeout: "Authorization wait timed out; the outcome remains unverified. A new authorization attempt is unavailable. Check the status or verify it manually.",
     attemptShared: "An authorization attempt is already running in this instance.",
@@ -598,28 +656,30 @@ var DICTS = {
     errHttp: "The authorization request failed. Check status and retry.",
     logoutScope: "This removes Copilot authorization from this credential store and affects other instances using it. It does not delete your GitHub account.",
     logoutFailed: "Sign-out did not complete; authorization credentials may remain. Please retry.",
-    // ---- Model management (protocol v2, design §5) ----
-    supplement: "Add models",
-    rebuild: "Rebuild model list",
-    supplementTitle: "Add models",
-    rebuildTitle: "Rebuild model list",
-    candidates: "Models available to add",
+    // ---- Model management (protocol v3, design §5 / ADR 0005) ----
+    manageModels: "Manage model list",
     selectAll: "Select all",
     selectNone: "Deselect all",
-    supplementRisk: "Existing models and customizations will be kept. Only selected models will be added.",
-    rebuildRisk: "Rebuilding clears model parameters and overrides. Other provider settings remain unchanged.",
-    clearRisk: "This clears the Copilot model list and its model customizations. Confirm clearing separately.",
-    secondConfirm: "This is destructive. Click again to confirm.",
+    alignAction: "Align with account & catalog",
+    groupAddable: "Available to add",
+    groupListed: "In list",
+    groupRemoval: "Proposed for removal",
+    retain: "Keep: re-check to retain",
+    customizedBadge: "Customized",
+    clearOverrides: "Also clear all model customizations.",
+    inheritedOverrides: "Inherited model customizations cannot be cleared here.",
+    clearRisk: "Clearing hides nothing \u2014 all available models stay listed; to trim, keep only the ones you check.",
     applyChanges: "Apply changes",
-    addedModels: "Models to add",
-    removedModels: "Models to be removed",
-    keptModels: "Kept",
-    removedAccount: "Not included in this account model list",
+    removalRisk: "{count} listed model(s) will be removed; their customizations are removed with them.",
+    summaryLine: "After applying: {total} model(s) \u2014 {kept} kept \xB7 {added} added \xB7 {removed} removed",
+    catalogNotice: "{count} catalog entries will be added",
+    noChanges: "No changes and no new catalog entries.",
+    removalNeedsLive: "Removals require live account evidence",
+    removedAccount: "Not reported by this account",
     removedUnresolvable: "Not resolvable by the current catalog",
-    warnings: "Warnings",
     skippedModels: "Upstream entries skipped by validation",
     srcLive: "Account models: live",
-    srcCache: "Account models: cached at {time}; add-only use",
+    srcCache: "Account models: cached at {time}; removals require upgrading to live evidence",
     srcStale: "The cache has no trusted timestamp, is expired, or belongs to changed authorization; reference only.",
     srcLatest: "Catalog source: latest pi-ai from npm",
     srcLocal: "Catalog source: local (npm fetch failed)",
@@ -661,9 +721,6 @@ var DICTS = {
     loading: "\u2026",
     login: "\u6388\u6743\u767B\u5F55",
     logout: "\u9000\u51FA\u767B\u5F55",
-    withdrawAuth: "\u8BF7\u6C42\u64A4\u56DE",
-    withdrawal: "\u64A4\u56DE\u8BF7\u6C42\u5DF2\u53D1\u9001\uFF0C\u7ED3\u679C\u4ECD\u5F85\u6838\u5B9E\u3002",
-    withdrawalUnavailable: "\u672A\u80FD\u5411\u5BBF\u4E3B\u53D1\u9001\u64A4\u56DE\u8BF7\u6C42\uFF0C\u7ED3\u679C\u4ECD\u5F85\u6838\u5B9E\u3002",
     authUnsafe: "\u5C1A\u4E0D\u80FD\u786E\u8BA4\u6388\u6743\u6D41\u7A0B\u5DF2\u5B89\u5168\u7ED3\u675F\uFF0C\u6682\u4E0D\u80FD\u9000\u51FA\u6216\u53D1\u8D77\u65B0\u7684\u6388\u6743\u5C1D\u8BD5\u3002",
     attemptTimeout: "\u7B49\u5F85\u6388\u6743\u8D85\u65F6\uFF0C\u7ED3\u679C\u4ECD\u5F85\u6838\u5B9E\u3002\u5F53\u524D\u4E0D\u80FD\u53D1\u8D77\u65B0\u7684\u6388\u6743\u5C1D\u8BD5\uFF0C\u8BF7\u67E5\u8BE2\u72B6\u6001\u6216\u4EBA\u5DE5\u6838\u5B9E\u3002",
     attemptShared: "\u6B64\u5B9E\u4F8B\u5DF2\u6709\u6388\u6743\u6B63\u5728\u8FDB\u884C\u3002",
@@ -686,28 +743,30 @@ var DICTS = {
     errHttp: "\u6388\u6743\u8BF7\u6C42\u5931\u8D25\u3002\u8BF7\u67E5\u8BE2\u72B6\u6001\u540E\u91CD\u8BD5\u3002",
     logoutScope: "\u5C06\u6E05\u9664\u6B64\u51ED\u636E\u5E93\u4E2D\u7684 Copilot \u6388\u6743\uFF0C\u4F7F\u7528\u540C\u4E00\u51ED\u636E\u5E93\u7684\u5176\u4ED6\u5B9E\u4F8B\u4E5F\u4F1A\u53D7\u5230\u5F71\u54CD\u3002\u6B64\u64CD\u4F5C\u4E0D\u6CE8\u9500 GitHub \u8D26\u53F7\u3002",
     logoutFailed: "\u9000\u51FA\u767B\u5F55\u672A\u5B8C\u6210\uFF0C\u6388\u6743\u51ED\u636E\u4ECD\u53EF\u80FD\u5B58\u5728\u3002\u8BF7\u91CD\u8BD5\u3002",
-    // ---- 模型管理（协议 v2，设计§5） ----
-    supplement: "\u8865\u5145\u6A21\u578B",
-    rebuild: "\u91CD\u5EFA\u6A21\u578B\u5217\u8868",
-    supplementTitle: "\u8865\u5145\u6A21\u578B",
-    rebuildTitle: "\u91CD\u5EFA\u6A21\u578B\u5217\u8868",
-    candidates: "\u53EF\u65B0\u589E\u7684\u6A21\u578B",
+    // ---- 模型管理（协议 v3，设计§5 / ADR 0005） ----
+    manageModels: "\u7BA1\u7406\u6A21\u578B\u5217\u8868",
     selectAll: "\u5168\u9009",
     selectNone: "\u53D6\u6D88\u5168\u9009",
-    supplementRisk: "\u5C06\u4FDD\u7559\u73B0\u6709\u6A21\u578B\u53CA\u5B9A\u5236\uFF0C\u53EA\u6DFB\u52A0\u4F60\u52FE\u9009\u7684\u6A21\u578B\u3002",
-    rebuildRisk: "\u91CD\u5EFA\u5C06\u6E05\u9664\u73B0\u6709\u6A21\u578B\u53C2\u6570\u4E0E\u8986\u76D6\u914D\u7F6E\uFF0C\u5176\u4ED6\u63D0\u4F9B\u65B9\u8BBE\u7F6E\u4E0D\u53D8\u3002",
-    clearRisk: "\u672C\u6B21\u5C06\u6E05\u7A7A Copilot \u6A21\u578B\u5217\u8868\u5E76\u6E05\u9664\u5176\u6A21\u578B\u5B9A\u5236\u3002\u8BF7\u5355\u72EC\u786E\u8BA4\u6E05\u7A7A\u3002",
-    secondConfirm: "\u6B64\u64CD\u4F5C\u5177\u6709\u7834\u574F\u6027\uFF0C\u8BF7\u518D\u6B21\u70B9\u51FB\u786E\u8BA4\u3002",
+    alignAction: "\u5BF9\u9F50\u8D26\u53F7\u4E0E\u76EE\u5F55",
+    groupAddable: "\u53EF\u65B0\u589E",
+    groupListed: "\u5728\u5217",
+    groupRemoval: "\u5F85\u5220\u9664\u5019\u9009",
+    retain: "\u633D\u7559\uFF1A\u91CD\u65B0\u52FE\u9009\u4EE5\u4FDD\u7559",
+    customizedBadge: "\u6709\u5B9A\u5236",
+    clearOverrides: "\u540C\u65F6\u6E05\u9664\u5168\u90E8\u6A21\u578B\u5B9A\u5236\u3002",
+    inheritedOverrides: "\u5B58\u5728\u7EE7\u627F\u7684\u6A21\u578B\u5B9A\u5236\uFF0C\u65E0\u6CD5\u5728\u6B64\u6E05\u9664\u3002",
+    clearRisk: "\u6E05\u7A7A\u4E0D\u4F1A\u9690\u85CF\u6A21\u578B\u2014\u2014\u4F1A\u8BDD\u5185\u5C06\u663E\u793A\u5168\u90E8\u53EF\u7528\u6A21\u578B\uFF1B\u8981\u7CBE\u7B80\uFF0C\u53EA\u9700\u52FE\u9009\u4FDD\u7559\u9879\u3002",
     applyChanges: "\u5E94\u7528\u66F4\u6539",
-    addedModels: "\u5C06\u6DFB\u52A0\u7684\u6A21\u578B",
-    removedModels: "\u5C06\u79FB\u9664\u7684\u6A21\u578B",
-    keptModels: "\u4FDD\u7559",
-    removedAccount: "\u672A\u5305\u542B\u5728\u672C\u6B21\u8D26\u53F7\u6A21\u578B\u5217\u8868",
-    removedUnresolvable: "\u5F53\u524D\u76EE\u5F55\u65E0\u6CD5\u89E3\u6790",
-    warnings: "\u8B66\u544A",
+    removalRisk: "\u5C06\u79FB\u9664 {count} \u4E2A\u5728\u5217\u6A21\u578B\uFF0C\u5176\u5B9A\u5236\u968F\u4E4B\u6E05\u9664\u3002",
+    summaryLine: "\u5E94\u7528\u540E\u5171 {total} \u4E2A\uFF1A\u4FDD\u7559 {kept} \xB7 \u65B0\u589E {added} \xB7 \u79FB\u9664 {removed}",
+    catalogNotice: "\u76EE\u5F55\u5C06\u65B0\u589E {count} \u6761\u63CF\u8FF0",
+    noChanges: "\u65E0\u9700\u66F4\u6539\uFF0C\u76EE\u5F55\u4E5F\u65E0\u65B0\u6570\u636E\u3002",
+    removalNeedsLive: "\u79FB\u9664\u7C7B\u66F4\u6539\u9700\u8981\u5B9E\u65F6\u8D26\u53F7\u8BC1\u636E",
+    removedAccount: "\u8D26\u53F7\u672A\u62A5\u544A",
+    removedUnresolvable: "\u76EE\u5F55\u65E0\u6CD5\u89E3\u6790",
     skippedModels: "\u88AB\u6821\u9A8C\u8DF3\u8FC7\u7684\u4E0A\u6E38\u6761\u76EE",
     srcLive: "\u8D26\u53F7\u6A21\u578B\uFF1A\u5B9E\u65F6\u83B7\u53D6",
-    srcCache: "\u8D26\u53F7\u6A21\u578B\uFF1A\u7F13\u5B58\uFF0C\u83B7\u53D6\u4E8E {time}\uFF0C\u4EC5\u53EF\u7528\u4E8E\u8865\u5145",
+    srcCache: "\u8D26\u53F7\u6A21\u578B\uFF1A\u7F13\u5B58\uFF0C\u83B7\u53D6\u4E8E {time}\uFF1B\u79FB\u9664\u7C7B\u66F4\u6539\u9700\u5347\u7EA7\u4E3A\u5B9E\u65F6\u8BC1\u636E",
     srcStale: "\u7F13\u5B58\u7F3A\u5C11\u53EF\u4FE1\u65F6\u95F4\u3001\u5DF2\u8FC7\u671F\u6216\u6388\u6743\u5DF2\u53D8\u5316\uFF0C\u4EC5\u4F9B\u53C2\u8003\u3002",
     srcLatest: "\u76EE\u5F55\u6765\u6E90\uFF1Anpm \u6700\u65B0 pi-ai",
     srcLocal: "\u76EE\u5F55\u6765\u6E90\uFF1A\u672C\u5730\u76EE\u5F55\uFF08npm \u62C9\u53D6\u5931\u8D25\uFF09",
@@ -872,134 +931,134 @@ function sampleThemeSurface() {
 }
 function RefreshModal({ t, flow, onSelect, onConfirm, onCancel, onOverlay }) {
   const p = flow.preview;
-  const diff = p.diff ?? {};
-  const isRebuild = p.operation === "rebuild";
-  const emptyTarget = isRebuild && (diff.targetView?.models ?? []).length === 0;
-  const candidates = diff.candidates ?? [];
+  const isStale = p.evidence?.stale === true;
+  const degradedCatalog = p.catalogSource === "local" || p.catalogSource === "overlay";
+  const locked = isStale || degradedCatalog;
+  const rows = p.rows ?? [];
+  const addableIds = rows.filter((r) => r.status === "addable").map((r) => r.id);
+  const rawAllIds = rows.filter((r) => r.status !== "addable").map((r) => r.id);
+  const removalRows = rows.filter((r) => r.status === "removal-proposal");
   const [localSel, setLocalSel] = (0, import_react.useState)(null);
+  const [coChecked, setCoChecked] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
     setLocalSel(null);
+    setCoChecked(p.clearOverrides === true);
   }, [p.diff]);
-  const selectedIds = new Set(localSel ?? (diff.added ?? []));
-  const emitSel = (ids) => {
-    setLocalSel(new Set(ids));
-    onSelect(ids);
+  const lockedIds = rows.filter((r) => r.status === "removal-proposal" && locked).map((r) => r.id);
+  const selected = (() => {
+    const s = new Set(localSel ?? (p.diff?.selectedIds ?? []));
+    for (const id of lockedIds) s.add(id);
+    return s;
+  })();
+  const confirmEmptyOf = (set) => set.size === 0 && p.hadModels === true;
+  const emitSel = (nextSet) => {
+    setLocalSel(nextSet);
+    const ce = confirmEmptyOf(nextSet);
+    onSelect({ selectedIds: [...nextSet], clearOverrides: coChecked, ...ce ? { confirmEmpty: true } : {} });
+  };
+  const toggle = (id) => {
+    const next = new Set(selected);
+    if (next.has(id)) next.delete(id);
+    else next.add(id);
+    emitSel(next);
+  };
+  const toggleClearOverrides = (v) => {
+    setCoChecked(v);
+    const ce = confirmEmptyOf(selected);
+    onSelect({ selectedIds: [...selected], clearOverrides: v, ...ce ? { confirmEmpty: true } : {} });
   };
-  const [stage, setStage] = (0, import_react.useState)(0);
+  const keptCount = rawAllIds.filter((id) => selected.has(id)).length;
+  const addedCount = addableIds.filter((id) => selected.has(id)).length;
+  const removedCount = rawAllIds.length - keptCount;
+  const total = keptCount + addedCount;
+  const emptyTarget = confirmEmptyOf(selected);
+  const applyBlocked = isStale || removedCount > 0 && (p.evidence?.source !== "live" || degradedCatalog);
   const cancelRef = (0, import_react.useRef)(null);
   const surface = (0, import_react.useRef)(null);
   if (!surface.current) surface.current = sampleThemeSurface();
-  (0, import_react.useEffect)(() => {
-    setStage(0);
-  }, [p.previewId]);
-  (0, import_react.useEffect)(() => {
-    if (stage > 0) cancelRef.current?.focus();
-  }, [stage]);
   const escCancel = (e) => {
     if (e.key === "Escape") onCancel();
   };
   const confirmClick = () => {
-    if (p.evidence?.stale === true) return;
-    if (!isRebuild) {
-      onConfirm({ second: false, empty: false });
-      return;
-    }
-    if (stage === 0) {
-      setStage(1);
-      return;
-    }
-    if (emptyTarget && stage === 1) {
-      setStage(2);
-      return;
-    }
-    onConfirm({ second: true, empty: emptyTarget });
+    if (isStale || applyBlocked) return;
+    onConfirm({});
   };
   const sourceLine = [
     p.evidence?.source === "live" ? t("srcLive") : p.evidence?.source === "cache" ? t("srcCache").replace("{time}", String(p.evidence?.fetchedAt ?? "")) : null,
     p.catalogSource === "latest" ? t("srcLatest") : p.catalogSource === "overlay" ? t("srcOverlay") : t("srcLocal")
   ].filter(Boolean).join(" \xB7 ");
-  const list = (items, style, render) => items.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { opacity: 0.6 }, children: t("none") }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { style: styles.diffList, children: items.map((x, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("li", { style: { ...style, ...styles.mono }, children: render ? render(x) : x }, x?.id ?? x ?? i)) });
+  const groupDefs = [
+    { key: "groupAddable", items: rows.filter((r) => r.status === "addable") },
+    { key: "groupListed", items: rows.filter((r) => r.status === "listed") },
+    { key: "groupRemoval", items: removalRows, retain: true }
+  ];
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: styles.modalMask, role: "dialog", "aria-modal": "true", onKeyDown: escCancel, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { ...styles.modal, background: surface.current.bg, color: surface.current.fg, height: "min(80vh, 680px)", padding: 0, overflow: "hidden" }, children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { padding: "18px 20px 6px" }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h4", { style: styles.modalTitle, children: t(isRebuild ? "rebuildTitle" : "supplementTitle") }),
-      flow.staleNotice && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h4", { style: styles.modalTitle, children: t("manageModels") }),
+      flow.staleNotice && !(!isStale && p.evidence?.source !== "live" && p.catalogSource === "latest") && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
         "\u26A0 ",
         t("previewStale")
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: styles.modalText, children: sourceLine }),
-      p.evidence?.stale === true && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
+      isStale && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
         "\u26A0 ",
         t("srcStale")
       ] })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { flex: 1, overflowY: "auto", minHeight: 0, scrollbarGutter: "stable", padding: "0 20px" }, children: [
-      !isRebuild && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("candidates") }),
-          "\uFF08",
-          candidates.length,
-          "\uFF09",
-          candidates.length > 0 && (() => {
-            const allSelected = candidates.every((id) => selectedIds.has(id));
-            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.secondary, height: 24, marginLeft: 10, fontSize: 12 }, onClick: () => emitSel(allSelected ? [] : candidates), children: allSelected ? t("selectNone") : t("selectAll") });
-          })()
-        ] }),
-        list(candidates, styles.added, (id) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { style: { display: "flex", gap: 8, alignItems: "center" }, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", checked: selectedIds.has(id), onChange: () => {
-            const next = new Set(selectedIds);
-            if (next.has(id)) next.delete(id);
-            else next.add(id);
-            emitSel([...next]);
-          } }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: id })
-        ] })),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
-          "\u26A0 ",
-          t("supplementRisk")
-        ] })
-      ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("addedModels") }),
-        "\uFF08",
-        (diff.added ?? []).length,
-        "\uFF09"
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { display: "flex", gap: 8, alignItems: "center", flexWrap: "wrap", padding: "6px 0" }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          "button",
+          {
+            type: "button",
+            style: { ...styles.button, ...styles.secondary, height: 24, fontSize: 12 },
+            onClick: () => emitSel(/* @__PURE__ */ new Set([...addableIds, ...rawAllIds])),
+            children: t("selectAll")
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          "button",
+          {
+            type: "button",
+            style: { ...styles.button, ...styles.secondary, height: 24, fontSize: 12 },
+            onClick: () => emitSel(new Set(lockedIds)),
+            children: t("selectNone")
+          }
+        ),
+        removalRows.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          "button",
+          {
+            type: "button",
+            style: { ...styles.button, ...styles.secondary, height: 24, fontSize: 12, ...locked ? { opacity: 0.5, cursor: "not-allowed" } : null },
+            disabled: locked,
+            title: locked ? t("removalNeedsLive") : void 0,
+            onClick: () => emitSel(/* @__PURE__ */ new Set([...addableIds, ...rows.filter((r) => r.status === "listed").map((r) => r.id)])),
+            children: t("alignAction")
+          }
+        )
       ] }),
-      list(diff.added ?? [], styles.added),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("removedModels") }),
-        "\uFF08",
-        (diff.removed ?? []).length,
-        "\uFF09"
-      ] }),
-      list(diff.removed ?? [], styles.removed, (x) => `${x.id} \u2014 ${t(x.reason === "unresolvable" ? "removedUnresolvable" : "removedAccount")}`),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("keptModels") }),
-        "\uFF08",
-        (diff.kept ?? []).length,
-        "\uFF09"
-      ] }),
-      list(diff.kept ?? [], styles.muted),
-      (diff.warnings ?? []).length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.modalText, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: t("warnings") }),
+      groupDefs.map(({ key, items, retain }) => items.length === 0 ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { marginBottom: 8 }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: { ...styles.modalText, fontWeight: 600, margin: "6px 0 2px" }, title: retain ? t("retain") : void 0, children: [
+          t(key),
           "\uFF08",
-          diff.warnings.length,
+          items.length,
           "\uFF09"
         ] }),
-        list(diff.warnings, styles.skipped, (w) => `${w.id ?? ""} \u2014 ${w.reason ?? ""}`)
-      ] }),
-      isRebuild && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
-        "\u26A0 ",
-        t("rebuildRisk")
-      ] }),
-      emptyTarget && stage >= 1 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
-        "\u26A0 ",
-        t("clearRisk")
-      ] }),
-      stage === 1 && !emptyTarget && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
-        "\u26A0 ",
-        t("secondConfirm")
-      ] }),
+        items.map((r) => {
+          const forceKept = r.status === "removal-proposal" && locked;
+          const checked = forceKept || selected.has(r.id);
+          return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { style: { display: "flex", gap: 8, alignItems: "center", padding: "2px 0" }, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", checked, disabled: forceKept, onChange: () => toggle(r.id) }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: styles.mono, children: r.id }),
+            r.status === "removal-proposal" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { ...styles.removed, fontSize: 12 }, children: t(r.reason === "unresolvable" ? "removedUnresolvable" : "removedAccount") }),
+            r.customized === true && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { ...styles.muted, fontSize: 12 }, children: t("customizedBadge") })
+          ] }, r.id);
+        })
+      ] }, key)),
+      (p.overridesMeta?.clearable || p.overridesMeta?.inheritedOnly) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: { padding: "4px 0" }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { style: { display: "flex", gap: 8, alignItems: "center" }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", checked: coChecked, disabled: !p.overridesMeta?.clearable, onChange: (e) => toggleClearOverrides(e.target.checked) }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: p.overridesMeta?.clearable ? void 0 : { ...styles.muted, fontSize: 13 }, children: t(p.overridesMeta?.clearable ? "clearOverrides" : "inheritedOverrides") })
+      ] }) }),
       (p.skipped ?? []).length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("details", { style: styles.modalText, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("summary", { children: [
           t("skippedModels"),
@@ -1013,25 +1072,57 @@ function RefreshModal({ t, flow, onSelect, onConfirm, onCancel, onOverlay }) {
           s.reason
         ] }, s.id)) })
       ] }),
-      p.catalogError && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("details", { style: styles.modalText, children: [
+      ((p.diff?.warnings ?? []).length > 0 || p.catalogError) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("details", { style: styles.modalText, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("summary", { children: t("techDetails") }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { ...styles.mono, fontSize: 12 }, children: p.catalogError })
+        (p.diff?.warnings ?? []).length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("ul", { style: styles.diffList, children: (p.diff?.warnings ?? []).map((w, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("li", { style: styles.skipped, children: [
+          w.id,
+          " \u2014 ",
+          w.reason
+        ] }, w.id ?? i)) }),
+        p.catalogError && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { ...styles.mono, fontSize: 12 }, children: p.catalogError })
       ] })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: { padding: "8px 20px 16px" }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.modalActions, children: [
-      p.catalogSource === "local" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.secondary, marginRight: "auto" }, onClick: onOverlay, children: t("overlayBtn") }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { ref: cancelRef, type: "button", style: { ...styles.button, ...styles.secondary }, onClick: onCancel, children: t("cancel") }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        "button",
-        {
-          type: "button",
-          style: { ...styles.button, ...styles.primary, ...p.evidence?.stale === true ? { opacity: 0.5, cursor: "not-allowed" } : null },
-          disabled: p.evidence?.stale === true,
-          onClick: confirmClick,
-          children: t("applyChanges")
-        }
-      )
-    ] }) })
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { padding: "8px 20px 16px" }, children: [
+      (removedCount > 0 || coChecked || emptyTarget) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { marginBottom: 4 }, children: [
+        removedCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
+          "\u26A0 ",
+          t("removalRisk").replace("{count}", String(removedCount))
+        ] }),
+        coChecked && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
+          "\u26A0 ",
+          t("clearOverrides")
+        ] }),
+        emptyTarget && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.risk, children: [
+          "\u26A0 ",
+          t("clearRisk")
+        ] })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: { ...styles.modalText, margin: 0 }, children: total === 0 && removedCount === 0 && (p.catalogNewEntries ?? 0) === 0 ? t("noChanges") : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+        t("summaryLine").replace("{total}", String(total)).replace("{kept}", String(keptCount)).replace("{added}", String(addedCount)).replace("{removed}", String(removedCount)),
+        (p.catalogNewEntries ?? 0) > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+          " \xB7 ",
+          t("catalogNotice").replace("{count}", String(p.catalogNewEntries))
+        ] })
+      ] }) }),
+      removedCount > 0 && applyBlocked && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
+        "\u26A0 ",
+        t("removalNeedsLive")
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.modalActions, children: [
+        p.catalogSource === "local" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.secondary, marginRight: "auto" }, onClick: onOverlay, children: t("overlayBtn") }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { ref: cancelRef, type: "button", style: { ...styles.button, ...styles.secondary }, onClick: onCancel, children: t("cancel") }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          "button",
+          {
+            type: "button",
+            style: { ...styles.button, ...styles.primary, ...applyBlocked ? { opacity: 0.5, cursor: "not-allowed" } : null },
+            disabled: applyBlocked,
+            onClick: confirmClick,
+            children: t("applyChanges")
+          }
+        )
+      ] })
+    ] })
   ] }) });
 }
 function RetireDialog({ t, onConfirm, onCancel }) {
@@ -1098,9 +1189,6 @@ function CopilotSection({ t = (key) => DICTS.en[key] ?? key }) {
     setCopyFail(false);
     void authFlowRef.current?.start();
   };
-  const withdraw = () => {
-    void authFlowRef.current?.cancel();
-  };
   const checkStatus = () => {
     void authFlowRef.current?.refresh();
   };
@@ -1151,15 +1239,13 @@ function CopilotSection({ t = (key) => DICTS.en[key] ?? key }) {
         ] }),
         codeNotice.url && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", { style: styles.link, href: codeNotice.url, target: "_blank", rel: "noreferrer", children: codeNotice.url }),
         copyFail && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: styles.error, children: t("copyFailed") })
-      ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.secondary }, onClick: withdraw, children: t("withdrawAuth") }) })
+      ] })
     ] }),
     phase === "risk" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: styles.card, children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.banner, children: [
         "\u26A0 ",
         t("authUnsafe")
       ] }),
-      auth.riskKind === "withdrawal-pending-unverified" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: styles.modalText, children: auth.withdrawalDelivery === "invoked" ? t("withdrawal") : t("withdrawalUnavailable") }),
       auth.riskKind === "timed-out-unverified" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { style: styles.modalText, children: t("attemptTimeout") }),
       /* @__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") }) })
     ] }),
@@ -1204,28 +1290,16 @@ function CopilotSection({ t = (key) => DICTS.en[key] ?? key }) {
             }
           );
         })(),
-        ["previewing", "applying", "checking", "retiring"].includes(flow.name) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.primary, opacity: 0.5 }, disabled: true, children: flow.name === "applying" ? t("applying") : t("refreshing") }) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-            "button",
-            {
-              type: "button",
-              style: { ...styles.button, ...styles.primary, ...refreshBlocked(flow.flags) ? { opacity: 0.5, cursor: "not-allowed" } : null },
-              disabled: refreshBlocked(flow.flags),
-              onClick: () => drive({ type: "start", operation: "supplement" }),
-              children: t("supplement")
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-            "button",
-            {
-              type: "button",
-              style: { ...styles.button, ...styles.primary, ...refreshBlocked(flow.flags) ? { opacity: 0.5, cursor: "not-allowed" } : null },
-              disabled: refreshBlocked(flow.flags),
-              onClick: () => drive({ type: "start", operation: "rebuild" }),
-              children: t("rebuild")
-            }
-          )
-        ] })
+        ["previewing", "applying", "checking", "retiring"].includes(flow.name) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", style: { ...styles.button, ...styles.primary, opacity: 0.5 }, disabled: true, children: flow.name === "applying" ? t("applying") : t("refreshing") }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          "button",
+          {
+            type: "button",
+            style: { ...styles.button, ...styles.primary, ...refreshBlocked(flow.flags) ? { opacity: 0.5, cursor: "not-allowed" } : null },
+            disabled: refreshBlocked(flow.flags),
+            onClick: () => drive({ type: "start", operation: "manage" }),
+            children: t("manageModels")
+          }
+        )
       ] }),
       auth.logoutError && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { style: styles.error, children: [
         "\u26A0 ",
@@ -1285,7 +1359,7 @@ function CopilotSection({ t = (key) => DICTS.en[key] ?? key }) {
       {
         t,
         flow,
-        onSelect: (selectedIds) => drive({ type: "select", selectedIds }),
+        onSelect: ({ selectedIds, clearOverrides, confirmEmpty }) => drive({ type: "select", selectedIds, clearOverrides, confirmEmpty }),
         onConfirm: (opts) => drive({ type: "confirm", ...opts }),
         onCancel: () => drive({ type: "cancel" }),
         onOverlay: () => drive({ type: "start", catalogSource: "overlay" })