@magpie-community/opencode-trae-auth 0.1.5 → 0.1.7

package/README.md

@@ -105,21 +105,24 @@ 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
 
 Trae CN gives credits for a daily check-in (每日签到). magpie can press it
 once a day for each account (Settings, or the switch on the usage card).
 It asks Trae CN's own pages through
-this plugin's fetch, which sends them as the account: its Cloud-IDE-JWT
-(renewed first when near its end) and its device id.
+this plugin's fetch, which sends them as the account, as Trae CN's IDE
+does: its Cloud-IDE-JWT (renewed first when near its end) and its
+device's headers (`x-device-id`, `x-device-brand`, `x-device-type`,
+`x-os-version`, `x-app-version`), and no others.
 
 - **Status:** `POST api.trae.cn/trae/api/v2/ug/checkin_credits/status`,
-  body `{}`: `enable`, `checked_in`, `credits`.
+  body `{"req_source":1}`: `enable`, `checked_in`, `credits`.
 - **Claim:** `POST api.trae.cn/trae/api/v2/ug/checkin_credits/claim`,
-  body `{}`, only while it is on and today's isn't in.
+  body `{"req_source":1}`, only while it is on and today's isn't in.
 - **What comes back:** Trae's answer as it is. A 401 or code 1001 marks
   the account for a new sign-in. Code 9095 means this device has checked
   in today; nothing sends another device id to get round it.

package/index.mjs

@@ -366,6 +366,42 @@ function ideHeaders(a, extra = {}) {
   }
 }
 
+// ugHeaders are the headers Trae CN's IDE sends its growth pages
+// (api.trae.cn/trae/api/v2/ug/…, the daily check-in) with, and no others:
+// its eb()/fb() (Trae CN 3.3.104's out/main.js) send Content-Type, the
+// Cloud-IDE-JWT and the device (x-device-id, x-device-brand,
+// x-device-type, x-os-version, x-app-version), none of the chat's
+// x-uid, x-app-id, x-ide-token and the like
+function ugHeaders(a, extra = {}) {
+  return {
+    "Content-Type": "application/json",
+    Authorization: `Cloud-IDE-JWT ${a.token}`,
+    "x-device-id": a.deviceId,
+    "x-device-brand": BRAND,
+    "x-device-type": "windows",
+    "x-os-version": "Windows 10",
+    "x-app-version": CLIENT_VERSION,
+    ...extra,
+  }
+}
+
+// ugBody is the body the IDE posts a growth page: {req_source: 1}, its
+// own (2 is SOLO Lite's), where magpie gave none or {}; anything else
+// given goes as it is
+function ugBody(body) {
+  const s = typeof body === "string" ? body.trim() : ""
+  if (s === "" || s === "{}") return JSON.stringify({ req_source: 1 })
+  return s
+}
+
+const ugPage = (url) => {
+  try {
+    return new URL(url).pathname.startsWith("/trae/api/v2/ug/")
+  } catch {
+    return false
+  }
+}
+
 // Trae's chat takes text only and has no turn for a tool call or its
 // result. The agent's tools are named to it natively and in a system
 // prompt that asks for each call as a tagged block; earlier calls and
@@ -848,10 +884,13 @@ export const TraeCNAuthPlugin = async ({ client }) => {
       if (e instanceof Expired) return errorResponse(401, `${a0.name || a0.uid}: ${e.message}`, "expired")
       throw e
     }
+    // the check-in goes as the IDE sends it (ugHeaders, ugBody); Trae's
+    // other pages with the chat's headers
+    const ug = ugPage(url)
     const res = await fetch(url, {
       method,
-      headers: ideHeaders(a, { Accept: "application/json" }),
-      body: method === "GET" || method === "HEAD" ? undefined : typeof body === "string" ? body : "{}",
+      headers: ug ? ugHeaders(a, { Accept: "application/json" }) : ideHeaders(a, { Accept: "application/json" }),
+      body: method === "GET" || method === "HEAD" ? undefined : ug ? ugBody(body) : typeof body === "string" ? body : "{}",
       signal: signal ?? AbortSignal.timeout(20_000),
     })
     const text = await res.text()
@@ -881,8 +920,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]
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-trae-auth",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "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",