@magpie-community/opencode-trae-auth 0.2.0 → 0.2.2

package/README.md

@@ -192,16 +192,23 @@ Trae CN gives credits for a daily check-in (每日签到); Trae Global has no
 such page, so this is CN only. 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
+(3.3.104) sends them: its Cloud-IDE-JWT (renewed first when near its
+end), its device (`x-device-id`, `x-device-brand`, `x-device-type`,
+`x-os-version`, `x-app-version`) and a client's User-Agent (TRAE SOLO
+CN's Electron shell). Since 0.2.1: Bun's own User-Agent and the chat's
+headers got 9074 「当前参与用户太多，请稍后再试」 every time
+(yetone/magpie#808).
 
 - **Status:** `POST api.trae.cn/trae/api/v2/ug/checkin_credits/status`,
-  body `{}`: `enable`, `checked_in`, `credits`.
+  body `{"req_source":1}` (magpie's `{}` is sent as that): `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.
+  the same, 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.
+  in today; nothing sends another device id to get round it, nor to get
+  round a 9074.
 
 Only `api.trae.cn`'s `/trae/api/` pages are sent this way; any other URL
 that isn't a chat request is still refused (400). Needs 0.1.4 or later.

package/index.mjs

@@ -529,6 +529,42 @@ function ideHeaders(a, site, extra = {}) {
   }
 }
 
+// ugUA is the User-Agent a growth page (/trae/api/v2/ug/…: the daily
+// check-in) is sent with: TRAE SOLO CN's Electron shell, as its version
+// is named. Bun's own (Bun/1.x) reads as a script, and Trae answers a
+// script's check-in with 9074 「当前参与用户太多，请稍后再试」 however
+// seldom it asks (yetone/magpie#808; qilimixingkong/trae-checkin found
+// the same).
+const ugUA = (site) =>
+  `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) TRAE-SOLO-CN/${site.clientVersion} Chrome/120.0.6099.291 Electron/28.2.10 Safari/537.36`
+
+// ugHeaders are the headers Trae CN's IDE (3.3.104) sends a growth page
+// with, and only those: its JWT, then its device (fb: x-device-id,
+// x-device-brand, x-device-type, x-os-version, x-app-version), not the
+// chat's tokens and versions.
+function ugHeaders(a, site, extra = {}) {
+  return {
+    "Content-Type": "application/json",
+    Authorization: `Cloud-IDE-JWT ${a.token}`,
+    "User-Agent": ugUA(site),
+    "x-device-id": a.deviceId,
+    "x-device-brand": site.brand,
+    "x-device-type": "Windows",
+    "x-os-version": "10.0.22631",
+    "x-app-version": site.clientVersion,
+    ...extra,
+  }
+}
+
+// ugPage: url is one of Trae's growth pages (the check-in)
+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
@@ -1047,6 +1083,7 @@ class NativeCalls {
     const next = c.arguments
     if (!next || prev.startsWith(next)) return // nothing new
     if (next.startsWith(prev) || done(prev)) o.arguments = next // the arguments so far
+    else if (resent(prev, next)) o.arguments = next // the whole call again, written apart (plugins#24)
     else o.arguments = prev + next // a piece
   }
   take(tools = []) {
@@ -1064,6 +1101,19 @@ class NativeCalls {
   }
 }
 
+// resent says next is the call's whole arguments sent again after a
+// partial snapshot, not a piece of them: Trae resends a snapshot whose
+// punctuation isn't the first one's (− for -, ′ for '), so it doesn't
+// start with it. A whole object under the same first key as prev's, which
+// prev and it joined don't make whole; a piece that is a value of its own
+// (12, "ls", {}) doesn't open with prev's first key.
+function resent(prev, next) {
+  const key = (s) => s.match(/^\s*\{\s*"((?:[^"\\]|\\.)*)"/)?.[1]
+  if (!next.trimStart().startsWith("{") || !done(next) || done(prev + next)) return false
+  const k = key(prev)
+  return k !== undefined && k === key(next)
+}
+
 // done says arguments are a whole JSON value already
 function done(a) {
   if (!a) return false
@@ -1461,14 +1511,18 @@ const makePlugin = (site) => async ({ client }) => {
       if (e instanceof Expired) return errorResponse(401, `${a0.name || a0.uid}: ${e.message}`, "expired")
       throw e
     }
-    // Trae's pages, the check-in among them, go with the chat's headers and
-    // the body given ({}): 0.1.7 sent the check-in with the IDE's growth
-    // headers and {req_source: 1} instead, and a check-in that worked on
-    // 0.1.6 failed from then on (yetone/magpie#808)
+    // a growth page (the check-in) goes as the IDE sends it: its headers,
+    // a client's User-Agent, and {req_source: 1} for an empty body. Every
+    // check-in sent with Bun's User-Agent came back 9074, with the chat's
+    // headers and {} (0.1.6, 0.1.9) as with the IDE's (0.1.7)
+    // (yetone/magpie#808). Other pages go with the chat's headers.
+    const ug = ugPage(url)
+    let sent = method === "GET" || method === "HEAD" ? undefined : typeof body === "string" ? body : "{}"
+    if (ug && sent !== undefined && /^\s*(\{\s*\})?\s*$/.test(sent)) sent = JSON.stringify({ req_source: 1 })
     const res = await fetch(url, {
       method,
-      headers: ideHeaders(a, site, { Accept: "application/json" }),
-      body: method === "GET" || method === "HEAD" ? undefined : typeof body === "string" ? body : "{}",
+      headers: ug ? ugHeaders(a, site, { Accept: "application/json" }) : ideHeaders(a, site, { Accept: "application/json" }),
+      body: sent,
       signal: signal ?? AbortSignal.timeout(20_000),
     })
     const text = await res.text()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-trae-auth",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "OpenCode provider plugins for Trae: Trae CN (trae.cn) and Trae Global (trae.ai), free tier included, with Trae's own browser sign-in",
   "type": "module",
   "main": "./index.mjs",