@magpie-community/opencode-trae-auth 0.1.4 → 0.1.6

package/README.md

@@ -105,8 +105,9 @@ magpie's usage card shows the account's credits:
 - **Source:** `api.trae.cn/trae/api/v2/pay/ide_user_ent_usage`.
 - **What it adds up:** each entitlement pack's `credits_limit` (-1 means
   unlimited) and what the pack has used.
-- **What it shows:** credits left as the balance, and the share used as a
-  window.
+- **What it shows:** one Credits window: the credits used of the packs'
+  total, with the share, which magpie shows as used or left like
+  WorkBuddy's.
 
 ## Daily check-in
 

package/index.mjs

@@ -881,8 +881,11 @@ export const TraeCNAuthPlugin = async ({ client }) => {
     const out = { plan: r.v.is_credits_billing ? "Credits" : "Free", user: a.name || a.uid, signIn }
     if (c.unlimited) out.balance = "unlimited"
     else if (c.limit > 0) {
-      out.balance = `${round(Math.max(0, c.limit - c.used))} of ${round(c.limit)} credits left`
-      const w = { name: "Credits", used: Math.max(0, Math.min(100, (c.used / c.limit) * 100)) }
+      // the count rides on the window (amount of limit, in credits), as
+      // WorkBuddy's does, so magpie says it in the window's row, used or
+      // left, in its own words and number format, rather than as an
+      // English balance line beside it (yetone/magpie#694)
+      const w = { name: "Credits", used: Math.max(0, Math.min(100, (c.used / c.limit) * 100)), amount: round(c.used), limit: round(c.limit), unit: "credits" }
       if (c.until) w.resetsAt = new Date(c.until).toISOString()
       out.windows = [w]
     }
@@ -930,7 +933,8 @@ export const TraeCNAuthPlugin = async ({ client }) => {
   // The lists come from batch_get_detail_param, as TRAE SOLO CN asks them;
   // when that gives none, from get_detail_param, one function at a time.
   // A model several functions list is asked through the first whose entry
-  // names a __dev model (one Trae serves), else the first.
+  // names a __dev model (one Trae serves) and isn't misnamed, else the
+  // first that names one, else the first.
   const liveModels = async (a) => {
     let lists = null
     try {
@@ -948,13 +952,35 @@ export const TraeCNAuthPlugin = async ({ client }) => {
         if (g.status === "fulfilled") lists[FUNCTIONS[i]] = g.value
       })
     }
+    // a function can give a model another's name: chat_v3 calls
+    // deepseek-v4.1-flash "DeepSeek-V4-Flash 正式版", as it does
+    // DeepSeek-V4-Flash-Official, where SOLO's lists call it
+    // DeepSeek-V4.1-Flash (yetone/magpie#681) — Trae's usage page then books
+    // it under that name too. Such an entry is misnamed: its name is another
+    // model's in the same list, and other lists name it otherwise.
+    const nameOf = (m) => String(m.display_config?.display_name || m.display_name || m.display_model_name || m.config_name)
+    const names = new Map() // id → the names its lists give it
+    for (const fn of FUNCTIONS) {
+      for (const m of lists[fn] ?? []) {
+        if (!chatModel(m)) continue
+        const id = String(m.config_name)
+        names.set(id, (names.get(id) ?? new Set()).add(nameOf(m)))
+      }
+    }
+    const misnamed = (fn, m) => {
+      const id = String(m.config_name), name = nameOf(m)
+      return names.get(id).size > 1 && (lists[fn] ?? []).some((o) => chatModel(o) && String(o.config_name) !== id && nameOf(o) === name)
+    }
+    // a function's entry is worth more when it names a __dev model, then
+    // when it isn't misnamed; the first of the best is taken
+    const worth = (fn, m) => (devModel(m) ? 2 : 0) + (misnamed(fn, m) ? 0 : 1)
     const out = new Map()
     for (const fn of FUNCTIONS) {
       for (const m of lists[fn] ?? []) {
         if (!chatModel(m)) continue
         const id = String(m.config_name)
         const was = out.get(id)
-        if (!was || (!devModel(was.m) && devModel(m))) out.set(id, { m, fn })
+        if (!was || worth(fn, m) > was.worth) out.set(id, { m, fn, worth: worth(fn, m) })
       }
     }
     for (const [id, { m, fn }] of out) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-trae-auth",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "OpenCode provider plugin for Trae CN (trae.cn): your Trae CN account's models, free tier included, with Trae's own browser sign-in",
   "type": "module",
   "main": "./index.mjs",