dsh-codearts 1.2.9 → 1.2.10

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 本文件记录本插件的重要改动。格式参考 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，
 版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
 
+## [1.2.10] - 2026-11-06
+
+### 新增
+
+- **每个账号都能「重新登录」，凭证写回原条目**：以前账号过期时卡片上只有「删除」，
+  要先删掉再加回来，账号的展示顺序和备注全丢。现在账号行多了「重新登录」按钮
+  （过期的账号显示为主色按钮），走一遍浏览器 OAuth 就把新凭证写回同一条，id、顺序、
+  备注都保留。手工粘贴 token 的账号同样适用。
+- 点了 A 账号的重登却登成了 B 账号时，B 会作为新账号添加，A 原样不动，并提示
+  「你登录的是另一个账号，已作为新账号添加；原账号保持不变」——不会把 A 的凭证
+  悄悄换成别人的。
+
 ## [1.2.9] - 2026-11-06
 
 ### 变更

package/lib/bin.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { R as isBenefitModel, V as CodeArtsAccountStore, W as codeartsAccountsPath, d as fetchCallerIdentity, n as codeartsUsagePath, r as discoverModels, t as CodeArtsUsageTracker } from "./usage-B2LNsUuR.mjs";
+import { R as isBenefitModel, V as CodeArtsAccountStore, W as codeartsAccountsPath, d as fetchCallerIdentity, n as codeartsUsagePath, r as discoverModels, t as CodeArtsUsageTracker } from "./usage-CjPd0Gok.mjs";
 import { existsSync, statSync } from "node:fs";
 //#region src/version.ts
-const CODEARTS_VERSION = "1.2.9";
+const CODEARTS_VERSION = "1.2.10";
 //#endregion
 //#region src/bin.ts
 /**

package/lib/client/index.d.cts

@@ -32,6 +32,12 @@ interface CodeArtsSettingsKey {
   expiredHint: string;
   accountsTitle: string;
   accountRemove: string;
+  /** 重新登录这个账号：新凭证写回原条目，不会多出一条。 */
+  accountRelogin: string;
+  /** 该账号正在浏览器里授权。 */
+  reloginPending: string;
+  /** 「重新登录」却登了另一个账号：已作为新账号添加，原账号未动。 */
+  reloginOtherAccount: string;
   addAccount: string;
   pasteTokenAdd: string;
   accountsRotateHint: string;

package/lib/client/index.js

@@ -62,7 +62,7 @@ function subscribeSidebarPanelWanted(listener) {
 }
 //#endregion
 //#region \0dsh-css:/home/runner/work/dsh-codearts/dsh-codearts/src/client/CodeArtsPluginCard.module.css.mjs
-const css$1 = ".xoziZG_card{border:.5px solid var(--dsw-alias-settings-card-stroke);border-radius:var(--dsw-radius-lg);background:var(--dsw-alias-settings-card-fill);max-width:720px}.xoziZG_header{align-items:flex-start;gap:12px;padding:14px 16px;display:flex}.xoziZG_headText{flex-direction:column;flex:1;gap:6px;min-width:0;display:flex}.xoziZG_name{color:var(--dsw-alias-label-primary);font-size:15px;font-weight:600;line-height:22px}.xoziZG_desc{color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:20px}.xoziZG_statusLine{color:var(--dsw-alias-label-primary);align-items:center;gap:6px;font-size:14px;font-weight:500;line-height:22px;display:inline-flex}.xoziZG_meta{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;font-size:12px;line-height:18px}.xoziZG_body{border-top:.5px solid var(--dsw-alias-border-l2);margin:0 16px;padding:4px 0 16px}.xoziZG_tabs{margin-top:12px}.xoziZG_tabPanel{padding-top:2px}.xoziZG_accountToolbar{gap:8px;margin-top:12px;display:flex}.xoziZG_accountToolbar>*{flex:1}.xoziZG_manualForm{border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-md);margin-top:12px;padding:12px}.xoziZG_accountCard{flex-direction:column;gap:10px;margin-top:12px;display:flex}.xoziZG_accountEntry{border:.5px solid var(--dsw-alias-border-l2);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-2)}.xoziZG_accountRow{align-items:center;gap:10px;padding:12px;display:flex}.xoziZG_claimAllRow{border-top:.5px solid var(--dsw-alias-border-l2);justify-content:flex-end;padding:10px 12px 0;display:flex}.xoziZG_avatar{background:var(--dsw-alias-bg-layer-3);width:32px;height:32px;color:var(--dsw-alias-label-primary);border-radius:50%;flex:none;justify-content:center;align-items:center;font-size:14px;font-weight:600;display:inline-flex}.xoziZG_accountInfo{flex-direction:column;flex:1;gap:2px;min-width:0;display:flex}.xoziZG_accountNameRow{align-items:center;gap:6px;min-width:0;display:flex}.xoziZG_accountName{color:var(--dsw-alias-label-primary);text-overflow:ellipsis;white-space:nowrap;font-size:14px;font-weight:600;line-height:20px;overflow:hidden}.xoziZG_accountRowActions{flex:none;gap:6px;display:flex}.xoziZG_accountHint{color:var(--dsw-alias-label-tertiary);margin:0;padding:0 12px 12px;font-size:12px;line-height:18px}.xoziZG_creditBlock{border-top:.5px solid var(--dsw-alias-border-l2);padding:12px}.xoziZG_balanceRow{flex-wrap:wrap;align-items:baseline;gap:6px;display:flex}.xoziZG_balance{color:var(--dsw-alias-label-primary);letter-spacing:-.02em;font-variant-numeric:tabular-nums;font-size:28px;font-weight:600;line-height:34px}.xoziZG_balanceUnit{color:var(--dsw-alias-label-secondary);font-size:12px}.xoziZG_balanceMeta{color:var(--dsw-alias-label-tertiary);margin-left:2px;font-size:12px}.xoziZG_updated{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;margin-left:auto;font-size:12px}.xoziZG_creditRows{flex-direction:column;gap:4px;margin-top:8px;display:flex}.xoziZG_creditRow{color:var(--dsw-alias-label-secondary);font-variant-numeric:tabular-nums;justify-content:space-between;align-items:baseline;gap:12px;font-size:12px;line-height:18px;display:flex}.xoziZG_usageBar{background:var(--dsw-alias-border-l2);border-radius:2px;height:4px;margin-top:4px;display:block;overflow:hidden}.xoziZG_usageFill{background:var(--dsw-alias-brand-primary);border-radius:2px;height:100%;transition:width .2s;display:block}.xoziZG_expiryRow{margin-top:2px}.xoziZG_expiryLabel{color:var(--dsw-alias-state-warn-label)}.xoziZG_bar{background:var(--dsw-alias-bg-layer-3);border-radius:2px;height:4px;margin-top:6px;display:block;overflow:hidden}.xoziZG_barFill{background:var(--dsw-alias-state-warn-primary);border-radius:2px;height:100%;display:block}.xoziZG_creditLink{margin-top:8px;display:inline-block}.xoziZG_creditFooter{border-top:.5px solid var(--dsw-alias-border-l2);justify-content:space-between;align-items:center;gap:8px;margin-top:12px;padding-top:10px;display:flex}.xoziZG_creditHint{color:var(--dsw-alias-label-tertiary);margin:8px 0 0;font-size:12px;line-height:18px}.xoziZG_section{margin-top:16px}.xoziZG_sectionHead{justify-content:space-between;align-items:baseline;gap:12px;display:flex}.xoziZG_sectionLabel{color:var(--dsw-alias-label-tertiary);font-size:11px;font-weight:500}.xoziZG_count{color:var(--dsw-alias-label-secondary);font-variant-numeric:tabular-nums;flex:none;font-size:12px}.xoziZG_hint{color:var(--dsw-alias-label-secondary);margin:8px 0 0;font-size:13px;line-height:20px}.xoziZG_error{color:var(--dsw-alias-state-error-primary);margin:10px 0 0;font-size:13px;line-height:20px}.xoziZG_actions{flex-wrap:wrap;align-items:center;gap:8px;margin-top:12px;display:flex}.xoziZG_danger{color:var(--dsw-alias-state-error-primary)}.xoziZG_link{appearance:none;color:var(--dsw-alias-brand-text);font:inherit;text-align:left;word-break:break-all;cursor:pointer;background:0 0;border:none;padding:0;font-size:12px}.xoziZG_link:hover{text-decoration:underline}.xoziZG_choices{flex-direction:column;gap:2px;margin-top:8px;display:flex}.xoziZG_choiceRow{border-radius:var(--dsw-radius-sm);align-items:center;gap:8px;margin:0 -6px;padding:5px 6px;display:flex}.xoziZG_choiceRow:hover{background:var(--dsw-alias-interactive-bg-hover)}.xoziZG_statGrid{grid-template-columns:repeat(3,minmax(0,1fr));gap:8px;margin:10px 0 14px;display:grid}.xoziZG_statCard{border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-md);flex-direction:column;gap:1px;padding:8px 10px;display:flex}.xoziZG_statLabel{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:16px}.xoziZG_statValue{color:var(--dsw-alias-label-primary);font-variant-numeric:tabular-nums;font-size:15px;line-height:20px}.xoziZG_statSub{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;font-size:11px;line-height:16px}.xoziZG_modelChart{flex-direction:column;gap:2px;margin-top:8px;display:flex}.xoziZG_modelRow{font-variant-numeric:tabular-nums;border-radius:6px;grid-template-columns:minmax(0,1.2fr) minmax(48px,1fr) 56px 52px 64px;align-items:center;gap:8px;padding:4px 0;display:grid;position:relative}.xoziZG_modelRow:hover{background:var(--dsw-alias-interactive-bg-hover)}.xoziZG_usageTip{z-index:5;border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-3);min-width:180px;max-width:260px;color:var(--dsw-alias-label-secondary);text-align:left;font-variant-numeric:tabular-nums;pointer-events:none;padding:8px 10px;font-size:12px;line-height:1.9;position:absolute;bottom:calc(100% + 6px);right:0;box-shadow:0 10px 28px #00000073}.xoziZG_usageTip[data-float=true]{z-index:40;position:fixed;bottom:auto;right:auto}.xoziZG_usageTipName{max-width:240px;color:var(--dsw-alias-label-primary);text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.xoziZG_usageTipSep{background:var(--dsw-alias-border-l2);height:1px;margin:4px 0}.xoziZG_usageTipRow{justify-content:space-between;gap:24px;display:flex}.xoziZG_usageTipRow span:last-child{color:var(--dsw-alias-label-primary);font-weight:600}.xoziZG_modelName{color:var(--dsw-alias-label-primary);text-overflow:ellipsis;white-space:nowrap;font-size:12px;line-height:18px;overflow:hidden}.xoziZG_modelTrack{background:var(--dsw-alias-border-l2);border-radius:4px;height:8px;display:block;overflow:hidden}.xoziZG_modelFill{background:var(--dsw-alias-brand-primary);border-radius:4px;height:100%;transition:width .16s;display:block}.xoziZG_modelTokens,.xoziZG_modelShare,.xoziZG_modelRequests{color:var(--dsw-alias-label-secondary);text-align:right;white-space:nowrap;font-size:11px;line-height:16px}.xoziZG_modelRequests{color:var(--dsw-alias-label-tertiary)}.xoziZG_heatGrid{grid-template-columns:repeat(7,minmax(0,1fr));gap:4px;margin:8px 0 2px;display:grid}.xoziZG_heatWeekday{color:var(--dsw-alias-label-tertiary);text-align:center;font-size:10px;line-height:14px}.xoziZG_heatCell{background:color-mix(in srgb, var(--dsw-alias-label-primary) 6%, transparent);height:36px;color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;border:0;border-radius:8px;outline:0;justify-content:center;align-items:center;font-size:12px;transition:background .12s ease-out;display:flex}.xoziZG_heatCell[data-tone=empty]{color:var(--dsw-alias-label-tertiary)}.xoziZG_heatCell[data-tone=pad]{background:0 0}.xoziZG_heatCell[data-tone=out]{color:var(--dsw-alias-label-tertiary);opacity:.45;background:0 0}.xoziZG_heatCell[data-tone=lv1]{color:#0f1115;background:#ddf4e7}.xoziZG_heatCell[data-tone=lv2]{color:#0f1115;background:#b3e8cc}.xoziZG_heatCell[data-tone=lv3]{color:#0f1115;background:#7dd8ac}.xoziZG_heatCell[data-tone=lv4]{color:#fff;background:#40c584}.xoziZG_heatCell[data-tone=lv5]{color:#fff;background:#16a34a}.xoziZG_heatCell[data-today=true]{font-weight:700;box-shadow:inset 0 -2px}.xoziZG_heatHours{grid-template-columns:repeat(24,minmax(0,1fr));gap:3px;margin:8px 0 0;display:grid}.xoziZG_heatHourCell{background:color-mix(in srgb, var(--dsw-alias-label-primary) 6%, transparent);border-radius:4px;height:26px;transition:background .12s ease-out}.xoziZG_heatHourCell[data-tone=lv1]{background:#ddf4e7}.xoziZG_heatHourCell[data-tone=lv2]{background:#b3e8cc}.xoziZG_heatHourCell[data-tone=lv3]{background:#7dd8ac}.xoziZG_heatHourCell[data-tone=lv4]{background:#40c584}.xoziZG_heatHourCell[data-tone=lv5]{background:#16a34a}.xoziZG_heatAxis{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;grid-template-columns:repeat(24,minmax(0,1fr));gap:3px;font-size:10px;line-height:14px;display:grid}.xoziZG_heatAxisSlot{text-align:center;white-space:nowrap;overflow:hidden}.xoziZG_heatLegend{color:var(--dsw-alias-label-tertiary);justify-content:flex-start;align-items:center;gap:3px;margin:0 0 6px;font-size:10px;display:flex}.xoziZG_heatLegendChip{border-radius:3px;width:10px;height:10px}.xoziZG_heatLegendChip[data-tone=lv1]{background:#ddf4e7}.xoziZG_heatLegendChip[data-tone=lv2]{background:#b3e8cc}.xoziZG_heatLegendChip[data-tone=lv3]{background:#7dd8ac}.xoziZG_heatLegendChip[data-tone=lv4]{background:#40c584}.xoziZG_heatLegendChip[data-tone=lv5]{background:#16a34a}.xoziZG_trendTip{color:var(--dsw-alias-label-secondary);font-variant-numeric:tabular-nums;margin:2px 0 0;font-size:11px;line-height:16px}.xoziZG_check{flex:1;min-width:0}.xoziZG_check>span{text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.xoziZG_manual{border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-md);margin-top:12px;padding:0 12px}.xoziZG_manual[open]{padding-bottom:12px}.xoziZG_manualSummary{color:var(--dsw-alias-label-secondary);cursor:pointer;align-items:center;gap:6px;padding:9px 0;font-size:13px;list-style:none;display:flex}.xoziZG_manualSummary::-webkit-details-marker{display:none}.xoziZG_field{flex-direction:column;gap:5px;margin-top:10px;display:flex}.xoziZG_fieldLabel{color:var(--dsw-alias-label-tertiary);font-size:12px}.xoziZG_area{box-sizing:border-box;resize:vertical;border:.5px solid var(--dsw-alias-border-l4);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-1);width:100%;color:var(--dsw-alias-label-primary);padding:6px 8px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:13px;line-height:20px}.xoziZG_area::placeholder{color:var(--dsw-alias-label-dimmed)}.xoziZG_area:focus{border-color:var(--dsw-alias-state-business-primary);outline:none}.xoziZG_skeleton{flex-direction:column;gap:10px;padding:4px 0;display:flex}.xoziZG_skeletonRow{border-radius:var(--dsw-radius-sm,4px);background:var(--dsw-alias-border-l2);height:12px;animation:1.4s ease-in-out infinite xoziZG_skeletonBreath}.xoziZG_skeletonRow:nth-child(2){width:72%}.xoziZG_skeletonRow:nth-child(3){width:46%}@keyframes xoziZG_skeletonBreath{0%,to{opacity:.45}50%{opacity:.9}}@media (prefers-reduced-motion:reduce){.xoziZG_skeletonRow{animation:none}}";
+const css$1 = ".xoziZG_card{border:.5px solid var(--dsw-alias-settings-card-stroke);border-radius:var(--dsw-radius-lg);background:var(--dsw-alias-settings-card-fill);max-width:720px}.xoziZG_header{align-items:flex-start;gap:12px;padding:14px 16px;display:flex}.xoziZG_headText{flex-direction:column;flex:1;gap:6px;min-width:0;display:flex}.xoziZG_name{color:var(--dsw-alias-label-primary);font-size:15px;font-weight:600;line-height:22px}.xoziZG_desc{color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:20px}.xoziZG_statusLine{color:var(--dsw-alias-label-primary);align-items:center;gap:6px;font-size:14px;font-weight:500;line-height:22px;display:inline-flex}.xoziZG_meta{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;font-size:12px;line-height:18px}.xoziZG_body{border-top:.5px solid var(--dsw-alias-border-l2);margin:0 16px;padding:4px 0 16px}.xoziZG_tabs{margin-top:12px}.xoziZG_tabPanel{padding-top:2px}.xoziZG_accountToolbar{gap:8px;margin-top:12px;display:flex}.xoziZG_accountToolbar>*{flex:1}.xoziZG_manualForm{border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-md);margin-top:12px;padding:12px}.xoziZG_accountCard{flex-direction:column;gap:10px;margin-top:12px;display:flex}.xoziZG_accountEntry{border:.5px solid var(--dsw-alias-border-l2);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-2)}.xoziZG_accountRow{align-items:center;gap:10px;padding:12px;display:flex}.xoziZG_claimAllRow{border-top:.5px solid var(--dsw-alias-border-l2);justify-content:flex-end;padding:10px 12px 0;display:flex}.xoziZG_avatar{background:var(--dsw-alias-bg-layer-3);width:32px;height:32px;color:var(--dsw-alias-label-primary);border-radius:50%;flex:none;justify-content:center;align-items:center;font-size:14px;font-weight:600;display:inline-flex}.xoziZG_accountInfo{flex-direction:column;flex:1;gap:2px;min-width:0;display:flex}.xoziZG_accountNameRow{align-items:center;gap:6px;min-width:0;display:flex}.xoziZG_accountName{color:var(--dsw-alias-label-primary);text-overflow:ellipsis;white-space:nowrap;font-size:14px;font-weight:600;line-height:20px;overflow:hidden}.xoziZG_accountRowActions{flex-wrap:wrap;flex:none;justify-content:flex-end;gap:6px;display:flex}.xoziZG_accountHint{color:var(--dsw-alias-label-tertiary);margin:0;padding:0 12px 12px;font-size:12px;line-height:18px}.xoziZG_creditBlock{border-top:.5px solid var(--dsw-alias-border-l2);padding:12px}.xoziZG_balanceRow{flex-wrap:wrap;align-items:baseline;gap:6px;display:flex}.xoziZG_balance{color:var(--dsw-alias-label-primary);letter-spacing:-.02em;font-variant-numeric:tabular-nums;font-size:28px;font-weight:600;line-height:34px}.xoziZG_balanceUnit{color:var(--dsw-alias-label-secondary);font-size:12px}.xoziZG_balanceMeta{color:var(--dsw-alias-label-tertiary);margin-left:2px;font-size:12px}.xoziZG_updated{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;margin-left:auto;font-size:12px}.xoziZG_creditRows{flex-direction:column;gap:4px;margin-top:8px;display:flex}.xoziZG_creditRow{color:var(--dsw-alias-label-secondary);font-variant-numeric:tabular-nums;justify-content:space-between;align-items:baseline;gap:12px;font-size:12px;line-height:18px;display:flex}.xoziZG_usageBar{background:var(--dsw-alias-border-l2);border-radius:2px;height:4px;margin-top:4px;display:block;overflow:hidden}.xoziZG_usageFill{background:var(--dsw-alias-brand-primary);border-radius:2px;height:100%;transition:width .2s;display:block}.xoziZG_expiryRow{margin-top:2px}.xoziZG_expiryLabel{color:var(--dsw-alias-state-warn-label)}.xoziZG_bar{background:var(--dsw-alias-bg-layer-3);border-radius:2px;height:4px;margin-top:6px;display:block;overflow:hidden}.xoziZG_barFill{background:var(--dsw-alias-state-warn-primary);border-radius:2px;height:100%;display:block}.xoziZG_creditLink{margin-top:8px;display:inline-block}.xoziZG_creditFooter{border-top:.5px solid var(--dsw-alias-border-l2);justify-content:space-between;align-items:center;gap:8px;margin-top:12px;padding-top:10px;display:flex}.xoziZG_creditHint{color:var(--dsw-alias-label-tertiary);margin:8px 0 0;font-size:12px;line-height:18px}.xoziZG_section{margin-top:16px}.xoziZG_sectionHead{justify-content:space-between;align-items:baseline;gap:12px;display:flex}.xoziZG_sectionLabel{color:var(--dsw-alias-label-tertiary);font-size:11px;font-weight:500}.xoziZG_count{color:var(--dsw-alias-label-secondary);font-variant-numeric:tabular-nums;flex:none;font-size:12px}.xoziZG_hint{color:var(--dsw-alias-label-secondary);margin:8px 0 0;font-size:13px;line-height:20px}.xoziZG_error{color:var(--dsw-alias-state-error-primary);margin:10px 0 0;font-size:13px;line-height:20px}.xoziZG_actions{flex-wrap:wrap;align-items:center;gap:8px;margin-top:12px;display:flex}.xoziZG_danger{color:var(--dsw-alias-state-error-primary)}.xoziZG_link{appearance:none;color:var(--dsw-alias-brand-text);font:inherit;text-align:left;word-break:break-all;cursor:pointer;background:0 0;border:none;padding:0;font-size:12px}.xoziZG_link:hover{text-decoration:underline}.xoziZG_choices{flex-direction:column;gap:2px;margin-top:8px;display:flex}.xoziZG_choiceRow{border-radius:var(--dsw-radius-sm);align-items:center;gap:8px;margin:0 -6px;padding:5px 6px;display:flex}.xoziZG_choiceRow:hover{background:var(--dsw-alias-interactive-bg-hover)}.xoziZG_statGrid{grid-template-columns:repeat(3,minmax(0,1fr));gap:8px;margin:10px 0 14px;display:grid}.xoziZG_statCard{border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-md);flex-direction:column;gap:1px;padding:8px 10px;display:flex}.xoziZG_statLabel{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:16px}.xoziZG_statValue{color:var(--dsw-alias-label-primary);font-variant-numeric:tabular-nums;font-size:15px;line-height:20px}.xoziZG_statSub{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;font-size:11px;line-height:16px}.xoziZG_modelChart{flex-direction:column;gap:2px;margin-top:8px;display:flex}.xoziZG_modelRow{font-variant-numeric:tabular-nums;border-radius:6px;grid-template-columns:minmax(0,1.2fr) minmax(48px,1fr) 56px 52px 64px;align-items:center;gap:8px;padding:4px 0;display:grid;position:relative}.xoziZG_modelRow:hover{background:var(--dsw-alias-interactive-bg-hover)}.xoziZG_usageTip{z-index:5;border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-3);min-width:180px;max-width:260px;color:var(--dsw-alias-label-secondary);text-align:left;font-variant-numeric:tabular-nums;pointer-events:none;padding:8px 10px;font-size:12px;line-height:1.9;position:absolute;bottom:calc(100% + 6px);right:0;box-shadow:0 10px 28px #00000073}.xoziZG_usageTip[data-float=true]{z-index:40;position:fixed;bottom:auto;right:auto}.xoziZG_usageTipName{max-width:240px;color:var(--dsw-alias-label-primary);text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.xoziZG_usageTipSep{background:var(--dsw-alias-border-l2);height:1px;margin:4px 0}.xoziZG_usageTipRow{justify-content:space-between;gap:24px;display:flex}.xoziZG_usageTipRow span:last-child{color:var(--dsw-alias-label-primary);font-weight:600}.xoziZG_modelName{color:var(--dsw-alias-label-primary);text-overflow:ellipsis;white-space:nowrap;font-size:12px;line-height:18px;overflow:hidden}.xoziZG_modelTrack{background:var(--dsw-alias-border-l2);border-radius:4px;height:8px;display:block;overflow:hidden}.xoziZG_modelFill{background:var(--dsw-alias-brand-primary);border-radius:4px;height:100%;transition:width .16s;display:block}.xoziZG_modelTokens,.xoziZG_modelShare,.xoziZG_modelRequests{color:var(--dsw-alias-label-secondary);text-align:right;white-space:nowrap;font-size:11px;line-height:16px}.xoziZG_modelRequests{color:var(--dsw-alias-label-tertiary)}.xoziZG_heatGrid{grid-template-columns:repeat(7,minmax(0,1fr));gap:4px;margin:8px 0 2px;display:grid}.xoziZG_heatWeekday{color:var(--dsw-alias-label-tertiary);text-align:center;font-size:10px;line-height:14px}.xoziZG_heatCell{background:color-mix(in srgb, var(--dsw-alias-label-primary) 6%, transparent);height:36px;color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;border:0;border-radius:8px;outline:0;justify-content:center;align-items:center;font-size:12px;transition:background .12s ease-out;display:flex}.xoziZG_heatCell[data-tone=empty]{color:var(--dsw-alias-label-tertiary)}.xoziZG_heatCell[data-tone=pad]{background:0 0}.xoziZG_heatCell[data-tone=out]{color:var(--dsw-alias-label-tertiary);opacity:.45;background:0 0}.xoziZG_heatCell[data-tone=lv1]{color:#0f1115;background:#ddf4e7}.xoziZG_heatCell[data-tone=lv2]{color:#0f1115;background:#b3e8cc}.xoziZG_heatCell[data-tone=lv3]{color:#0f1115;background:#7dd8ac}.xoziZG_heatCell[data-tone=lv4]{color:#fff;background:#40c584}.xoziZG_heatCell[data-tone=lv5]{color:#fff;background:#16a34a}.xoziZG_heatCell[data-today=true]{font-weight:700;box-shadow:inset 0 -2px}.xoziZG_heatHours{grid-template-columns:repeat(24,minmax(0,1fr));gap:3px;margin:8px 0 0;display:grid}.xoziZG_heatHourCell{background:color-mix(in srgb, var(--dsw-alias-label-primary) 6%, transparent);border-radius:4px;height:26px;transition:background .12s ease-out}.xoziZG_heatHourCell[data-tone=lv1]{background:#ddf4e7}.xoziZG_heatHourCell[data-tone=lv2]{background:#b3e8cc}.xoziZG_heatHourCell[data-tone=lv3]{background:#7dd8ac}.xoziZG_heatHourCell[data-tone=lv4]{background:#40c584}.xoziZG_heatHourCell[data-tone=lv5]{background:#16a34a}.xoziZG_heatAxis{color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums;grid-template-columns:repeat(24,minmax(0,1fr));gap:3px;font-size:10px;line-height:14px;display:grid}.xoziZG_heatAxisSlot{text-align:center;white-space:nowrap;overflow:hidden}.xoziZG_heatLegend{color:var(--dsw-alias-label-tertiary);justify-content:flex-start;align-items:center;gap:3px;margin:0 0 6px;font-size:10px;display:flex}.xoziZG_heatLegendChip{border-radius:3px;width:10px;height:10px}.xoziZG_heatLegendChip[data-tone=lv1]{background:#ddf4e7}.xoziZG_heatLegendChip[data-tone=lv2]{background:#b3e8cc}.xoziZG_heatLegendChip[data-tone=lv3]{background:#7dd8ac}.xoziZG_heatLegendChip[data-tone=lv4]{background:#40c584}.xoziZG_heatLegendChip[data-tone=lv5]{background:#16a34a}.xoziZG_trendTip{color:var(--dsw-alias-label-secondary);font-variant-numeric:tabular-nums;margin:2px 0 0;font-size:11px;line-height:16px}.xoziZG_check{flex:1;min-width:0}.xoziZG_check>span{text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.xoziZG_manual{border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-md);margin-top:12px;padding:0 12px}.xoziZG_manual[open]{padding-bottom:12px}.xoziZG_manualSummary{color:var(--dsw-alias-label-secondary);cursor:pointer;align-items:center;gap:6px;padding:9px 0;font-size:13px;list-style:none;display:flex}.xoziZG_manualSummary::-webkit-details-marker{display:none}.xoziZG_field{flex-direction:column;gap:5px;margin-top:10px;display:flex}.xoziZG_fieldLabel{color:var(--dsw-alias-label-tertiary);font-size:12px}.xoziZG_area{box-sizing:border-box;resize:vertical;border:.5px solid var(--dsw-alias-border-l4);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-1);width:100%;color:var(--dsw-alias-label-primary);padding:6px 8px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:13px;line-height:20px}.xoziZG_area::placeholder{color:var(--dsw-alias-label-dimmed)}.xoziZG_area:focus{border-color:var(--dsw-alias-state-business-primary);outline:none}.xoziZG_skeleton{flex-direction:column;gap:10px;padding:4px 0;display:flex}.xoziZG_skeletonRow{border-radius:var(--dsw-radius-sm,4px);background:var(--dsw-alias-border-l2);height:12px;animation:1.4s ease-in-out infinite xoziZG_skeletonBreath}.xoziZG_skeletonRow:nth-child(2){width:72%}.xoziZG_skeletonRow:nth-child(3){width:46%}@keyframes xoziZG_skeletonBreath{0%,to{opacity:.45}50%{opacity:.9}}@media (prefers-reduced-motion:reduce){.xoziZG_skeletonRow{animation:none}}";
 const tagId$1 = "dsh-codearts/CodeArtsPluginCard.module.css";
 if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) {
 	const tag = document.createElement("style");
@@ -72,92 +72,92 @@ if (typeof document !== "undefined" && document.querySelector("style[data-plugin
 	document.head.appendChild(tag);
 }
 var CodeArtsPluginCard_module_css_default = {
-	"statValue": "xoziZG_statValue",
-	"statSub": "xoziZG_statSub",
-	"check": "xoziZG_check",
-	"body": "xoziZG_body",
-	"barFill": "xoziZG_barFill",
-	"statCard": "xoziZG_statCard",
-	"heatWeekday": "xoziZG_heatWeekday",
+	"accountHint": "xoziZG_accountHint",
+	"heatLegendChip": "xoziZG_heatLegendChip",
+	"balance": "xoziZG_balance",
+	"claimAllRow": "xoziZG_claimAllRow",
+	"balanceUnit": "xoziZG_balanceUnit",
+	"heatAxisSlot": "xoziZG_heatAxisSlot",
 	"creditBlock": "xoziZG_creditBlock",
+	"statusLine": "xoziZG_statusLine",
+	"modelChart": "xoziZG_modelChart",
+	"sectionHead": "xoziZG_sectionHead",
+	"usageBar": "xoziZG_usageBar",
 	"accountCard": "xoziZG_accountCard",
-	"card": "xoziZG_card",
-	"sectionLabel": "xoziZG_sectionLabel",
-	"error": "xoziZG_error",
-	"desc": "xoziZG_desc",
-	"accountRowActions": "xoziZG_accountRowActions",
+	"usageTipName": "xoziZG_usageTipName",
+	"choiceRow": "xoziZG_choiceRow",
+	"fieldLabel": "xoziZG_fieldLabel",
 	"modelRow": "xoziZG_modelRow",
-	"balanceUnit": "xoziZG_balanceUnit",
-	"balance": "xoziZG_balance",
-	"usageTipRow": "xoziZG_usageTipRow",
-	"bar": "xoziZG_bar",
-	"accountRow": "xoziZG_accountRow",
+	"expiryRow": "xoziZG_expiryRow",
+	"headText": "xoziZG_headText",
+	"modelTrack": "xoziZG_modelTrack",
 	"heatHourCell": "xoziZG_heatHourCell",
 	"header": "xoziZG_header",
-	"meta": "xoziZG_meta",
-	"tabs": "xoziZG_tabs",
-	"modelChart": "xoziZG_modelChart",
-	"usageTipName": "xoziZG_usageTipName",
-	"accountName": "xoziZG_accountName",
-	"heatCell": "xoziZG_heatCell",
-	"heatLegend": "xoziZG_heatLegend",
-	"section": "xoziZG_section",
-	"modelFill": "xoziZG_modelFill",
-	"accountNameRow": "xoziZG_accountNameRow",
-	"claimAllRow": "xoziZG_claimAllRow",
-	"creditLink": "xoziZG_creditLink",
-	"choiceRow": "xoziZG_choiceRow",
-	"updated": "xoziZG_updated",
+	"accountToolbar": "xoziZG_accountToolbar",
 	"statGrid": "xoziZG_statGrid",
+	"skeletonBreath": "xoziZG_skeletonBreath",
+	"balanceRow": "xoziZG_balanceRow",
+	"modelFill": "xoziZG_modelFill",
+	"heatAxis": "xoziZG_heatAxis",
+	"accountRow": "xoziZG_accountRow",
+	"heatGrid": "xoziZG_heatGrid",
 	"field": "xoziZG_field",
-	"creditRows": "xoziZG_creditRows",
-	"modelRequests": "xoziZG_modelRequests",
-	"manual": "xoziZG_manual",
-	"skeletonRow": "xoziZG_skeletonRow",
-	"expiryRow": "xoziZG_expiryRow",
+	"link": "xoziZG_link",
+	"heatHours": "xoziZG_heatHours",
+	"tabPanel": "xoziZG_tabPanel",
+	"choices": "xoziZG_choices",
+	"desc": "xoziZG_desc",
+	"creditHint": "xoziZG_creditHint",
+	"creditFooter": "xoziZG_creditFooter",
+	"accountInfo": "xoziZG_accountInfo",
 	"manualForm": "xoziZG_manualForm",
-	"name": "xoziZG_name",
-	"usageTip": "xoziZG_usageTip",
-	"avatar": "xoziZG_avatar",
-	"heatAxisSlot": "xoziZG_heatAxisSlot",
+	"card": "xoziZG_card",
+	"actions": "xoziZG_actions",
+	"usageFill": "xoziZG_usageFill",
+	"usageTipRow": "xoziZG_usageTipRow",
 	"modelTokens": "xoziZG_modelTokens",
-	"expiryLabel": "xoziZG_expiryLabel",
-	"heatHours": "xoziZG_heatHours",
-	"heatLegendChip": "xoziZG_heatLegendChip",
-	"heatGrid": "xoziZG_heatGrid",
-	"accountEntry": "xoziZG_accountEntry",
+	"trendTip": "xoziZG_trendTip",
+	"section": "xoziZG_section",
+	"tabs": "xoziZG_tabs",
+	"meta": "xoziZG_meta",
+	"bar": "xoziZG_bar",
+	"barFill": "xoziZG_barFill",
+	"modelRequests": "xoziZG_modelRequests",
+	"skeleton": "xoziZG_skeleton",
 	"modelName": "xoziZG_modelName",
-	"heatAxis": "xoziZG_heatAxis",
-	"fieldLabel": "xoziZG_fieldLabel",
-	"hint": "xoziZG_hint",
-	"creditRow": "xoziZG_creditRow",
-	"creditFooter": "xoziZG_creditFooter",
-	"creditHint": "xoziZG_creditHint",
+	"updated": "xoziZG_updated",
 	"manualSummary": "xoziZG_manualSummary",
-	"skeleton": "xoziZG_skeleton",
-	"headText": "xoziZG_headText",
-	"usageTipSep": "xoziZG_usageTipSep",
-	"accountInfo": "xoziZG_accountInfo",
-	"link": "xoziZG_link",
+	"area": "xoziZG_area",
+	"statCard": "xoziZG_statCard",
+	"heatWeekday": "xoziZG_heatWeekday",
+	"creditRow": "xoziZG_creditRow",
+	"check": "xoziZG_check",
+	"accountNameRow": "xoziZG_accountNameRow",
+	"skeletonRow": "xoziZG_skeletonRow",
 	"balanceMeta": "xoziZG_balanceMeta",
-	"danger": "xoziZG_danger",
-	"trendTip": "xoziZG_trendTip",
-	"skeletonBreath": "xoziZG_skeletonBreath",
+	"statSub": "xoziZG_statSub",
 	"count": "xoziZG_count",
+	"name": "xoziZG_name",
+	"accountRowActions": "xoziZG_accountRowActions",
+	"danger": "xoziZG_danger",
+	"statLabel": "xoziZG_statLabel",
+	"usageTipSep": "xoziZG_usageTipSep",
 	"modelShare": "xoziZG_modelShare",
-	"statusLine": "xoziZG_statusLine",
-	"usageFill": "xoziZG_usageFill",
-	"usageBar": "xoziZG_usageBar",
-	"choices": "xoziZG_choices",
-	"balanceRow": "xoziZG_balanceRow",
-	"actions": "xoziZG_actions",
-	"modelTrack": "xoziZG_modelTrack",
-	"accountHint": "xoziZG_accountHint",
-	"tabPanel": "xoziZG_tabPanel",
-	"accountToolbar": "xoziZG_accountToolbar",
-	"sectionHead": "xoziZG_sectionHead",
-	"area": "xoziZG_area",
-	"statLabel": "xoziZG_statLabel"
+	"heatCell": "xoziZG_heatCell",
+	"heatLegend": "xoziZG_heatLegend",
+	"manual": "xoziZG_manual",
+	"avatar": "xoziZG_avatar",
+	"error": "xoziZG_error",
+	"body": "xoziZG_body",
+	"creditLink": "xoziZG_creditLink",
+	"accountName": "xoziZG_accountName",
+	"statValue": "xoziZG_statValue",
+	"expiryLabel": "xoziZG_expiryLabel",
+	"hint": "xoziZG_hint",
+	"usageTip": "xoziZG_usageTip",
+	"accountEntry": "xoziZG_accountEntry",
+	"sectionLabel": "xoziZG_sectionLabel",
+	"creditRows": "xoziZG_creditRows"
 };
 //#endregion
 //#region src/client/CodeArtsPluginCard.tsx
@@ -887,6 +887,8 @@ function CodeArtsPluginCard({ t }) {
 	const [msg, setMsg] = (0, react.useState)(null);
 	const [loginUrl, setLoginUrl] = (0, react.useState)(null);
 	const [loginPending, setLoginPending] = (0, react.useState)(false);
+	/** 正在进行的是哪个账号的「重新登录」（无则 null）。用来只让那一行的按钮变「登录中」。 */
+	const [reloginId, setReloginId] = (0, react.useState)(null);
 	const [selection, setSelection] = (0, react.useState)(null);
 	const [draft, setDraft] = (0, react.useState)([]);
 	const [savingModels, setSavingModels] = (0, react.useState)(false);
@@ -1211,16 +1213,29 @@ function CodeArtsPluginCard({ t }) {
 			setRefreshing(false);
 		}
 	}
-	async function startOAuthLogin() {
+	/**
+	* 开始一次浏览器登录。
+	*
+	* 不带 `targetId` 是「添加账号」；带 `targetId` 是「重新登录这个账号」——
+	* 服务端会把新凭证写回原条目（保留顺序与备注），而不是又长出一条。
+	*/
+	async function startOAuthLogin(targetId) {
 		setBusy(true);
 		setMsg(null);
 		setLoginPending(true);
+		if (targetId !== void 0) setReloginId(targetId);
+		const finish = () => {
+			setLoginUrl(null);
+			setLoginPending(false);
+			setReloginId(null);
+		};
 		try {
-			const res = await fetch("/api/codearts/login", { method: "POST" });
+			const query = targetId === void 0 ? "" : `?account=${encodeURIComponent(targetId)}`;
+			const res = await fetch(`/api/codearts/login${query}`, { method: "POST" });
 			const data = await res.json().catch(() => ({}));
 			if (!res.ok || typeof data.url !== "string") {
 				setMsg(data.error ?? `HTTP ${res.status}`);
-				setLoginPending(false);
+				finish();
 				return;
 			}
 			setLoginUrl(data.url);
@@ -1228,20 +1243,18 @@ function CodeArtsPluginCard({ t }) {
 			const poll = async () => {
 				const st = await (await fetch(`/api/codearts/login/status?url=${encodeURIComponent(data.url)}`, { headers: { Accept: "application/json" } })).json().catch(() => ({ status: "pending" }));
 				if (st.status === "done") {
-					setLoginUrl(null);
-					setLoginPending(false);
+					finish();
+					if (st.conflict === true) setMsg(t("reloginOtherAccount"));
 					await refresh();
 					return;
 				}
 				if (st.status === "error") {
-					setLoginUrl(null);
-					setLoginPending(false);
+					finish();
 					setMsg(t("loginFailed"));
 					return;
 				}
 				if (st.status === "idle") {
-					setLoginUrl(null);
-					setLoginPending(false);
+					finish();
 					await refresh();
 					return;
 				}
@@ -1250,7 +1263,7 @@ function CodeArtsPluginCard({ t }) {
 			poll();
 		} catch (err) {
 			setMsg(err instanceof Error ? err.message : String(err));
-			setLoginPending(false);
+			finish();
 		} finally {
 			setBusy(false);
 		}
@@ -1500,16 +1513,22 @@ function CodeArtsPluginCard({ t }) {
 																children: accountLine
 															})]
 														}),
-														/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+														/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 															className: CodeArtsPluginCard_module_css_default.accountRowActions,
-															children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+															children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+																variant: account.stale ? "primary" : "outline",
+																size: "sm",
+																disabled: busy || loginPending,
+																onClick: () => void startOAuthLogin(account.id),
+																children: reloginId === account.id && loginPending ? t("reloginPending") : t("accountRelogin")
+															}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
 																variant: "outline",
 																size: "sm",
 																className: CodeArtsPluginCard_module_css_default.danger,
-																disabled: busy,
+																disabled: busy || loginPending,
 																onClick: () => void removeAccount(account.id),
 																children: t("accountRemove")
-															})
+															})]
 														})
 													]
 												}), credit !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CreditBlock, {
@@ -2412,13 +2431,13 @@ if (typeof document !== "undefined" && document.querySelector("style[data-plugin
 }
 var CodeArtsPanel_module_css_default = {
 	"head": "Z66cgG_head",
+	"body": "Z66cgG_body",
+	"title": "Z66cgG_title",
 	"desc": "Z66cgG_desc",
+	"back": "Z66cgG_back",
 	"icon": "Z66cgG_icon",
 	"page": "Z66cgG_page",
-	"backCaret": "Z66cgG_backCaret",
-	"body": "Z66cgG_body",
-	"back": "Z66cgG_back",
-	"title": "Z66cgG_title"
+	"backCaret": "Z66cgG_backCaret"
 };
 //#endregion
 //#region src/client/CodeArtsPanel.tsx
@@ -2519,6 +2538,9 @@ const zh = {
 	expiredHint: "凭证已过期，请重新登录以继续使用；已勾选的模型设置会保留。",
 	accountsTitle: "账号",
 	accountRemove: "删除",
+	accountRelogin: "重新登录",
+	reloginPending: "登录中…",
+	reloginOtherAccount: "你登录的是另一个账号，已作为新账号添加；原账号保持不变。",
 	addAccount: "添加账号",
 	pasteTokenAdd: "粘贴 Token 添加",
 	accountsRotateHint: "已存多个账号：请求会自动轮转，某个账号忙时改用下一个，不用干等。",
@@ -2669,6 +2691,9 @@ const en = {
 	expiredHint: "Your credential has expired. Sign in again to continue; your model selection is kept.",
 	accountsTitle: "Accounts",
 	accountRemove: "Remove",
+	accountRelogin: "Sign in again",
+	reloginPending: "Signing in…",
+	reloginOtherAccount: "That was a different account, so it was added as a new one; the original stayed unchanged.",
 	addAccount: "Add account",
 	pasteTokenAdd: "Paste a token",
 	accountsRotateHint: "Multiple accounts stored: requests rotate automatically, so a busy account hands over to the next one instead of making you wait.",

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { A as upstreamErrorMessage, B as modelUnavailableReason, C as isWelfareClaimedStatus, D as prepareChatBody, E as pickDailyWelfareCampaign, F as filterEnabledModels, G as codeartsAuthPath, H as CodeArtsCredentialStore, I as forgetModelUnavailable, K as startLogin, L as isBenefitBlocked, M as FALLBACK_CODEARTS_MODELS, N as clearBenefitBlocked, O as rateLimitFrame, P as creditRatioLabel, R as isBenefitModel, S as isTpmLimit, T as modelUnavailableReasonText, U as MANUAL_ACCOUNT_ID, V as CodeArtsAccountStore, W as codeartsAccountsPath, _ as isIamTokenError, a as SNAP_HOST, b as isParamInvalidFrame, c as claimDailyWelfare, d as fetchCallerIdentity, f as fetchModels, g as isConcurrencyCap, h as firstFrameError, i as refreshCatalog, j as CodeArtsCatalog, k as signedGet, l as clearQueueStatus, m as fetchWelfareCampaigns, n as codeartsUsagePath, o as canonicalModel, p as fetchQueueStatus, r as discoverModels, s as chatStream, t as CodeArtsUsageTracker, u as degradeTokenCeiling, v as isModelNotAccessible, w as maxTokensCeilingFor, x as isQueueableRate, y as isNotMultimodal, z as markModelUnavailable } from "./usage-B2LNsUuR.mjs";
+import { A as upstreamErrorMessage, B as modelUnavailableReason, C as isWelfareClaimedStatus, D as prepareChatBody, E as pickDailyWelfareCampaign, F as filterEnabledModels, G as codeartsAuthPath, H as CodeArtsCredentialStore, I as forgetModelUnavailable, K as credentialFromOAuth, L as isBenefitBlocked, M as FALLBACK_CODEARTS_MODELS, N as clearBenefitBlocked, O as rateLimitFrame, P as creditRatioLabel, R as isBenefitModel, S as isTpmLimit, T as modelUnavailableReasonText, U as MANUAL_ACCOUNT_ID, V as CodeArtsAccountStore, W as codeartsAccountsPath, _ as isIamTokenError, a as SNAP_HOST, b as isParamInvalidFrame, c as claimDailyWelfare, d as fetchCallerIdentity, f as fetchModels, g as isConcurrencyCap, h as firstFrameError, i as refreshCatalog, j as CodeArtsCatalog, k as signedGet, l as clearQueueStatus, m as fetchWelfareCampaigns, n as codeartsUsagePath, o as canonicalModel, p as fetchQueueStatus, q as startLogin, r as discoverModels, s as chatStream, t as CodeArtsUsageTracker, u as degradeTokenCeiling, v as isModelNotAccessible, w as maxTokensCeilingFor, x as isQueueableRate, y as isNotMultimodal, z as markModelUnavailable } from "./usage-CjPd0Gok.mjs";
 import { i as lazyApi, r as createProvider } from "./models-CgKCibpk.mjs";
 import z from "@deepseek-ai/schemastery";
 import { randomBytes, timingSafeEqual } from "node:crypto";
@@ -1609,6 +1609,58 @@ async function probeIdentity(token) {
 		clearTimeout(timer);
 	}
 }
+/**
+* 落一次 OAuth 登录的凭证。
+*
+* 不带 `targetId` 是「添加账号」：同一账号更新，别的账号新增。
+*
+* 带 `targetId` 是「重新登录这个账号」：凭证写回原条目（保留 id、展示顺序和
+* 备注），而不是又长出一条 —— 以前卡片上只有「删除」，用户遇到凭证过期只能
+* 先把账号删掉再加回来，顺序和备注都丢。
+*
+* 上游只在 `fetchCallerIdentity` 成功时才给稳定 `userId`，拿不到身份就判断不了
+* 「是不是同一个人」。此时按用户意图替换（他点的就是这个账号的重登），并沿用
+* 旧条目的身份字段；只有两边 `userId` 都非空且不同，才判为登了另一个账号，
+* 退回「新增」，原账号原样不动。
+*/
+async function settleLogin(deps, token, targetId) {
+	const identity = await probeIdentity(token);
+	const target = targetId === void 0 ? void 0 : await deps.store.credential(targetId);
+	if (targetId !== void 0 && target !== void 0) {
+		const known = typeof target.userId === "string" && target.userId !== "";
+		if (!(identity !== null && known && target.userId !== identity.userId)) {
+			const cred = credentialFromOAuth(token, target.label);
+			cred.userId = cred.userId || target.userId;
+			cred.userName = cred.userName || target.userName;
+			cred.domainId = cred.domainId || target.domainId;
+			const id = await deps.store.upsert(cred, targetId);
+			deps.reviveAccount?.(id);
+			if (identity !== null && identity.userId !== "") {
+				if (identity.userId !== id) await deps.store.adoptIdentity(id, identity);
+				deps.reviveAccount?.(identity.userId);
+				return {
+					id: identity.userId,
+					replaced: true,
+					conflict: false
+				};
+			}
+			return {
+				id,
+				replaced: true,
+				conflict: false
+			};
+		}
+	}
+	const id = await deps.store.upsertFromOAuth(token, void 0, identity ?? void 0);
+	if (identity !== null && id !== identity.userId) await deps.store.adoptIdentity(id, identity);
+	deps.reviveAccount?.(id);
+	if (identity !== null && identity.userId !== id) deps.reviveAccount?.(identity.userId);
+	return {
+		id: identity?.userId ?? id,
+		replaced: false,
+		conflict: target !== void 0
+	};
+}
 /** 账号还能用吗（没被标 stale、也没过期）。 */
 function accountUsable(summary) {
 	if (summary.stale) return false;
@@ -2169,6 +2221,8 @@ function registerCodeArtsStatusRoute(ctx, deps) {
 		const activeLogins = /* @__PURE__ */ new Map();
 		/** 已结束登录的终态，供迟到的轮询读取。被读一次即删。 */
 		const recentLogins = /* @__PURE__ */ new Map();
+		/** 本次登录是「重新登录」时，授权 URL → 目标账号 id。终态落库后即删。 */
+		const reloginTargets = /* @__PURE__ */ new Map();
 		const disposeStatus = ctx.webServer.register({
 			kind: "exact",
 			path: CODEARTS_STATUS_PATH,
@@ -2192,7 +2246,7 @@ function registerCodeArtsStatusRoute(ctx, deps) {
 		const disposeLoginStart = ctx.webServer.register({
 			kind: "exact",
 			path: CODEARTS_LOGIN_PATH,
-			handler: loginStartHandler(deps, activeLogins, recentLogins)
+			handler: loginStartHandler(deps, activeLogins, recentLogins, reloginTargets)
 		});
 		const disposeLoginStatus = ctx.webServer.register({
 			kind: "exact",
@@ -2250,6 +2304,7 @@ function registerCodeArtsStatusRoute(ctx, deps) {
 			disposeDebug();
 			for (const s of activeLogins.values()) s.close();
 			activeLogins.clear();
+			reloginTargets.clear();
 		};
 	}, "dsh-codearts: Web status route");
 }
@@ -2267,8 +2322,12 @@ function recordLoginOutcome(recent, url, outcome) {
 	}
 	recent.set(url, outcome);
 }
-/** POST /api/codearts/login — 启动本地 OAuth 回调，返回授权 URL。 */
-function loginStartHandler(deps, active, recent) {
+/**
+* POST /api/codearts/login — 启动本地 OAuth 回调，返回授权 URL。
+*
+* `?account=<id>` 表示「重新登录这个账号」（见 settleLogin）；省略就是添加账号。
+*/
+function loginStartHandler(deps, active, recent, targets) {
 	return async (req, res) => {
 		if (req.method !== "POST") {
 			json(res, 405, { error: "method not allowed" });
@@ -2278,28 +2337,33 @@ function loginStartHandler(deps, active, recent) {
 			json(res, 403, { error: "request-not-trusted" });
 			return;
 		}
+		const targetId = (new URL(req.url ?? "", "http://localhost").searchParams.get("account") ?? "").trim();
 		try {
 			const session = await startLogin();
 			active.set(session.url, session);
+			if (targetId !== "") targets.set(session.url, targetId);
 			session.promise.then(async (token) => {
 				active.delete(session.url);
+				const reloginId = targets.get(session.url);
+				targets.delete(session.url);
 				try {
-					const identity = await probeIdentity(token);
-					const id = await deps.store.upsertFromOAuth(token, void 0, identity ?? void 0);
-					if (identity !== null && id !== identity.userId) await deps.store.adoptIdentity(id, identity);
-					deps.reviveAccount?.(id);
-					if (identity !== null && identity.userId !== id) deps.reviveAccount?.(identity.userId);
-					recordLoginOutcome(recent, session.url, "done");
+					const result = await settleLogin(deps, token, reloginId);
+					recordLoginOutcome(recent, session.url, {
+						status: "done",
+						...result
+					});
 				} catch {
-					recordLoginOutcome(recent, session.url, "error");
+					recordLoginOutcome(recent, session.url, { status: "error" });
 				}
 			}, () => {
 				active.delete(session.url);
-				recordLoginOutcome(recent, session.url, "error");
+				targets.delete(session.url);
+				recordLoginOutcome(recent, session.url, { status: "error" });
 			});
 			const timer = setTimeout(() => {
 				session.close();
-				if (active.delete(session.url)) recordLoginOutcome(recent, session.url, "error");
+				targets.delete(session.url);
+				if (active.delete(session.url)) recordLoginOutcome(recent, session.url, { status: "error" });
 			}, 3e5);
 			session.promise.finally(() => clearTimeout(timer)).catch(() => {});
 			json(res, 200, {
@@ -2330,7 +2394,7 @@ function loginPollHandler(_deps, active, recent) {
 		const outcome = recent.get(key);
 		if (outcome !== void 0) {
 			recent.delete(key);
-			json(res, 200, { status: outcome });
+			json(res, 200, { ...outcome });
 			return;
 		}
 		json(res, 200, { status: "idle" });

package/lib/{usage-B2LNsUuR.mjs → usage-CjPd0Gok.mjs}

@@ -3052,4 +3052,4 @@ function sumOf(store) {
 	return out;
 }
 //#endregion
-export { upstreamErrorMessage as A, modelUnavailableReason as B, isWelfareClaimedStatus as C, prepareChatBody as D, pickDailyWelfareCampaign as E, filterEnabledModels as F, codeartsAuthPath as G, CodeArtsCredentialStore as H, forgetModelUnavailable as I, startLogin as K, isBenefitBlocked as L, FALLBACK_CODEARTS_MODELS as M, clearBenefitBlocked as N, rateLimitFrame as O, creditRatioLabel as P, isBenefitModel as R, isTpmLimit as S, modelUnavailableReasonText as T, MANUAL_ACCOUNT_ID as U, CodeArtsAccountStore as V, codeartsAccountsPath as W, isIamTokenError as _, SNAP_HOST as a, isParamInvalidFrame as b, claimDailyWelfare as c, fetchCallerIdentity as d, fetchModels as f, isConcurrencyCap as g, firstFrameError as h, refreshCatalog as i, CodeArtsCatalog as j, signedGet as k, clearQueueStatus as l, fetchWelfareCampaigns as m, codeartsUsagePath as n, canonicalModel as o, fetchQueueStatus as p, discoverModels as r, chatStream as s, CodeArtsUsageTracker as t, degradeTokenCeiling as u, isModelNotAccessible as v, maxTokensCeilingFor as w, isQueueableRate as x, isNotMultimodal as y, markModelUnavailable as z };
+export { upstreamErrorMessage as A, modelUnavailableReason as B, isWelfareClaimedStatus as C, prepareChatBody as D, pickDailyWelfareCampaign as E, filterEnabledModels as F, codeartsAuthPath as G, CodeArtsCredentialStore as H, forgetModelUnavailable as I, credentialFromOAuth as K, isBenefitBlocked as L, FALLBACK_CODEARTS_MODELS as M, clearBenefitBlocked as N, rateLimitFrame as O, creditRatioLabel as P, isBenefitModel as R, isTpmLimit as S, modelUnavailableReasonText as T, MANUAL_ACCOUNT_ID as U, CodeArtsAccountStore as V, codeartsAccountsPath as W, isIamTokenError as _, SNAP_HOST as a, isParamInvalidFrame as b, claimDailyWelfare as c, fetchCallerIdentity as d, fetchModels as f, isConcurrencyCap as g, firstFrameError as h, refreshCatalog as i, CodeArtsCatalog as j, signedGet as k, clearQueueStatus as l, fetchWelfareCampaigns as m, codeartsUsagePath as n, canonicalModel as o, fetchQueueStatus as p, startLogin as q, discoverModels as r, chatStream as s, CodeArtsUsageTracker as t, degradeTokenCeiling as u, isModelNotAccessible as v, maxTokensCeilingFor as w, isQueueableRate as x, isNotMultimodal as y, markModelUnavailable as z };

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-codearts",
   "displayName": "DSH CodeArts Connect",
   "description": "把华为云 CodeArts 接入 DeepSeek Harness —— 内置 OAuth2 登录（PKCE + DPoP），登录后即可在 DSH 对话窗口使用 CodeArts 的模型。",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "packageManager": "pnpm@11.24.0",
   "author": "elegant01",
   "keywords": [