@magpie-community/opencode-workbuddy-auth 0.1.20 → 0.1.22

package/README.md

@@ -95,6 +95,14 @@ models to each shape below and Kimi's, GPT's, Gemini's and GLM's to some:
   `allOf`) at the root are an object, the union's fields merged;
 - a `pattern`'s `\0` is `\u0000`, which matches the same;
 - a tuple's `items` (a list) is one schema any of them fits;
+- an `enum` with no `type` takes its values' type (or that and `"null"`),
+  and an `enum` of several types is an `anyOf` of one typed `enum` for
+  each, at any depth; an empty `enum` is left out (Kimi and DeepSeek, an
+  MCP server's tools, #122);
+- `true` and `false` where a schema goes are `{}` and `{"not": {}}`
+  (`additionalProperties` is left); a `required` that isn't a list, and a
+  `type` JSON Schema doesn't name, are left out, and `"String"` is
+  `"string"`;
 - a tool's name with a character other than letters, digits, `_` and `-`
   (`.`, `:`, `/`, a space, CJK) is sent with `_` there, and the model's
   calls come back under the tool's own name.
@@ -134,6 +142,13 @@ is used.
 
 A model's reasoning levels are its variants (`reasoningEffort`).
 
+A model's price is its `credits` ("x0.29") and the config's
+`modelPromotions`. A discount for whole days (Step-5-Preview's 独家限免) is
+the price now, with the price before it (`rateWas`). A price that holds only
+some hours of the day (Hy4 preview, free 23:00–8:00) is given as its full
+price, never as free: magpie keeps the list until it asks again, so a list
+asked for at night would say "free" all day (#121).
+
 ## Credits in magpie
 
 magpie's usage card shows the account's credits from the resource summary.

package/index.mjs

@@ -636,6 +636,139 @@ function fitSchema(s, depth = 0) {
   return changed
 }
 
+// Kimi (kimi-k3-1) answers 11133 too, to the tools of an MCP server or a
+// plugin (clearmann, #122). Tried on the owner's account, 2026-10-14, each
+// alone in an otherwise plain chat: Kimi turns away an enum with no type
+// (["a","b"] as much as [1,"a",null]), an empty enum, an enum whose type
+// lists two types besides null, a schema that is true or false where a
+// schema goes (properties.x: true, items: true), a required that isn't a
+// list, and a type it doesn't know ("any", "String"). It takes an enum
+// typed T or [T, "null"], an anyOf of such enums, {"not": {}}, {}, and
+// additionalProperties: true or false. fitShape gives each the shape it
+// takes, meaning the same: none of it narrows or widens what a call may
+// hold, except an empty enum (which nothing fits) is left out.
+const TYPES = new Set(["string", "number", "integer", "boolean", "object", "array", "null"])
+
+// SUB_ONE are the keywords whose value is a schema, SUB_LIST a list of
+// schemas, SUB_MAP a map of names to schemas. additionalProperties and
+// unevaluatedProperties are left as they are when true or false.
+const SUB_ONE = ["items", "additionalItems", "unevaluatedItems", "contains", "not", "if", "then", "else", "propertyNames", "additionalProperties", "unevaluatedProperties"]
+const SUB_LIST = ["anyOf", "oneOf", "allOf", "prefixItems"]
+const SUB_MAP = ["properties", "patternProperties", "$defs", "definitions", "dependentSchemas"]
+const BOOL_OK = new Set(["additionalProperties", "unevaluatedProperties"])
+
+// valueType is the JSON Schema type of an enum's value.
+function valueType(v) {
+  if (v === null) return "null"
+  if (Array.isArray(v)) return "array"
+  if (typeof v === "number") return Number.isInteger(v) ? "integer" : "number"
+  return typeof v
+}
+
+// fitEnum gives s's enum a type: the one its values have, or that and
+// "null"; values of several types are an anyOf of an enum for each. It
+// reports whether it changed anything.
+function fitEnum(s) {
+  if (!("enum" in s)) return false
+  if (!Array.isArray(s.enum) || s.enum.length === 0) {
+    delete s.enum
+    return true
+  }
+  const listed = Array.isArray(s.type) ? s.type : typeof s.type === "string" ? [s.type] : []
+  if (listed.filter((t) => t !== "null").length === 1) return false
+  const byType = new Map()
+  for (const v of s.enum) {
+    const t = valueType(v)
+    if (!byType.has(t)) byType.set(t, [])
+    byType.get(t).push(v)
+  }
+  if (byType.has("integer") && byType.has("number")) {
+    byType.get("number").push(...byType.get("integer"))
+    byType.delete("integer")
+  }
+  const hasNull = byType.delete("null")
+  if (byType.size <= 1) {
+    const [t] = byType.keys()
+    const want = t === undefined ? "null" : hasNull ? [t, "null"] : t
+    if (JSON.stringify(want) === JSON.stringify(s.type)) return false
+    s.type = want
+    return true
+  }
+  const split = [...byType].map(([t, vs]) => ({ type: t, enum: vs }))
+  if (hasNull) split.push({ type: "null" })
+  delete s.enum
+  delete s.type
+  if (Array.isArray(s.anyOf)) s.allOf = [...(Array.isArray(s.allOf) ? s.allOf : []), { anyOf: split }]
+  else s.anyOf = split
+  return true
+}
+
+// subSchema is v, a schema found under key, as an object Kimi takes: true
+// is {}, false is {"not": {}}.
+function subSchema(v, key) {
+  if (typeof v !== "boolean" || BOOL_OK.has(key)) return v
+  return v ? {} : { not: {} }
+}
+
+// fitShape mends s, a schema, and each schema under it, in place (see
+// TYPES above); a name under properties is never read as a keyword. It
+// reports whether it changed anything.
+function fitShape(s, depth = 0) {
+  if (!s || typeof s !== "object" || Array.isArray(s) || depth > 64) return false
+  let changed = false
+  if ("type" in s) {
+    const list = (Array.isArray(s.type) ? s.type : [s.type]).map((t) => (typeof t === "string" ? t.toLowerCase() : t)).filter((t) => TYPES.has(t))
+    const uniq = [...new Set(list)]
+    const want = uniq.length === 0 ? undefined : uniq.length === 1 ? uniq[0] : uniq
+    if (JSON.stringify(want) !== JSON.stringify(s.type)) {
+      if (want === undefined) delete s.type
+      else s.type = want
+      changed = true
+    }
+  }
+  if ("required" in s && !Array.isArray(s.required)) {
+    delete s.required
+    changed = true
+  } else if (Array.isArray(s.required) && s.required.some((k) => typeof k !== "string")) {
+    s.required = s.required.filter((k) => typeof k === "string")
+    changed = true
+  }
+  if (fitEnum(s)) changed = true
+  for (const k of SUB_ONE) {
+    if (!(k in s)) continue
+    const v = subSchema(s[k], k)
+    if (v !== s[k]) {
+      s[k] = v
+      changed = true
+    }
+    if (fitShape(v, depth + 1)) changed = true
+  }
+  for (const k of SUB_LIST) {
+    if (!Array.isArray(s[k])) continue
+    s[k].forEach((v0, i) => {
+      const v = subSchema(v0, k)
+      if (v !== v0) {
+        s[k][i] = v
+        changed = true
+      }
+      if (fitShape(v, depth + 1)) changed = true
+    })
+  }
+  for (const k of SUB_MAP) {
+    const m = s[k]
+    if (!m || typeof m !== "object" || Array.isArray(m)) continue
+    for (const [name, v0] of Object.entries(m)) {
+      const v = subSchema(v0, k)
+      if (v !== v0) {
+        m[name] = v
+        changed = true
+      }
+      if (fitShape(v, depth + 1)) changed = true
+    }
+  }
+  return changed
+}
+
 // localRef is the schema a local $ref in root names ("#/$defs/x",
 // "#/definitions/x"), or s itself.
 function localRef(root, s) {
@@ -698,8 +831,8 @@ function objectRoot(ps, root = ps, depth = 0) {
 }
 
 // fitTools mends b's function tools in place: their parameters (fitSchema,
-// objectRoot) and names. It reports whether it changed anything, and the
-// names it gave, each to the name the client knows (ours), so that the
+// fitShape, objectRoot) and names. It reports whether it changed anything,
+// and the names it gave, each to the name the client knows (ours), so that the
 // model's calls are named back. A call in the chat's history is named as
 // its tool now is.
 function fitTools(b) {
@@ -729,6 +862,7 @@ function fitTools(b) {
       continue
     }
     if (fitSchema(fn.parameters)) changed = true
+    if (fitShape(fn.parameters)) changed = true
     if (objectRoot(fn.parameters)) changed = true
   }
   if (theirs.size && Array.isArray(b.messages)) {
@@ -1187,6 +1321,8 @@ function modelOf(site, provider, m) {
     free: !!m.free,
     // magpie's own: the credits a request costs, as a multiple (0: none)
     rate: m.rate ?? 0,
+    // magpie's own: the price before a discount running now (0: none)
+    rateWas: m.rateWas ?? 0,
   }
 }
 
@@ -1210,6 +1346,53 @@ function freeCredits(c) {
   return creditsOf(c) === 0
 }
 
+// discountOf reads a promotion's price: its discountedCredits ("0.50x",
+// "0.00x"), else the factor times the model's own credits.
+function discountOf(p, base) {
+  const said = creditsOf(String(p.discount?.discountedCredits ?? "").trim().replace(/x$/i, ""))
+  if (said !== undefined) return said
+  const f = Number(p.discount?.factor)
+  return Number.isFinite(f) && f >= 0 && base !== undefined ? base * f : undefined
+}
+
+// running says whether a promotion is on at now: enabled, and inside its
+// validFrom..validUntil. Its daily hours are not looked at here.
+function running(p, now) {
+  if (!p || p.enabled === false) return false
+  const from = Date.parse(p.schedule?.validFrom ?? "")
+  const until = Date.parse(p.schedule?.validUntil ?? "")
+  return !(from > now) && !(until <= now)
+}
+
+// priceOf is a model's price as magpie keeps it, from its credits and the
+// config's modelPromotions (what WorkBuddy's picker shows as 限时免费,
+// 夜间免费, 夜间折扣). magpie keeps the list it is given until it asks
+// again, so a price that holds only some hours of the day (Hy4 preview,
+// free 23:00–8:00 only) is given as its full price, never as free: a list
+// asked for at night would otherwise say "free" all day (#121). A discount
+// for whole days (Step-5-Preview's 独家限免) is the price now, with the
+// price before it as rateWas.
+function priceOf(d, promotions, now = Date.now()) {
+  const base = creditsOf(d.credits)
+  const mine = (Array.isArray(promotions) ? promotions : []).filter(
+    (p) => p?.kind === "discount" && Array.isArray(p.modelIds) && p.modelIds.includes(d.id) && running(p, now),
+  )
+  if (mine.some((p) => Array.isArray(p.schedule?.daily) && p.schedule.daily.length)) {
+    // by the hour: the full price, which the credits are unless a night
+    // discount already took them to its own price
+    const night = mine.filter((p) => p.discount && Array.isArray(p.schedule?.daily) && p.schedule.daily.length)
+    if (base === undefined || (base === 0 && night.some((p) => discountOf(p, base) === 0))) return { free: false }
+    return { free: false, rate: base }
+  }
+  const off = mine.filter((p) => p.discount).map((p) => discountOf(p, base)).filter((r) => r !== undefined)
+  if (off.length) {
+    const r = Math.min(...off)
+    return { free: r === 0, rate: r, ...(base !== undefined && base > r ? { rateWas: base } : {}) }
+  }
+  if (base === undefined) return {}
+  return { free: base === 0, rate: base }
+}
+
 async function liveModels(site, a) {
   const headers = new Headers()
   sign(site, a, headers)
@@ -1231,11 +1414,7 @@ async function liveModels(site, a) {
         m.context = d.maxInputTokens
         m.output = d.maxOutputTokens
         m.images = d.supportsImages === true && !textOnly(site, id)
-        const r = creditsOf(d.credits)
-        if (r !== undefined) {
-          m.free = r === 0
-          m.rate = r
-        }
+        Object.assign(m, priceOf(d, cfg.modelPromotions))
         const es = d.reasoning?.supportedEfforts ?? []
         if (es.length) {
           const canOff = d.reasoning?.canDisableThinking
@@ -1513,4 +1692,4 @@ export const WorkBuddyAuthPlugin = makePlugin(SITES.workbuddy)
 export const WorkBuddyAIAuthPlugin = makePlugin(SITES["workbuddy-ai"])
 
 // for tests
-export const _internal = { replyAfterTools, AFTER_TOOLS_REFUSED, enterpriseUsageOf, notDesktop, textOnly, runsOutOf, packagesOf, endOf, enterpriseHeaders, enterpriseOf, liveModels, browserSignIn, withSystem, normalizeToolChoice, fitTools, fitted, renamed, unflagged, usageOf, desktopHeld, explained, REFUSED_HINT, RESTRICTED_HINT, EXHAUSTED_HINT, freeCredits, creditsOf, fresh, SITES, renewing, renewed, SESSION, attend, turnKey, conversationKey, signatureOf }
+export const _internal = { fitShape, replyAfterTools, AFTER_TOOLS_REFUSED, enterpriseUsageOf, notDesktop, textOnly, runsOutOf, packagesOf, endOf, enterpriseHeaders, enterpriseOf, liveModels, browserSignIn, withSystem, normalizeToolChoice, fitTools, fitted, renamed, unflagged, usageOf, desktopHeld, explained, REFUSED_HINT, RESTRICTED_HINT, EXHAUSTED_HINT, freeCredits, creditsOf, priceOf, fresh, SITES, renewing, renewed, SESSION, attend, turnKey, conversationKey, signatureOf }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-workbuddy-auth",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "OpenCode provider plugins for WorkBuddy's plans: WorkBuddy (CodeBuddy, copilot.tencent.com) and WorkBuddy AI (www.workbuddy.ai)",
   "type": "module",
   "main": "./index.mjs",