dsh-model 0.23.3 → 0.23.4

package/dist/checkin/trae.js

@@ -50,31 +50,35 @@ function appDataRoots(home, platform = process.platform, env = process.env) {
         return [...new Set([env.APPDATA, join(home, 'AppData', 'Roaming')].filter((v) => Boolean(v)))];
     return [env.XDG_CONFIG_HOME || join(home, '.config')];
 }
-/** 找本机的 Trae 登录：先桌面 App，再 CLI。找不到返回 null（不报错：没装 Trae 就不显示） */
+/**
+ * 找本机的 Trae 登录。可能有好几份（Trae CN、TRAE SOLO CN、CLI…），常有一份早就过期没人用了
+ * （2026-10-29 实测：先读到的 TRAE SOLO CN 已过期 7 天，正在用的 Trae CN 是新的，签到因此失败）。
+ * 所以全读一遍再挑：没过期的优先，其中桌面 App（带设备 id）优先，再按到期最晚。找不到返回 null（没装 Trae 就不显示）。
+ */
 export async function findTraeCredential(home = homedir()) {
     // 测试环境不看本机真装了什么（与不发现桌面 App 同一个开关）
     if (process.env.DSH_MODEL_NO_APP_DISCOVERY && home === homedir())
         return null;
+    const found = [];
     for (const root of appDataRoots(home)) {
         for (const app of APPS) {
             const file = join(root, app, 'User', 'globalStorage', 'storage.json');
-            let storage;
             try {
-                storage = JSON.parse(await readFile(file, 'utf8'));
+                const storage = JSON.parse(await readFile(file, 'utf8'));
+                const raw = storage[AUTH_KEY];
+                if (typeof raw !== 'string' || !raw.trim())
+                    continue;
+                const text = raw.trim().startsWith('{') ? raw : decryptStorageValue(raw);
+                const auth = JSON.parse(text);
+                const token = auth.token || auth.accessToken;
+                if (!token)
+                    continue;
+                const dc = Object.keys(storage).find((k) => k.startsWith(DEVICE_PREFIX));
+                found.push({ token, deviceId: dc ? dc.slice(DEVICE_PREFIX.length) : String(storage['telemetry.devDeviceId'] ?? ''), source: app });
             }
             catch {
-                continue;
+                // 没装、读不了或解不开：看下一个
             }
-            const raw = storage[AUTH_KEY];
-            if (typeof raw !== 'string' || !raw.trim())
-                continue;
-            const text = raw.trim().startsWith('{') ? raw : decryptStorageValue(raw);
-            const auth = JSON.parse(text);
-            const token = auth.token || auth.accessToken;
-            if (!token)
-                continue;
-            const dc = Object.keys(storage).find((k) => k.startsWith(DEVICE_PREFIX));
-            return { token, deviceId: dc ? dc.slice(DEVICE_PREFIX.length) : String(storage['telemetry.devDeviceId'] ?? ''), source: app };
         }
     }
     for (const dir of ['.trae-cn', '.trae']) {
@@ -82,13 +86,30 @@ export async function findTraeCredential(home = homedir()) {
             const text = (await readFile(join(home, dir, 'trae-jwt-token'), 'utf8')).trim();
             const token = text.startsWith('{') ? String(JSON.parse(text).token ?? '') : text;
             if (token.split('.').length === 3)
-                return { token, deviceId: '', source: `~/${dir}` };
+                found.push({ token, deviceId: '', source: `~/${dir}` });
         }
         catch {
             // 没有
         }
     }
-    return null;
+    return pickTraeCredential(found);
+}
+/** 几份登录里挑一份：没过期的优先 → 带设备 id 的（桌面 App）优先 → 到期最晚的。导出给测试 */
+export function pickTraeCredential(list, now = Date.now()) {
+    const exp = (t) => {
+        const d = tokenDaysLeft(t, now);
+        return d === null ? Number.POSITIVE_INFINITY : d;
+    };
+    const ranked = [...list].sort((a, b) => {
+        const live = Number(exp(b.token) >= 0) - Number(exp(a.token) >= 0);
+        if (live)
+            return live;
+        const desktop = Number(Boolean(b.deviceId)) - Number(Boolean(a.deviceId));
+        if (desktop)
+            return desktop;
+        return exp(b.token) - exp(a.token);
+    });
+    return ranked[0] ?? null;
 }
 /** 令牌还剩几天（读 JWT 的 exp）；读不出来返回 null */
 export function tokenDaysLeft(token, now = Date.now()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model",
-  "version": "0.23.3",
+  "version": "0.23.4",
   "description": "Daily check-in credits claimed for you (Trae, Qoder, WorkBuddy China), one OpenAI-compatible address that relays every model, and free or subscription model sources (SiliconFlow, Gemini, Codex, Kimi, Ollama…). For DeepSeek Harness (dsh) and any OpenAI-compatible tool. 每天自动签到领积分 · 一个地址中转所有模型 · 免费和订阅模型随你接。",
   "keywords": [
     "siliconflow",

package/plugin/client.js

@@ -1053,7 +1053,9 @@ window.__ModuleLoader__.load({
             h('div', { style: { ...S.line, marginTop: 6 } },
               st.qoder.configured
                 ? h('button', { type: 'button', style: S.btn, onClick: () => { if (window.confirm(L('删除 Qoder 的令牌？之后不再给 Qoder 签到。', 'Remove the Qoder token? Qoder will no longer be checked in.'))) void api('DELETE', '/checkin/qoder').then(setSt, (e) => setErr(e.message)) } }, L('删除 Qoder 令牌', 'Remove Qoder token'))
-                : h('button', { type: 'button', style: S.btn, onClick: () => setQoder(true) }, L('添加 Qoder', 'Add Qoder')))) : null,
+                : h('button', { type: 'button', style: S.btn, onClick: () => setQoder(true) }, L('添加 Qoder', 'Add Qoder'))),
+            // Trae 读本机 Trae 的登录：这台没装（比如 VPS）就不会出现，在装了 Trae 的电脑上签就行（每个账号一天一次）
+            !st.available.some((a) => a.id === 'trae') ? h('div', { style: { ...S.meta, marginTop: 6 } }, L('Trae：这台电脑上没装 Trae，所以不签。在装了 Trae 的电脑上会自动签（一个账号一天签一次就够）。', 'Trae: not installed on this machine, so it is skipped. A computer with Trae installed checks it in automatically (once a day per account is enough).')) : null) : null,
           !open && !st.qoder.configured ? h('div', { style: { ...S.meta, marginTop: 4 } }, h('button', { type: 'button', style: { ...S.btn, padding: '2px 8px' }, onClick: () => setQoder(true) }, L('+ 添加 Qoder', '+ Add Qoder'))) : null,
           err ? h('div', { style: { fontSize: 12, color: C.err, marginTop: 6 } }, err) : null),
         qoder ? h(QoderDialog, { onDone: () => { setQoder(false); void refresh() }, onClose: () => setQoder(false) }) : null)