@magpie-community/opencode-trae-auth 0.1.8 → 0.1.10

package/README.md

@@ -114,15 +114,13 @@ magpie's usage card shows the account's credits:
 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, 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.
+this plugin's fetch, which sends them as the account: its Cloud-IDE-JWT
+(renewed first when near its end) and its device id.
 
 - **Status:** `POST api.trae.cn/trae/api/v2/ug/checkin_credits/status`,
-  body `{"req_source":1}`: `enable`, `checked_in`, `credits`.
+  body `{}`: `enable`, `checked_in`, `credits`.
 - **Claim:** `POST api.trae.cn/trae/api/v2/ug/checkin_credits/claim`,
-  body `{"req_source":1}`, only while it is on and today's isn't in.
+  body `{}`, 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,42 +366,6 @@ 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
@@ -587,8 +551,8 @@ class TextTools {
       text += this.buf.slice(0, i)
       const raw = this.buf.slice(i + OPEN.length, j).trim()
       this.buf = this.buf.slice(j + CLOSE.length)
-      const v = parseJSON(raw)
-      if (v.name) calls.push({ name: String(v.name), arguments: typeof v.arguments === "string" ? v.arguments : JSON.stringify(v.arguments ?? v.input ?? v.parameters ?? {}) })
+      const v = looseJSON(raw) ?? {}
+      if (v.name) calls.push({ name: String(v.name), arguments: callArgs(v) })
       else text += OPEN + raw + CLOSE
     }
     if (end) {
@@ -606,14 +570,62 @@ class TextTools {
   }
 }
 
+// looseJSON reads a JSON object as a model writes one: a string holding a
+// raw newline or tab (a file's content written out, #799) is read as if
+// they were escaped. null when it isn't one even so.
+function looseJSON(s) {
+  for (const t of [s, escapeRaw(s)]) {
+    try {
+      const v = JSON.parse(t)
+      if (v && typeof v === "object" && !Array.isArray(v)) return v
+    } catch {}
+  }
+  return null
+}
+
+// escapeRaw escapes the control characters inside JSON strings
+function escapeRaw(s) {
+  let out = ""
+  let str = false
+  let esc = false
+  for (const ch of String(s ?? "")) {
+    if (str && !esc && ch < " ") {
+      out += ch === "\n" ? "\\n" : ch === "\r" ? "\\r" : ch === "\t" ? "\\t" : "\\u" + ch.charCodeAt(0).toString(16).padStart(4, "0")
+      continue
+    }
+    if (str && ch === "\\" && !esc) esc = true
+    else {
+      if (ch === '"' && !esc) str = !str
+      esc = false
+    }
+    out += ch
+  }
+  return out
+}
+
+// callArgs is a tagged block's arguments as JSON: under arguments (an
+// object, or a string of one), input or parameters, else the block's other
+// keys, as a model that writes them beside the name means them (#799: a
+// write that went out as {})
+function callArgs(v) {
+  let a = v.arguments ?? v.input ?? v.parameters
+  if (a === undefined) {
+    const { name, type, id, ...rest } = v
+    a = rest
+  }
+  if (typeof a === "string") return a.trim() ? (looseJSON(a) ? JSON.stringify(looseJSON(a)) : a) : "{}"
+  return JSON.stringify(a ?? {})
+}
+
 // nativeCall is a tool call as Trae's events carry one
 function nativeCall(tc) {
   const f = tc?.function ?? tc?.function_call ?? tc
   const name = f?.name ?? tc?.tool_name ?? ""
   const index = Number.isInteger(tc?.index) ? tc.index : null
-  if (!name && index === null && !tc?.id) return null
   const a = f?.arguments ?? f?.args ?? tc?.params ?? tc?.input ?? tc?.parameters ?? ""
-  return { id: tc?.id || tc?.tool_call_id || "", index, name: String(name), arguments: typeof a === "string" ? a : JSON.stringify(a) }
+  const args = typeof a === "string" ? a : JSON.stringify(a)
+  if (!name && index === null && !tc?.id && !args) return null
+  return { id: tc?.id || tc?.tool_call_id || "", index, name: String(name), arguments: args }
 }
 
 // NativeCalls puts together the tool calls Trae streams: a call comes in
@@ -630,6 +642,12 @@ class NativeCalls {
     let o = this.calls.find((x) => (c.id && x.id === c.id) || (!c.id && c.index !== null && x.index === c.index))
     if (!o && !c.id && c.index === null)
       o = this.calls.findLast((x) => x.name === c.name && (x.arguments === c.arguments || (!done(x.arguments) && c.arguments.startsWith(x.arguments))))
+    // a piece with nothing to say whose it is (or an index its call's
+    // first event didn't give) belongs to the call still being written
+    if (!o && !c.name && !c.id) {
+      o = this.calls.findLast((x) => !done(x.arguments))
+      if (o && c.index !== null && o.index !== null && o.index !== c.index) o = null
+    }
     if (!o) {
       if (!c.name) return
       this.calls.push({ ...c })
@@ -644,7 +662,10 @@ class NativeCalls {
     else o.arguments = prev + next // a piece
   }
   take() {
-    return this.calls.filter((c) => c.name).map(({ id, name, arguments: a }) => ({ id: id || callId(), name, arguments: a || "{}" }))
+    return this.calls.filter((c) => c.name).map(({ id, name, arguments: a }) => {
+      const v = a && !done(a) ? looseJSON(a) : null
+      return { id: id || callId(), name, arguments: v ? JSON.stringify(v) : a || "{}" }
+    })
   }
 }
 
@@ -922,13 +943,14 @@ 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)
+    // 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)
     const res = await fetch(url, {
       method,
-      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 : "{}",
+      headers: ideHeaders(a, { Accept: "application/json" }),
+      body: method === "GET" || method === "HEAD" ? undefined : typeof body === "string" ? body : "{}",
       signal: signal ?? AbortSignal.timeout(20_000),
     })
     const text = await res.text()
@@ -1189,4 +1211,4 @@ export const TraeCNAuthPlugin = async ({ client }) => {
 }
 
 // for tests
-export const _internal = { HOSTS, MODELS, TextTools, traeMessages, chatBody, credits, whenOf, newDevice }
+export const _internal = { HOSTS, MODELS, TextTools, NativeCalls, looseJSON, traeMessages, chatBody, credits, whenOf, newDevice }

package/package.json

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