kdczyz-dsh-model 1.2.2-beta → 1.2.4-beta

package/dsh-kdczyz-mode/lib/console.mjs

@@ -273,21 +273,12 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
 .wotr-credit-region-title{font-size:11px;font-weight:600;color:var(--dsw-alias-label-primary)}
 .wotr-credit-region-sub{font-size:11px;color:var(--dsw-alias-label-secondary);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .wotr-credit-row{margin-top:6px;padding:8px;border:.5px solid var(--dsw-alias-border-l2);border-radius:8px;display:flex;flex-direction:column;gap:6px}
-.wotr-credit-row[data-off="1"]{opacity:.55}
 .wotr-credit-row[data-serving="1"]{border-color:var(--dsw-alias-label-primary)}
 .wotr-credit-row-top{display:flex;align-items:baseline;gap:8px;justify-content:space-between}
 .wotr-credit-row-name{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-primary);font-weight:600}
 .wotr-credit-row-credits{flex:none;font-variant-numeric:tabular-nums;color:var(--dsw-alias-label-primary)}
 .wotr-credit-row-foot{display:flex;align-items:center;justify-content:space-between;gap:8px}
 .wotr-credit-tags{display:flex;align-items:center;gap:4px;flex-wrap:wrap;min-width:0}
-/* 启停开关：本页自绘（不引 primitives 的 Switch），配色沿用本文件
-   既有的 token 组合 —— 开 = label-primary 底 + bg-layer-1 滑块，
-   与 .wbc-btn-primary 同一套对比关系，深浅色主题下都不会糊。 */
-.wotr-credit-switch{position:relative;flex:none;width:30px;height:16px;padding:0;border:none;border-radius:8px;background:var(--dsw-alias-bg-layer-3,rgba(127,127,127,.35));cursor:pointer;transition:background .12s ease-out}
-.wotr-credit-switch::after{content:'';position:absolute;top:2px;left:2px;width:12px;height:12px;border-radius:50%;background:var(--dsw-alias-label-secondary,#888);transition:transform .12s ease-out,background .12s ease-out}
-.wotr-credit-switch[data-on="1"]{background:var(--dsw-alias-label-primary,#4c8dff)}
-.wotr-credit-switch[data-on="1"]::after{transform:translateX(14px);background:var(--dsw-alias-bg-layer-1,#fff)}
-.wotr-credit-switch:disabled{opacity:.5;cursor:default}
 .wotr-credit-foot{margin-top:10px;padding-top:8px;border-top:.5px solid var(--dsw-alias-border-l2);font-size:11px;line-height:16px}
 .wotr-credit-note{margin-top:6px;font-size:11px;line-height:16px;color:var(--dsw-alias-label-primary)}
 .wotr-credit-err{margin-top:6px;font-size:11px;line-height:16px;color:var(--dsw-alias-label-error,#e5484d)}
@@ -645,7 +636,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
     const ignored = asArray(status?.ignored);
     const selection = status?.selection ?? {};
     const automation = status?.automation;
-    const usable = accounts.filter((a) => a.disabled !== true).length;
     const automationOn = automation?.enabled === true;
 
     const draft = draftByRegion[region];
@@ -696,17 +686,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
       }
     };
 
-    // —— 账号启停 ——
-    const onToggleDisabled = (accountId, disabled) => {
-      if (!writable) return;
-      return run(accountId, () =>
-        fetchJson(`${POOL_API}/accounts/disabled`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ accountId, disabled }),
-        }), disabled ? '已停用该账号' : '已重新启用该账号');
-    };
-
     // —— 移出池子 / 恢复 ——
     const onIgnore = (accountId, ignoredNext) => {
       return run(`ignore-${accountId}`, () =>
@@ -1042,7 +1021,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
           : jsx(StatsRow, {
               items: [
                 { label: '账号', value: fmtNum(accounts.length), sub: '个已登录' },
-                { label: '可用', value: fmtNum(usable), sub: '未被停用' },
                 {
                   label: '当前使用',
                   value: currentName,
@@ -1082,12 +1060,11 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
                       AccountCard,
                       {
                         name: a.nickname || a.label || a.id,
-                        dim: a.disabled === true || (currentId !== '' && isCurrent !== true),
+                        dim: (currentId !== '' && isCurrent !== true),
                         tags: [
                           isCurrent
                             ? { text: '当前使用', cls: 'wbc-tag wbc-tag-on' }
                             : { text: '备用', cls: 'wbc-tag' },
-                          a.disabled === true ? { text: '已停用', cls: 'wbc-tag' } : null,
                         ],
                         rows: [
                           /**
@@ -1116,9 +1093,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
                             CardActions,
                             {
                               locked: !writable,
-                              disabled: a.disabled === true,
-                              saving: busy === a.id,
-                              onToggleDisabled: (next) => onToggleDisabled(a.id, next),
                               onRemove: () => onIgnore(a.id, true),
                               removeBusy: busy === `ignore-${a.id}`,
                             },
@@ -1713,19 +1687,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
       }
     };
 
-    const [savingPool, setSavingPool] = useState(null);
-
-    const onToggleDisabled = (accountId, disabled) => {
-      setSavingPool(accountId);
-      const currentIds = asArray(traeRegionSlotOf(scopeObj?.getSnapshot?.().value, region).disabledAccountIds);
-      const next = disabled
-        ? [...new Set([...currentIds, accountId])]
-        : currentIds.filter((id) => id !== accountId);
-      writePoolField({ disabledAccountIds: next }, (readBack) =>
-        JSON.stringify(traeRegionSlotOf(readBack, region).disabledAccountIds ?? []) === JSON.stringify(next),
-        disabled ? '已停用该账号' : '已重新启用该账号')
-        .finally(() => setSavingPool(null));
-    };
 
     /** 供应商开关：只改 enabled，其余字段原样保留（关掉不丢勾选） */
     const [togglingRegion, setTogglingRegion] = useState(null);
@@ -1830,10 +1791,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
         .filter((pool) => !accounts.some((account) => String(account.id) === String(pool.id)))
         .map((pool) => ({ account: null, pool })),
     ];
-    const traeUsable =
-      poolAccounts.length === 0
-        ? accounts.length
-        : poolAccounts.filter((a) => a.disabled !== true).length;
     const checkinText =
       usage?.checkin?.checkedIn === true
         ? '今日已签到'
@@ -1958,7 +1915,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
           ? jsx(StatsRow, {
               items: [
                 { label: '账号', value: fmtNum(accounts.length), sub: '个已登录' },
-                { label: '可用', value: fmtNum(traeUsable), sub: '未被停用' },
                 {
                   label: '当前使用',
                   value: usage.accountName ?? current?.accountName ?? '–',
@@ -2003,7 +1959,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
                         isCurrent
                           ? { text: '当前使用', cls: 'wbc-tag wbc-tag-on' }
                           : { text: '备用', cls: 'wbc-tag' },
-                        pool?.disabled === true ? { text: '已停用', cls: 'wbc-tag' } : null,
                       ],
                       // 余额来自 /usage 的逐账号 credits，号池状态来自 pool 段，
                       // 两张表按 id 对齐后拼成同一张卡。
@@ -2018,16 +1973,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
                           : null,
                       ],
                       extra: [
-                        jsx(
-                          CardActions,
-                          {
-                            locked: !writable || pool === null || pool === undefined,
-                            disabled: pool?.disabled === true,
-                            saving: savingPool === id,
-                            onToggleDisabled: (next) => onToggleDisabled(id, next),
-                          },
-                          'actions',
-                        ),
                         /* 卡片最后一行：与 XD Pool 页同款的两按钮排 —— 左边「切换
                          * 到此账号」（**当前那张不给**：它已经是当前了），右边
                          * 「签到」。签到这个按钮是**每张卡都有**的：它签的是卡片
@@ -2475,26 +2420,18 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
    * 账号卡里的控件行：三个配置页同一套。
    *
    * 完全手动语义（本 fork）：账号之间没有分配策略 / 轮换 / 冷却，卡上的操作
-   * 只剩两件**手动管理**的事 ——
+   * 只剩一件**手动管理**的事 ——
    *
-   *   「停用 / 启用」：写 `disabledAccountIds`，停用的账号不会被取号；
    *   「移出池子」：只在传了 `onRemove` 时渲染（Trae 半边没有「移出」概念，
    *   不给它硬塞一个按不动的按钮）。
    *
-   * 早先这里的「参与轮换」勾选与「保留额度」输入已随分配策略一并删除。
+   * 早先这里的「参与轮换」勾选 / 「保留额度」输入 / 「停用」按钮都已按完全手动
+   * 语义删除 —— 停用不影响任何请求（取号只认手动选中的那一个）。
    */
-  function CardActions({ locked, disabled, onToggleDisabled, saving, onRemove, removeBusy }) {
+  function CardActions({ locked, onRemove, removeBusy }) {
     return jsxs('div', {
       className: 'wbc-bar',
       children: [
-        jsx('button', {
-          type: 'button',
-          className: 'wbc-btn',
-          title: disabled === true ? '恢复这个账号参与取号' : '停用后取号不再选中它（请求失败时请手动切换）',
-          disabled: locked === true || saving === true,
-          onClick: () => onToggleDisabled(disabled !== true),
-          children: disabled === true ? '启用' : '停用',
-        }),
         jsx('div', { className: 'wbc-spacer' }),
         typeof onRemove !== 'function'
           ? null
@@ -2969,7 +2906,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
     creditsAtMs,
     onRefresh,
     onAddAccount,
-    onToggle,
     onRemove,
     onSelect,
     /**
@@ -2985,7 +2921,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
     checkinNote,
   }) {
     const accounts = asArray(status?.accounts);
-    const usable = accounts.filter((a) => a.disabled !== true).length;
     /**
      * 「当前使用」的那一个 —— 请求就固定用它。
      *
@@ -3168,7 +3103,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
           ? jsx(StatsRow, {
               items: [
                 { label: '账号', value: fmtNum(accounts.length), sub: '个已入池' },
-                { label: '可用', value: fmtNum(usable), sub: '未被停用' },
                 {
                   // 「当前使用」是谁：这是本页最该一眼看到的一件事 —— 请求就打在
                   // 它身上。它这一轮的余额（真正在扣的那份）与全池合计退到 sub，
@@ -3208,13 +3142,12 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
                       name: a.label ?? a.id,
                       // 完全手动：只有「当前使用」那张是亮的，其余卡片压暗。
                       // 不可用（停用）也压暗 —— 具体原因由标签说明。
-                      dim: a.disabled === true || isSelected !== true,
+                      dim: isSelected !== true,
                       tags: [
                         isServing ? { text: '本次调用', cls: 'wbc-tag wbc-tag-on' } : null,
                         isSelected
                           ? { text: '当前使用', cls: isServing ? 'wbc-tag' : 'wbc-tag wbc-tag-on' }
                           : { text: '备用', cls: 'wbc-tag' },
-                        a.disabled === true ? { text: '已停用', cls: 'wbc-tag' } : null,
                         expired ? { text: '令牌已过期', cls: 'wbc-tag wbc-tag-warn' } : null,
                       ],
                       rows: [
@@ -3245,9 +3178,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
                           CardActions,
                           {
                             locked,
-                            disabled: a.disabled === true,
-                            onToggleDisabled: (next) => onToggle(a.id, next),
-                            saving: busy === true,
                             onRemove: () => onRemove(a.id),
                             removeBusy: busy === true,
                           },
@@ -3867,7 +3797,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
       fullName: name || id,
       credits:
         typeof raw?.credits === 'number' && Number.isFinite(raw.credits) ? raw.credits : undefined,
-      disabled: raw?.disabled === true,
       expired: raw?.expired === true,
       pinned: raw?.pinned === true,
       serving: raw?.serving === true,
@@ -3886,7 +3815,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
           id: a.id,
           name: a.nickname ?? a.label ?? '',
           credits: accountCreditsOf(a),
-          disabled: a.disabled,
           pinned: pinned !== '' && a.id === pinned,
           serving: serving !== '' && a.id === serving,
           error: a.creditsError,
@@ -3960,7 +3888,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
           credits: isServing
             ? (accountCreditsOf(serving, 'qoder') ?? accountCreditsOf(a, 'qoder'))
             : accountCreditsOf(a, 'qoder'),
-          disabled: a.disabled,
           expired: a.expired,
           pinned: typeof a.id === 'string' && a.id !== '' && a.id === pinned,
           serving: isServing,
@@ -4045,8 +3972,8 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
    * 就地改缓存里的行（写完之后的即时反馈）。
    *
    * 刻意**不**为了这一次改动再打一遍状态接口 —— 那个接口每个账号都会触发一次
-   * 计费调用。写路径本身已经做过读回确认（见 setAccountDisabledRemote /
-   * selectAccountRemote），所以就地改动是有依据的；下一次打开卡片或点「刷新」
+   * 计费调用。写路径本身已经做过读回确认（见 selectAccountRemote），
+   * 所以就地改动是有依据的；下一次打开卡片或点「刷新」
    * 会用真实快照把它对齐。
    */
   function patchCreditRows(family, match, patch) {
@@ -4059,81 +3986,11 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
     });
   }
 
-  /** 停用名单的加减：**只动这一个 id**，其余原样带过 */
-  function mergeDisabledIds(ids, accountId, disabled) {
-    const current = asArray(ids).filter((id) => typeof id === 'string' && id !== '');
-    return disabled
-      ? [...new Set([...current, accountId])]
-      : current.filter((id) => id !== accountId);
-  }
-
-  /** 两份停用名单是否等价（读回确认用；顺序无关） */
-  function sameIdSet(a, b) {
-    const left = asArray(a).filter((id) => typeof id === 'string' && id !== '');
-    const right = asArray(b).filter((id) => typeof id === 'string' && id !== '');
-    if (left.length !== right.length) return false;
-    const set = new Set(left);
-    return right.every((id) => set.has(id));
-  }
-
   /** 该平台设置作用域（拿不到就是 null，调用方按只读处理） */
   function creditScopeOf(family) {
     return poolScopeOf(family === 'qoder' ? qoderSettings : traeSettings);
   }
 
-  /**
-   * 停用 / 启用一个账号 —— 三家写法不同，语义是同一条。
-   *
-   * WorkBuddy：走路由 `POST /accounts/disabled`。**不要**在这里自己拼
-   * `disabledAccountIds` 写设置：国内版与国际版共用**同一份**设置文档
-   * （两个 provider 用同一个 settingsNs、`settingsPath: []`），只按当前区域的
-   * 行拼出来的列表会把另一个区域的停用项整段抹掉。路由在服务端按整份设置合并
-   * （`setAccountDisabled` 读 `current().disabledAccountIds` 再加减一个 id）。
-   *
-   * Trae / Qoder：没有可用的写路由（Trae 的 `/pool/account` 只改进程内的池，
-   * 下一次设置同步就被覆盖回去），所以写设置字段 —— 但**从当前设置文档里读旧值
-   * 再合并**，而不是从行里拼。
-   */
-  async function setAccountDisabledRemote(family, region, accountId, disabled) {
-    if (typeof accountId !== 'string' || accountId === '') throw new Error('缺少账号 id');
-    const want = disabled === true;
-    if (family === 'wb') {
-      await fetchJson(`${POOL_API}/accounts/disabled`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ accountId, disabled: want }),
-      });
-      return;
-    }
-    const scope = creditScopeOf(family);
-    const who = family === 'qoder' ? 'qoder' : 'trae';
-    if (scope === undefined || scope === null) {
-      throw new Error(`${who}: 拿不到设置作用域，无法保存（配置页同一处也只读）`);
-    }
-    if (!poolWritable(scope)) throw new Error(`${who}: 设置当前不可写`);
-    if (family === 'qoder') {
-      const currentIds = asArray(unwrapVolatileDeep(scope.getSnapshot?.().value)?.disabledAccountIds);
-      const next = mergeDisabledIds(currentIds, accountId, want);
-      await writeSettingsField(
-        scope,
-        'disabledAccountIds',
-        next,
-        (doc) => sameIdSet(doc?.disabledAccountIds, next),
-        'qoder',
-      );
-      return;
-    }
-    const value = scope.getSnapshot?.().value;
-    const next = mergeDisabledIds(traeRegionSlotOf(value, region).disabledAccountIds, accountId, want);
-    const slot = { ...traeRegionSlotOf(value, region), disabledAccountIds: next };
-    await writeTraeField(
-      scope,
-      'regions',
-      nextRegionSlots(regionsMapOf(value), region, slot),
-      (readBack) => sameIdSet(traeRegionSlotOf(readBack, region).disabledAccountIds, next),
-    );
-  }
-
   /**
    * 把某个账号设成「当前账号」。
    *
@@ -4273,8 +4130,7 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
    *
    * 展开的卡片里是**当前这个平台的全部账号**（不是「所有平台的账号」）：
    * WorkBuddy 与 Trae 各自的国内版 + 国际版都列出来，Qoder 只有一个池。
-   * 每行带两个控件 —— 「停用/启用」开关与「切换到此账号」，见
-   * setAccountDisabledRemote / selectAccountRemote 的语义说明。
+   * 每行带一个控件 —— 「切换到此账号」，见 selectAccountRemote 的语义说明。
    *
    * 刷新策略分两档，因为两档的成本差一个量级：
    *   - 胶囊那颗数字：**每 30 秒自动刷一次**（见 CREDIT_REFRESH_MS 的成本说明），
@@ -4550,28 +4406,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
       refreshHeadline();
     };
 
-    /** 停用 / 启用某一行 */
-    const onToggleRow = async (row) => {
-      const next = row.disabled !== true;
-      setBusyRow(row.key);
-      setWriteError('');
-      setNote('');
-      try {
-        await setAccountDisabledRemote(row.family, row.region, row.id, next);
-        patchCreditRows(row.family, (r) => r.key === row.key, { disabled: next });
-        // 停掉的正好是「这一轮在用的那个」→ 胶囊上的主语马上就会变，补一发
-        if (next === true && row.serving === true && row.region === source.region) {
-          refreshHeadline();
-        }
-        setNote(next ? `已停用 ${row.name}，请求失败时请手动切换` : `已重新启用 ${row.name}`);
-      } catch (e) {
-        setWriteError(e?.message ?? String(e));
-      } finally {
-        setBusyRow('');
-        setTick((n) => n + 1);
-      }
-    };
-
     /** 切换到此账号 / 取消固定 */
     const onSelectRow = async (row) => {
       // WorkBuddy 独有的「取消固定」：完全手动语义下它的池把「没有当前账号」
@@ -4607,7 +4441,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
       // 但选中账号不可用时上一轮可能根本没扣到它。
       if (row.pinned === true) push('on', row.family === 'wb' ? '已固定' : '当前使用');
       if (row.serving === true) push(row.pinned === true ? 'muted' : 'on', '本次调用');
-      if (row.disabled === true) push('warn', '已停用');
       if (row.expired === true) push('warn', '凭据已过期');
       if (row.error !== '') push('warn', `额度读不到：${row.error}`);
       return tags.map((tag, i) =>
@@ -4641,14 +4474,11 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
       const hideSelect = unpin === false && row.pinned === true;
       const selectTitle = unpin
         ? '取消固定后请求会失败，请手动切换'
-        : row.disabled === true
-          ? '这个账号已停用：选中它请求会失败，请先启用或换一个'
           : `让 ${row.fullName} 成为「当前账号」，请求只用它`;
       return jsxs(
         'div',
         {
           className: 'wotr-credit-row',
-          'data-off': row.disabled === true ? '1' : '0',
           'data-serving': row.serving === true ? '1' : '0',
           children: [
             jsxs('div', {
@@ -4678,22 +4508,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
                       },
                       children: label,
                     }),
-                jsx('button', {
-                  type: 'button',
-                  role: 'switch',
-                  className: 'wotr-credit-switch',
-                  'aria-checked': row.disabled === true ? 'false' : 'true',
-                  'aria-label': `${row.name} 停用/启用`,
-                  'data-on': row.disabled === true ? '0' : '1',
-                  disabled: busy,
-                  title:
-                    row.disabled === true
-                      ? `启用 ${row.fullName}（恢复参与取号）`
-                      : `停用 ${row.fullName}（选中它时请求会失败）`,
-                  onClick: () => {
-                    void onToggleRow(row);
-                  },
-                }),
               ],
             }),
           ],
@@ -5253,29 +5067,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
       [loadQoder],
     );
 
-    /**
-     * 停用 / 启用：往 `disabledAccountIds` 里加减这个账号。
-     *
-     * 必须**读出当前列表再合并** —— 整段覆盖写会把别的账号的停用状态清掉，
-     * 表现为「停用了 A，B 自己被启用了」。
-     */
-    const onQoderToggle = useCallback(
-      (accountId, disabled) => {
-        const current = asArray(qoderConfigSnapshot().disabledAccountIds).filter(
-          (id) => typeof id === 'string',
-        );
-        const next = disabled === true
-          ? [...new Set([...current, accountId])]
-          : current.filter((id) => id !== accountId);
-        const want = disabled === true;
-        return writeQoderPoolField(
-          'disabledAccountIds',
-          next,
-          (doc) => asArray(doc?.disabledAccountIds).includes(accountId) === want,
-        );
-      },
-      [qoderConfigSnapshot, writeQoderPoolField],
-    );
 
     const onQoderRemove = useCallback(
       (accountId) => qoderAction(`${SELF_API}/qoder/pool/remove`, { accountId }),
@@ -5530,7 +5321,6 @@ export function createConsoleSection({ react, jsxRuntime, embedded }) {
       creditsAtMs: qoderCreditsAtMs,
       onRefresh: loadQoder,
       onAddAccount: onQoderAddAccount,
-      onToggle: onQoderToggle,
       onRemove: onQoderRemove,
       onSelect: onQoderSelect,
       // 每日签到（按账号，不切号）：正在签的 id / 本页各账号的答复 / 顶部结论。

package/dsh-kdczyz-mode/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-kdczyz-mode",
-  "version": "1.2.2-beta",
+  "version": "1.2.4-beta",
   "description": "WorkBuddy + Trae + Qoder merged into one DSH plugin: the WorkBuddy desktop account/model pool, the Trae connector and the Qoder account pool as three independent providers, plus one settings page with six tabs — two configuration tabs (XD Pool / Trae config: provider switch, account binding, model selection and its own multi-account pool) and four management/read-only tabs (accounts [WorkBuddy + Trae + Qoder, three columns] / Qoder pool / credits / usage history).",
   "repository": {
     "type": "git",