@magpie-community/opencode-kiro-auth 0.1.15 → 0.1.17

package/index.mjs

@@ -414,7 +414,10 @@ function goG(x) {
 
 // usageOf is the allowance Get-Usage-Limits tells, as magpie's built-in
 // said it: the account's email, the credits of each allowance, the month's and a free trial's
-// while it runs.
+// while it runs. Each window carries its count (amount, limit, unit), so
+// magpie can say what is left of it when the user shows what is left
+// (#408): display alone is the vendor's text, which magpie can't turn
+// round.
 function usageOf(l) {
   const at = (secs) => (secs > 0 ? new Date(Math.trunc(secs) * 1000).toISOString() : undefined)
   const count = (used, limit) => used.toFixed(2).replace(/0+$/, "").replace(/\.$/, "") + " / " + goG(limit)
@@ -424,13 +427,14 @@ function usageOf(l) {
     const t = u?.freeTrialInfo
     if (t && String(t.freeTrialStatus ?? "").toUpperCase() === "ACTIVE" && num(t.usageLimitWithPrecision) > 0) {
       const used = num(t.currentUsageWithPrecision), limit = num(t.usageLimitWithPrecision)
-      windows.push({ name: "Free trial", used: (100 * used) / limit, resetsAt: at(num(t.freeTrialExpiry)), display: count(used, limit) })
+      windows.push({ name: "Free trial", used: (100 * used) / limit, resetsAt: at(num(t.freeTrialExpiry)), display: count(used, limit),
+        amount: used, limit, unit: "credits" })
     }
     const used = num(u?.currentUsageWithPrecision), limit = num(u?.usageLimitWithPrecision)
     if (limit <= 0) continue
     const reset = num(u?.nextDateReset) || num(l?.nextDateReset)
     windows.push({ name: u?.displayNamePlural || u?.displayName || "Credits", used: (100 * used) / limit, resetsAt: at(reset),
-      display: count(used, limit), span: 30 * 24 * 3600 })
+      display: count(used, limit), amount: used, limit, unit: "credits", span: 30 * 24 * 3600 })
   }
   const email = l?.userInfo?.email
   return { plan: planName(l?.subscriptionInfo?.subscriptionTitle), ...(typeof email === "string" && email ? { user: email } : {}), windows }
@@ -1097,7 +1101,12 @@ async function* events(body, model, budget) {
   let tool = ""
   let tools = 0
   let stop = ""
-  const usage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }
+  // reported: Kiro sent a tokenUsage. It doesn't today: a reply has a
+  // contextUsageEvent and a meteringEvent (credits) and nothing more, and
+  // kiro-cli 2.32's own trace log shows its MetadataEvent with every token
+  // count None, while a repeated prompt is billed about half the credits,
+  // so Kiro does cache and doesn't say how much
+  const usage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, reported: false }
   let pct = 0
   let said = 0
   let failed = ""
@@ -1147,6 +1156,7 @@ async function* events(body, model, budget) {
         if (m.stopReason) stop = m.stopReason
         const tu = m.tokenUsage
         if (tu && typeof tu === "object") {
+          usage.reported = true
           usage.input += tu.uncachedInputTokens || tu.inputTokens || 0
           usage.output += tu.outputTokens || 0
           usage.cacheRead += tu.cacheReadInputTokens || 0
@@ -1192,12 +1202,15 @@ function finished(content) {
   return content
 }
 
-const anthropicUsage = (u) => ({
-  input_tokens: u.input,
-  output_tokens: u.output,
-  cache_read_input_tokens: u.cacheRead,
-  cache_creation_input_tokens: u.cacheWrite,
-})
+// anthropicUsage is the usage in Messages' words. With no tokenUsage from
+// Kiro the input is reckoned from how full the context is, and what of it
+// Kiro read from its cache is unknown, not 0: the cache fields are left
+// out and magpie is told so (magpie_cache_unknown), so it shows no hit
+// rate rather than 0%.
+const anthropicUsage = (u) =>
+  u.reported
+    ? { input_tokens: u.input, output_tokens: u.output, cache_read_input_tokens: u.cacheRead, cache_creation_input_tokens: u.cacheWrite }
+    : { input_tokens: u.input, output_tokens: u.output, magpie_cache_unknown: true }
 
 // quotaWords are magpie's (internal/gateway/fallback.go): how a vendor says
 // "out of quota" or "slow down".

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-kiro-auth",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Kiro subscriptions (Free, Pro, Pro+, Power) in OpenCode and magpie",
   "type": "module",
   "main": "./index.mjs",