@magpie-community/opencode-workbuddy-auth 0.1.21 → 0.1.23

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.

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)) {
@@ -1075,6 +1209,24 @@ function enterpriseUsageOf(u) {
   return w
 }
 
+// spareFree has the credits windows not count the models that cost none
+// (notModels): a model at x0.00 draws no credits, and with the credits
+// used up WorkBuddy still serves it (deepseek-v4.1-flash at 560 / 560,
+// magpie-community/plugins#138, hheei). Counted, the window at 100% put
+// the account last, and behind every other, for its free models too. A
+// model free only some hours (a night promotion) is not free here, as in
+// the list (priceOf). A list that can't be read leaves the windows as they
+// are: every model counted, as before.
+async function spareFree(site, a, windows) {
+  if (!windows.length) return windows
+  let free = []
+  try {
+    free = (await liveModels(site, a)).filter((m) => m.free).map((m) => m.id)
+  } catch {}
+  if (free.length) for (const w of windows) w.notModels = free
+  return windows
+}
+
 // The packages' codes, as WorkBuddy's own client lists them when it asks
 // for each package's credits (its COMMODITY_CODES): the API refuses a
 // detail list without them (10001 "PackageCodes required").
@@ -1443,7 +1595,7 @@ function makePlugin(site) {
             try {
               ent = enterpriseUsageOf(await meter(site, a, "/billing/meter/get-enterprise-user-usage"))
             } catch {}
-            if (ent) return { plan: auth.plan || "Enterprise", windows: [ent], signIn: "kept" }
+            if (ent) return { plan: auth.plan || "Enterprise", windows: await spareFree(site, a, [ent]), signIn: "kept" }
           }
           // when the credits left run out, for routing to spend them first;
           // a list that can't be read leaves it unknown, the card stands
@@ -1453,6 +1605,7 @@ function makePlugin(site) {
               Object.assign(credits, runsOutOf(sum, await packagesOf(site, a)) ?? {})
             } catch {}
           }
+          await spareFree(site, a, out.windows)
           return { ...out, signIn: "kept" }
         } catch (e) {
           return { error: e?.message ?? String(e), signIn: "kept" }
@@ -1558,4 +1711,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, priceOf, 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.21",
+  "version": "0.1.23",
   "description": "OpenCode provider plugins for WorkBuddy's plans: WorkBuddy (CodeBuddy, copilot.tencent.com) and WorkBuddy AI (www.workbuddy.ai)",
   "type": "module",
   "main": "./index.mjs",