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

package/index.mjs

@@ -39,12 +39,15 @@ const DAY = 24 * 3600 * 1000
 // then SOLO Lite's agent
 const FUNCTIONS = ["chat_v3", "solo_work_lite", "solo_agent", "solo_agent_lite"]
 
-const MODEL = { attachment: false, tool_call: true, reasoning: true, temperature: true, limit: { context: 128_000, output: 32_000 }, modalities: { input: ["text"], output: ["text"] } }
+// a reply limit of 0 is one Trae doesn't say: magpie then takes models.dev's
+// for the model (magpie's catalog), where a made-up 32K told agents a far
+// smaller one than DeepSeek V4.1 Flash's (ARNO on magpie's Discord)
+const MODEL = { attachment: false, tool_call: true, reasoning: true, temperature: true, limit: { context: 128_000, output: 0 }, modalities: { input: ["text"], output: ["text"] } }
 // what Trae CN's chat_v3 is known to serve; the live list replaces it
 const MODELS = {
   "glm-5.2": { name: "GLM-5.2", ...MODEL, limit: { context: 200_000, output: 32_000 } },
   "glm-5": { name: "GLM-5", ...MODEL },
-  "kimi-k2.6": { name: "Kimi K2.6", ...MODEL, limit: { context: 256_000, output: 32_000 } },
+  "kimi-k2.6": { name: "Kimi K2.6", ...MODEL, limit: { context: 256_000, output: 0 } },
   "qwen-3.7-plus": { name: "Qwen 3.7 Plus", ...MODEL },
   "DeepSeek-V4-Pro": { name: "DeepSeek V4 Pro", ...MODEL },
   "DeepSeek-V4-Flash": { name: "DeepSeek V4 Flash", ...MODEL },
@@ -444,8 +447,10 @@ const nativeTools = (tools) =>
   })
 
 // chatBody is the request for llm_utils_chat; modelName is the model the
-// function's list names for the config (its __dev one), when it named one
-function chatBody(req, fn, modelName) {
+// function's list names for the config (its __dev one), when it named one,
+// and most the max_tokens it gives that model (0: none given), which a
+// request asking more is held to
+function chatBody(req, fn, modelName, most = 0) {
   const session = randomUUID()
   const body = {
     messages: traeMessages(req),
@@ -458,7 +463,7 @@ function chatBody(req, fn, modelName) {
     session_id: session,
   }
   const max = req.max_completion_tokens ?? req.max_tokens
-  if (Number.isFinite(max) && max > 0) body.max_tokens = Math.floor(max)
+  if (Number.isFinite(max) && max > 0) body.max_tokens = most > 0 ? Math.min(Math.floor(max), most) : Math.floor(max)
   if (typeof req.temperature === "number") body.temperature = req.temperature
   if (Array.isArray(req.tools) && req.tools.length && req.tool_choice !== "none") {
     body.tools = nativeTools(req.tools)
@@ -534,25 +539,79 @@ const callId = () => "call_" + randomBytes(12).toString("hex") + (callSeq++).toS
 
 // TextTools splits the model's text into what the agent sees and the tool
 // calls it wrote as blocks, holding back the start of a block until it
-// is whole
+// is whole. A block is ours (<tool_call>{…}</tool_call>), its JSON taken
+// once whole even when DeepSeek closes it with its own tags in place of
+// </tool_call>, or DeepSeek's (<｜DSML｜invoke name="…">, magpie#823); the
+// tags left around a call are dropped.
 class TextTools {
   constructor() {
     this.buf = ""
+    this.after = false
   }
   push(s, end = false) {
     this.buf += s
     let text = ""
     const calls = []
     for (;;) {
+      if (this.after) {
+        const m = this.buf.match(LEFTOVER)
+        if (m) this.buf = this.buf.slice(m[0].length)
+        if (!this.buf || (!end && MARKS.some((k) => k.startsWith(this.buf)))) break
+        this.after = false
+      }
       const i = this.buf.indexOf(OPEN)
-      if (i < 0) break
+      const d = this.buf.search(DSML_AT)
+      if (i < 0 && d < 0) break
+      if (d >= 0 && (i < 0 || d < i)) {
+        text += this.buf.slice(0, d)
+        this.buf = this.buf.slice(d)
+        const tag = this.buf.match(DSML_TAG)
+        if (!tag) {
+          // a tag not closed yet; at the end, or with another tag after it,
+          // a stray one dropped
+          const next = this.buf.indexOf("<", 1)
+          if (next < 0 && !end) break
+          this.buf = next < 0 ? "" : this.buf.slice(next)
+          continue
+        }
+        const inv = tag[0].match(DSML_INVOKE)
+        if (!inv) {
+          // function_calls, a parameter's close, any other tag: dropped,
+          // with the blanks after it
+          this.buf = this.buf.slice(tag[0].length)
+          this.after = true
+          continue
+        }
+        const body = this.buf.slice(tag[0].length)
+        const c = body.match(DSML_CLOSE)
+        const n = body.search(DSML_INVOKE_AT)
+        let stop = c ? c.index : n >= 0 ? n : -1
+        if (n >= 0 && n < stop) stop = n
+        if (stop < 0) {
+          if (!end) break
+          stop = body.length
+        }
+        calls.push({ name: inv[1], arguments: dsmlArgs(body.slice(0, stop)) })
+        this.buf = body.slice(c && c.index === stop ? stop + c[0].length : stop)
+        this.after = true
+        continue
+      }
+      const o = objectEnd(this.buf, i + OPEN.length)
+      const v = o > 0 ? looseJSON(this.buf.slice(i + OPEN.length, o)) : null
+      if (v?.name) {
+        text += this.buf.slice(0, i)
+        calls.push({ name: String(v.name), arguments: callArgs(v) })
+        this.buf = this.buf.slice(o)
+        this.after = true
+        continue
+      }
       const j = this.buf.indexOf(CLOSE, i + OPEN.length)
       if (j < 0) break
       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 = looseJSON(raw) ?? {}
-      if (v.name) calls.push({ name: String(v.name), arguments: callArgs(v) })
+      const w = looseJSON(raw) ?? {}
+      if (w.name) calls.push({ name: String(w.name), arguments: callArgs(w) })
       else text += OPEN + raw + CLOSE
     }
     if (end) {
@@ -560,9 +619,9 @@ class TextTools {
       this.buf = ""
     } else {
       // keep back an opened block, or what may be the start of one
-      const i = this.buf.indexOf(OPEN)
-      let keep = i >= 0 ? this.buf.length - i : 0
-      if (!keep) for (let k = Math.min(OPEN.length - 1, this.buf.length); k > 0; k--) if (OPEN.startsWith(this.buf.slice(-k))) { keep = k; break }
+      const at = [this.buf.indexOf(OPEN), this.buf.search(DSML_AT)].filter((x) => x >= 0)
+      let keep = at.length ? this.buf.length - Math.min(...at) : 0
+      if (!keep) for (let k = Math.min(MARK_MAX - 1, this.buf.length); k > 0; k--) if (MARKS.some((m) => m.startsWith(this.buf.slice(-k)))) { keep = k; break }
       text += this.buf.slice(0, this.buf.length - keep)
       this.buf = this.buf.slice(this.buf.length - keep)
     }
@@ -570,6 +629,64 @@ class TextTools {
   }
 }
 
+// DeepSeek's tags, with its full-width bar or a plain one
+const DSML = String.raw`<\s*\/?\s*[|｜][\s|｜]*DSML[\s|｜]*`
+const DSML_AT = new RegExp(DSML)
+const DSML_TAG = new RegExp("^" + DSML + "[^<>]*>")
+const DSML_INVOKE = new RegExp(String.raw`^<\s*[|｜][\s|｜]*DSML[\s|｜]*invoke\s+name\s*=\s*"([^"]+)"\s*>`)
+const DSML_INVOKE_AT = new RegExp(String.raw`<\s*[|｜][\s|｜]*DSML[\s|｜]*invoke\s+name\s*=`)
+const DSML_CLOSE = new RegExp(String.raw`<\s*\/\s*[|｜][\s|｜]*DSML[\s|｜]*invoke\s*>`)
+const DSML_PARAM = new RegExp(String.raw`<\s*[|｜][\s|｜]*DSML[\s|｜]*parameter\s+name\s*=\s*"([^"]+)"((?:\s+\w+\s*=\s*"[^"]*")*)\s*>([\s\S]*?)` + DSML + String.raw`parameter\s*>`, "g")
+// what is left after a call: blanks, our close, DeepSeek's tags but the
+// next call's
+const LEFTOVER = new RegExp(String.raw`^(?:\s+|<\/tool_calls?>|<tool_calls>|` + DSML + String.raw`(?![\s|｜]*invoke\b)[^<>]*>)+`)
+// what text may be the start of, so held back
+const MARKS = [OPEN, CLOSE, "<｜DSML｜", "<|DSML|", "</｜DSML｜", "</|DSML|"]
+const MARK_MAX = Math.max(...MARKS.map((m) => m.length))
+
+// dsmlArgs is the arguments of a DSML invoke as JSON: a parameter marked
+// string="true" is its text, any other its JSON (its text when not JSON)
+function dsmlArgs(body) {
+  const args = {}
+  for (const p of body.matchAll(DSML_PARAM)) {
+    if (/string\s*=\s*"true"/.test(p[2])) {
+      args[p[1]] = p[3]
+      continue
+    }
+    try {
+      args[p[1]] = JSON.parse(p[3].trim())
+    } catch {
+      args[p[1]] = p[3]
+    }
+  }
+  return JSON.stringify(args)
+}
+
+// objectEnd is where the JSON object starting at from (after blanks) ends:
+// past its closing brace, -1 when it isn't whole yet, -2 when there's none
+function objectEnd(s, from) {
+  let k = from
+  while (k < s.length && /\s/.test(s[k])) k++
+  if (k >= s.length) return -1
+  if (s[k] !== "{") return -2
+  let depth = 0
+  let str = false
+  let esc = false
+  for (; k < s.length; k++) {
+    const ch = s[k]
+    if (str) {
+      if (esc) esc = false
+      else if (ch === "\\") esc = true
+      else if (ch === '"') str = false
+      continue
+    }
+    if (ch === '"') str = true
+    else if (ch === "{") depth++
+    else if (ch === "}" && --depth === 0) return k + 1
+  }
+  return -1
+}
+
 // 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.
@@ -1085,7 +1202,7 @@ export const TraeCNAuthPlugin = async ({ client }) => {
     for (const [id, { m, fn }] of out) {
       listedBy.set(id, fn)
       const dev = devModel(m)
-      if (dev) modelNames.set(id, { fn, name: dev.model_name })
+      if (dev) modelNames.set(id, { fn, name: dev.model_name, most: Number(dev.max_tokens) || 0 })
       else modelNames.delete(id)
     }
     return [...out.values()].map((x) => x.m)
@@ -1096,7 +1213,7 @@ export const TraeCNAuthPlugin = async ({ client }) => {
     const was = provider.models?.[id] ?? {}
     // context_window_tokens: dev is what a request gets, max only in Max mode
     const ctx = Number(m.context_window_tokens?.dev ?? m.context_window_size?.max?.[0] ?? m.context_window_size?.max ?? m.context_window_tokens?.max ?? m.prompt_max_tokens) || was.limit?.context || MODEL.limit.context
-    const out = Number(devModel(m)?.max_tokens) || was.limit?.output || MODEL.limit.output
+    const out = Number(devModel(m)?.max_tokens) || was.limit?.output || 0
     const name = m.display_config?.display_name || m.display_name || m.display_model_name || was.name || id
     return { ...MODEL, ...was, id, providerID: ID, name: String(name), limit: { context: ctx, output: out }, api: was.api ?? { id, url: HOSTS.api, npm: "@ai-sdk/openai-compatible" } }
   }
@@ -1169,7 +1286,7 @@ export const TraeCNAuthPlugin = async ({ client }) => {
               const res = await fetch(apiOf(a) + "/api/agent/v3/llm_utils_chat", {
                 method: "POST",
                 headers: ideHeaders(a, { Accept: "text/event-stream", "X-Request-ID": randomUUID() }),
-                body: JSON.stringify(chatBody(req, fn, named?.fn === fn ? named.name : "")),
+                body: JSON.stringify(chatBody(req, fn, named?.fn === fn ? named.name : "", named?.fn === fn ? named.most : 0)),
                 signal: init.signal ?? r0?.signal,
               })
               if (!res.ok) {

package/package.json

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