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

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
@@ -610,16 +574,60 @@ class TextTools {
 function nativeCall(tc) {
   const f = tc?.function ?? tc?.function_call ?? tc
   const name = f?.name ?? tc?.tool_name ?? ""
-  if (!name) return null
-  const a = f?.arguments ?? tc?.params ?? tc?.input ?? tc?.parameters ?? {}
-  return { id: tc?.id || tc?.tool_call_id || "", name: String(name), arguments: typeof a === "string" ? a : JSON.stringify(a) }
+  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) }
+}
+
+// NativeCalls puts together the tool calls Trae streams: a call comes in
+// several events under one id (or index), each with the arguments so far
+// or only the new piece, so a call is sent on once the answer is whole,
+// not from its first event (#799: bash's command cut to `echo "T`)
+class NativeCalls {
+  constructor() {
+    this.calls = []
+  }
+  push(tc) {
+    const c = nativeCall(tc)
+    if (!c) return
+    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))))
+    if (!o) {
+      if (!c.name) return
+      this.calls.push({ ...c })
+      return
+    }
+    if (!o.name) o.name = c.name
+    if (c.index !== null && o.index === null) o.index = c.index
+    const prev = o.arguments
+    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 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 || "{}" }))
+  }
+}
+
+// done says arguments are a whole JSON value already
+function done(a) {
+  if (!a) return false
+  try {
+    JSON.parse(a)
+    return true
+  } catch {
+    return false
+  }
 }
 
 // parts turns Trae's events into what the answer is made of: text,
 // reasoning, tool calls, the token counts, the finish, or an error.
 async function* parts(events) {
   const tt = new TextTools()
-  const seen = new Set()
+  const nc = new NativeCalls()
   for await (const { event, data } of events) {
     const name = eventName(event)
     const d = data && typeof data === "object" ? data : {}
@@ -650,20 +658,14 @@ async function* parts(events) {
       if (r.text) yield { text: r.text }
       for (const c of r.calls) yield { call: { ...c, id: callId() } }
     }
-    for (const tc of Array.isArray(d.tool_calls) ? d.tool_calls : []) {
-      const c = nativeCall(tc)
-      if (!c) continue
-      const key = c.id || c.name + c.arguments
-      if (seen.has(key)) continue
-      seen.add(key)
-      yield { call: { ...c, id: c.id || callId() } }
-    }
+    for (const tc of Array.isArray(d.tool_calls) ? d.tool_calls : []) nc.push(tc)
     const u = tokensOf(d.usage)
     if (u) yield { usage: u }
   }
   const r = tt.push("", true)
   if (r.text) yield { text: r.text }
   for (const c of r.calls) yield { call: { ...c, id: callId() } }
+  for (const c of nc.take()) yield { call: c }
 }
 
 // first reads events up to the first that is the answer's, so an answer
@@ -884,13 +886,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()

package/package.json

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