@songsid/agend 2.3.2-beta.4 → 2.3.2-beta.5

package/dist/ui/fleet-usage.js

@@ -15,14 +15,15 @@ register("fusage", {
     range: "Range", today: "Today", r7d: "7 days", month: "This month", all: "All", custom: "Custom", from: "From", to: "To", apply: "Apply",
     group: "Group by", g_instance: "Agent", g_backend: "Backend", g_model: "Model", g_profile: "Credential profile", g_team: "Team (as configured now)",
     csv: "Download CSV", basis: "API-equivalent at list price (checked {0}) — not money spent. Subscriptions are not billed per token.",
-    amount: "API-equivalent", input: "Input", output: "Output", read: "Cache read", write: "Cache write", total: "Total tokens", requests: "Requests", messages: "Messages",
+    amount: "API-equivalent", input: "Input", output: "Output", reasoning: "Reasoning", read: "Cache read", write: "Cache write", total: "Total tokens", requests: "Requests", messages: "Messages",
     notPriced: "not priced", partial: "partial", noTeam: "(no team)", unknown: "unknown",
-    f_cache_write_not_reported: "cache writes not reported (Codex) — an estimate", f_not_priced: "not priced: {0}", f_source_unknown: "read before backend and profile were recorded",
+    f_cache_write_not_reported: "cache writes not reported (Codex, Muse) — an estimate", f_not_priced: "not priced: {0}", f_source_unknown: "read before backend and profile were recorded",
+    f_estimated: "estimated from text size — Kiro records no token counts", f_includes_estimates: "includes estimates (Kiro)", f_cost_reported: "amount as the CLI reported it (no list price for this model)", estimatedPart: "of which estimated: {0}",
     scanning: "Scanning — totals may still grow.", updated: "Updated {0} · read every 10 min", since: "Collected since {0}", notYet: "Not collected yet",
     refresh: "Refresh",
     notMeasured: "Not measured", nm_credit_billed: "Kiro is credit-billed and records no tokens", nm_unsupported: "AgEnD can't read this CLI's usage yet", nm_no_data: "nothing read yet",
     shared: "shares its working directory with {0}; their transcripts can't be told apart",
-    empty: "Nothing recorded yet", emptyHint: "Usage is read from Claude Code and Codex transcripts, from when the fleet started.",
+    empty: "Nothing recorded yet", emptyHint: "Usage is read from Claude Code, Codex, Grok, Muse, OpenCode and Antigravity, and estimated for Kiro, from when the fleet started.",
     blocked: "Not offered over the public link", blockedHint: "Usage is offered over the public link only when \"Usage report over the public link\" is on in Settings → Web dashboard — on the dashboard reached directly, on the computer running AgEnD.",
     openSettings: "Open Settings → Web dashboard on that computer",
     partialDays: "Daily detail from {0}: the earlier days in this range are too many rows to send. The rows and totals above cover the whole range; the trend, the heatmap and the CSV start at {0}.",
@@ -42,14 +43,15 @@ register("fusage", {
     range: "期間", today: "今天", r7d: "7 天", month: "本月", all: "全部", custom: "自訂", from: "從", to: "到", apply: "套用",
     group: "分組", g_instance: "Agent", g_backend: "Backend", g_model: "模型", g_profile: "憑證 profile", g_team: "Team（依目前設定）",
     csv: "下載 CSV", basis: "依牌價換算的 API 等值（查證日期 {0}）——不是實際花費。訂閱方案不按 token 計費。",
-    amount: "API 等值", input: "輸入", output: "輸出", read: "快取讀取", write: "快取寫入", total: "token 總計", requests: "請求數", messages: "訊息數",
+    amount: "API 等值", input: "輸入", output: "輸出", reasoning: "推理", read: "快取讀取", write: "快取寫入", total: "token 總計", requests: "請求數", messages: "訊息數",
     notPriced: "未定價", partial: "部分", noTeam: "（不屬於任何 team）", unknown: "未知",
-    f_cache_write_not_reported: "未回報快取寫入（Codex）——是估算", f_not_priced: "未定價：{0}", f_source_unknown: "讀取時尚未記錄 backend 與 profile",
+    f_cache_write_not_reported: "未回報快取寫入（Codex、Muse）——是估算", f_not_priced: "未定價：{0}", f_source_unknown: "讀取時尚未記錄 backend 與 profile",
+    f_estimated: "依文字長度估算——Kiro 不記錄 token 數", f_includes_estimates: "含估算值（Kiro）", f_cost_reported: "金額為 CLI 自行回報（價目表沒有此模型）", estimatedPart: "其中估算：{0}",
     scanning: "掃描中——總數可能還會增加。", updated: "更新於 {0} · 每 10 分鐘讀取一次", since: "自 {0} 起收集", notYet: "尚未收集",
     refresh: "重新整理",
     notMeasured: "未量測", nm_credit_billed: "Kiro 以 credit 計費，不記錄 token", nm_unsupported: "AgEnD 目前還讀不到這個 CLI 的用量", nm_no_data: "尚未讀到任何資料",
     shared: "與 {0} 共用工作目錄，無法分辨各自的 transcript",
-    empty: "還沒有任何紀錄", emptyHint: "用量從 Claude Code 與 Codex 的 transcript 讀取，自 fleet 啟動起計。",
+    empty: "還沒有任何紀錄", emptyHint: "用量從 Claude Code、Codex、Grok、Muse、OpenCode 與 Antigravity 讀取，Kiro 則為估算，自 fleet 啟動起計。",
     blocked: "公開連結上不提供", blockedHint: "只有在設定 → 網頁儀表板裡開啟「透過公開連結提供用量報告」時，公開連結才會提供用量；這個設定要在執行 AgEnD 的那台電腦上、直接開啟的儀表板裡變更。",
     openSettings: "在那台電腦上開啟設定 → 網頁儀表板",
     partialDays: "每日明細從 {0} 起：這段期間更早的日子資料列太多，無法一次送出。上方的各列與總計涵蓋整段期間；趨勢、熱度圖與 CSV 則從 {0} 開始。",
@@ -95,11 +97,11 @@ export function keyText(group, key) {
 const writes = (r) => (r.cacheWrite5m || 0) + (r.cacheWrite1h || 0) + (r.cacheWrite || 0);
 function flagText(f, r) {
   if (f === "not_priced") return tu("f_not_priced", (r.unpriced || []).join(", "));
-  return ["cache_write_not_reported", "source_unknown"].includes(f) ? tu(`f_${f}`) : f;
+  return ["cache_write_not_reported", "source_unknown", "estimated", "includes_estimates", "cost_reported"].includes(f) ? tu(`f_${f}`) : f;
 }
 
 // ── CSV (design §4): the daily rows of this same answer; messages on their own rows (they are per agent, not per model).
-const CSV_COLUMNS = ["date", "zone", "instance", "backend", "model", "tier", "profile", "input", "output", "cache_read", "cache_write_5m", "cache_write_1h", "cache_write", "requests", "messages", "amount", "basis", "flags"];
+const CSV_COLUMNS = ["date", "zone", "instance", "backend", "model", "tier", "profile", "input", "output", "reasoning", "cache_read", "cache_write_5m", "cache_write_1h", "cache_write", "requests", "messages", "amount", "basis", "flags", "estimated"];
 /** One CSV field: quoted when it must be, and never read as a formula by a spreadsheet (=, +, -, @, tab, CR first). */
 export function csvField(v) {
   let s = v === null || v === undefined ? "" : String(v);
@@ -109,11 +111,11 @@ export function csvField(v) {
 export function usageCsv(report) {
   const lines = [CSV_COLUMNS.join(",")];
   for (const d of report.daily || []) {
-    lines.push([d.date, d.zone, d.instance, d.backend, d.model, d.tier, d.profile, d.input, d.output, d.cacheRead, d.cacheWrite5m, d.cacheWrite1h, d.cacheWrite,
-      d.requests, "", d.amount === null ? "" : d.amount.toFixed(6), report.basis, (d.flags || []).join(" ")].map(csvField).join(","));
+    lines.push([d.date, d.zone, d.instance, d.backend, d.model, d.tier, d.profile, d.input, d.output, d.reasoning, d.cacheRead, d.cacheWrite5m, d.cacheWrite1h, d.cacheWrite,
+      d.requests, "", d.amount === null ? "" : d.amount.toFixed(6), report.basis, (d.flags || []).join(" "), d.estimated ? "yes" : "no"].map(csvField).join(","));
   }
   for (const m of report.messagesDaily || []) {
-    lines.push([m.date, report.zone, m.instance, "", "", "", "", "", "", "", "", "", "", "", m.count, "", report.basis, ""].map(csvField).join(","));
+    lines.push([m.date, report.zone, m.instance, "", "", "", "", "", "", "", "", "", "", "", "", m.count, "", report.basis, "", ""].map(csvField).join(","));
   }
   return `${lines.join("\r\n")}\r\n`;
 }
@@ -151,7 +153,7 @@ export function levels(values) {
   return (v) => (!(v > 0) ? 0 : v <= cut[0] ? 1 : v <= cut[1] ? 2 : v <= cut[2] ? 3 : 4);
 }
 
-const tokensOf = (d) => d.input + d.output + d.cacheRead + d.cacheWrite5m + d.cacheWrite1h + d.cacheWrite;
+const tokensOf = (d) => d.input + d.output + (d.reasoning || 0) + d.cacheRead + d.cacheWrite5m + d.cacheWrite1h + d.cacheWrite;
 /**
  * Each day of the answer: its tokens (whether it was used at all), the priced part of its amount, whether part of it is
  * not priced, and its parts by zone (a day folded before the fleet's timezone changed keeps its own zone, §5.3).
@@ -218,7 +220,7 @@ export function thinXLabels(n, slotPx, labelWidthPx) {
 /** The trend's series: the top `TOP` agents by the measure over the range, then "others"; one value per date. */
 export function trendSeries(report, dates) {
   const priced = report.totals && report.totals.amount !== null && report.totals.amount > 0;
-  const measure = (d) => (priced ? d.amount || 0 : d.input + d.output + d.cacheRead + d.cacheWrite5m + d.cacheWrite1h + d.cacheWrite);
+  const measure = (d) => (priced ? d.amount || 0 : tokensOf(d));
   const byAgent = new Map();
   for (const d of report.daily || []) byAgent.set(d.instance, (byAgent.get(d.instance) || 0) + measure(d));
   const ranked = [...byAgent.entries()].filter(([, v]) => v > 0).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]));
@@ -327,6 +329,7 @@ function Row({ r, group, max, measure }) {
     <td data-label=${tu("amount")} class=${`num${r.amount === null ? " muted" : ""}`}>${amountText(r)}</td>
     <td data-label=${tu("input")} class="num">${tokens(r.input)}</td>
     <td data-label=${tu("output")} class="num">${tokens(r.output)}</td>
+    <td data-label=${tu("reasoning")} class="num">${r.reasoningReported === false ? "—" : tokens(r.reasoning || 0)}</td>
     <td data-label=${tu("read")} class="num">${tokens(r.cacheRead)}</td>
     <td data-label=${tu("write")} class="num">${r.flags.includes("cache_write_not_reported") && writes(r) === 0 ? "—" : tokens(writes(r))}</td>
     <td data-label=${tu("total")} class="num">${tokens(r.total)}</td>
@@ -379,13 +382,14 @@ export function UsageReport({ report, choice, setChoice, refresh, fetchedAt }) {
       ${report.scanning.active && (!report.scanning.caughtUp || report.scanning.pendingBytes > 0) ? html` <span class="us-scan" role="status">${tu("scanning")} <button type="button" class="btn btn-sm" onClick=${refresh}>${tu("refresh")}</button></span>` : null}</p>
     ${empty ? html`<${Empty} icon="chart" title=${tu("empty")} hint=${tu("emptyHint")} />` : html`
       <dl class="us-totals card">
-        <div class="ch-metric"><dt>${tu("amount")}</dt><dd>${amountText(report.totals)}</dd></div>
+        <div class="ch-metric"><dt>${tu("amount")}</dt><dd>${amountText(report.totals)}${report.totals.estimated
+          ? html`<span class="us-est">${report.totals.amountEstimated !== null && report.totals.amountEstimated !== undefined ? tu("estimatedPart", money(report.totals.amountEstimated)) : tu("f_includes_estimates")}</span>` : null}</dd></div>
         <div class="ch-metric"><dt>${tu("total")}</dt><dd>${tokens(report.totals.total)}</dd></div>
         <div class="ch-metric"><dt>${tu("requests")}</dt><dd>${n(report.totals.requests)}</dd></div>
         <div class="ch-metric"><dt>${tu("messages")}</dt><dd>${report.totals.messages === null ? "—" : n(report.totals.messages)}</dd></div>
       </dl>
       ${rows.length ? html`<table class="us-table"><thead><tr><th scope="col">${tu(`g_${group}`)}</th><th scope="col" class="num">${tu("amount")}</th>
-        <th scope="col" class="num">${tu("input")}</th><th scope="col" class="num">${tu("output")}</th><th scope="col" class="num">${tu("read")}</th><th scope="col" class="num">${tu("write")}</th>
+        <th scope="col" class="num">${tu("input")}</th><th scope="col" class="num">${tu("output")}</th><th scope="col" class="num">${tu("reasoning")}</th><th scope="col" class="num">${tu("read")}</th><th scope="col" class="num">${tu("write")}</th>
         <th scope="col" class="num">${tu("total")}</th><th scope="col" class="num">${tu("requests")}</th><th scope="col" class="num">${tu("messages")}</th></tr></thead>
         <tbody>${rows.map((r) => html`<${Row} key=${r.key} r=${r} group=${group} max=${max} measure=${measure} />`)}</tbody></table>`
         : html`<p class="note">${tu("noRows")}</p>`}

package/dist/ui/panel-log.js

@@ -62,7 +62,7 @@ register("log", {
     ev_backend_unreachable: "CLI unreachable", ev_startup_backend_unreachable: "CLI unreachable at start", ev_backend_launch_warning: "Launch warning",
     ev_clear_action: "Conversation cleared", ev_normal_exit_action: "Exited", ev_reply_drop_detected: "A reply went missing",
     ev_reply_drop_recovered: "Missing reply recovered", ev_reply_drop_unrecovered: "Missing reply not recovered",
-    ev_supervision_ended: "Supervision ended", ev_tmux_server_crash: "tmux crashed", ev_malformed_tool_call: "Malformed tool call", ev_health_check_error: "Health check error", ev_working_state: "Working-state journal",
+    ev_supervision_ended: "Supervision ended", ev_tmux_server_crash: "tmux crashed", ev_malformed_tool_call: "Malformed tool call", ev_health_check_error: "Health check error", ev_context_lost: "Started fresh: context lost", ev_working_state: "Working-state journal",
   },
   "zh-TW": {
     offTitle: "紀錄未開啟",
@@ -100,7 +100,7 @@ register("log", {
     ev_backend_unreachable: "連不到 CLI", ev_startup_backend_unreachable: "啟動時連不到 CLI", ev_backend_launch_warning: "啟動警告",
     ev_clear_action: "對話已清除", ev_normal_exit_action: "已結束", ev_reply_drop_detected: "有回覆遺失",
     ev_reply_drop_recovered: "遺失的回覆已補回", ev_reply_drop_unrecovered: "遺失的回覆沒有補回",
-    ev_supervision_ended: "監督結束", ev_tmux_server_crash: "tmux 當掉", ev_malformed_tool_call: "格式錯誤的工具呼叫", ev_health_check_error: "健康檢查錯誤", ev_working_state: "工作狀態紀錄",
+    ev_supervision_ended: "監督結束", ev_tmux_server_crash: "tmux 當掉", ev_malformed_tool_call: "格式錯誤的工具呼叫", ev_health_check_error: "健康檢查錯誤", ev_context_lost: "改用全新對話：context 遺失", ev_working_state: "工作狀態紀錄",
   },
 });
 const tl = (key, ...a) => t(`log.${key}`, ...a);

package/dist/ui/panel-needs.js

@@ -25,7 +25,7 @@ import { openSignIn, signInOffered } from "./backend-signin.js";
 register("needs", {
   en: {
     title: "Needs you", empty: "Nothing needs you right now", emptyHint: "When an agent waits for you, it shows here — and in your chat app's General.", emptyHintWeb: "When an agent waits for you, it shows here.",
-    open: "Open chat", openCard: "Open the card", noAssignee: "Task board (nobody assigned)", signIn: "Sign in",
+    open: "Open chat", openCard: "Open the card", noAssignee: "Task board (nobody assigned)", fleetSignIns: "Fleet sign-ins", signIn: "Sign in",
     gap: "not wrapped up: {0}", gapUnchecked: "{0} checklist item(s) unchecked", gapNoResult: "no result", gapJoin: ", ", acknowledge: "Acknowledge", acknowledging: "Acknowledging…", answering: "Answering…",
     ageNow: "just now", ageMin: "{0} min", ageHour: "{0} h", ageDay: "{0} d",
     notifyTitle: "Notify me on this device", notifyOn: "Notifications are on for this browser while a tab is open.",
@@ -38,7 +38,7 @@ register("needs", {
   },
   "zh-TW": {
     title: "等你處理", empty: "目前沒有需要你處理的事", emptyHint: "agent 在等你時，會出現在這裡——也會出現在聊天 app 的 General。", emptyHintWeb: "agent 在等你時，會出現在這裡。",
-    open: "開啟聊天", openCard: "打開卡片", noAssignee: "任務看板（沒有負責人）", signIn: "登入",
+    open: "開啟聊天", openCard: "打開卡片", noAssignee: "任務看板（沒有負責人）", fleetSignIns: "Fleet 登入", signIn: "登入",
     gap: "還沒補齊：{0}", gapUnchecked: "還有 {0} 項沒勾", gapNoResult: "沒有產出總結", gapJoin: "、", acknowledge: "確認", acknowledging: "確認中…", answering: "回覆中…",
     ageNow: "剛剛", ageMin: "{0} 分鐘", ageHour: "{0} 小時", ageDay: "{0} 天",
     notifyTitle: "在這台裝置通知我", notifyOn: "這個瀏覽器的通知已開啟（需要開著分頁）。",
@@ -143,7 +143,7 @@ export function NeedsPanel({ navKey }) {
     <div data-trust="panel-content" class="panel-body"><div class="col">
       ${!items.length ? html`<${Empty} icon="check" title=${tn("empty")} hint=${tn(chatApp ? "emptyHint" : "emptyHintWeb")} />`
         : groups.map((g) => html`<section key=${g.instance} class="n-group" aria-label=${g.instance}>
-          <h2 class="n-group-head">${g.instance ? html`<a href=${chatPath(g.instance)} title=${g.instance}>${nameFor(g.instance)}</a>` : tn("noAssignee")}</h2>
+          <h2 class="n-group-head">${g.instance ? html`<a href=${chatPath(g.instance)} title=${g.instance}>${nameFor(g.instance)}</a>` : tn(g.items.some(i => i.type === "backend") ? "fleetSignIns" : "noAssignee")}</h2>
           ${g.items.map((item) => html`<${NeedsItem} key=${item.id} item=${item} nowMs=${nowMs} owner=${owner} />`)}
         </section>`)}
       <${NotifyToggle} />
@@ -200,7 +200,7 @@ function NeedsItem({ item, nowMs, owner }) {
             disabled=${promptBusy} onClick=${() => answer(a.id)}>${(p ? p.busy : fallback === "busy") ? tn("answering") : a.label}</button>`) : null}
         ${item.type === "delivery" ? html`<button type="button" class="btn btn-sm" disabled=${!!ack} onClick=${acknowledge}>
             <${Icon} name="check" size=${14} />${ack === "busy" ? tn("acknowledging") : tn("acknowledge")}</button>` : null}
-        ${item.reason === "auth_paused" && item.signIn && signInOffered() ? html`<button type="button" class="btn btn-sm btn-primary" onClick=${() => openSignIn(item.signIn)}>${tn("signIn")}</button>` : null}
+        ${(item.reason === "auth_paused" || item.reason === "backend_signin") && item.signIn && signInOffered() ? html`<button type="button" class="btn btn-sm btn-primary" onClick=${() => openSignIn(item.signIn)}>${tn("signIn")}</button>` : null}
         ${item.type === "task" && item.card ? html`<a class="btn btn-sm" href=${`/ui/fleet?card=${encodeURIComponent(item.card.code)}`}>${tn("openCard")}</a>` : null}
         ${item.instance ? html`<a class="btn btn-sm btn-ghost" href=${chatPath(item.instance)}>${tn("open")}</a>` : null}
       </div>

package/dist/ui/shared/app-i18n.js

@@ -105,7 +105,7 @@ register("app", {
     confirmTitle: "Please confirm", confirmOk: "Continue", cancel: "Cancel",
     sidePanelLeave: "Leave {0} without saving? Your changes there will be lost.", sidePanelDiscard: "Discard changes",
     // The server's own wording (src/locale.ts needs.reason.*), so the web says what Discord says.
-    needs_reason_hang: "Not responding", needs_reason_exited: "Exited", needs_reason_assist: "Waiting at its terminal", needs_reason_permission: "Permission needed", needs_reason_dangerous_command: "Dangerous command waiting", needs_reason_login: "Sign-in needed", needs_reason_dialog: "Waiting at a dialog", needs_reason_terminal_input: "May be waiting for input", needs_reason_auth_paused: "Paused: sign-in needed", needs_reason_crashed: "Crashed", needs_reason_delivery_uncertain: "Could not confirm delivery", needs_reason_delivery_failed: "Delivery failed", needs_reason_task_review: "Waiting for your confirmation", needs_reason_task_blocked: "Blocked: asks you",
+    needs_reason_hang: "Not responding", needs_reason_exited: "Exited", needs_reason_assist: "Waiting at its terminal", needs_reason_permission: "Permission needed", needs_reason_dangerous_command: "Dangerous command waiting", needs_reason_login: "Sign-in needed", needs_reason_dialog: "Waiting at a dialog", needs_reason_terminal_input: "May be waiting for input", needs_reason_auth_paused: "Paused: sign-in needed", needs_reason_backend_signin: "Backend sign-in needed", needs_reason_crashed: "Crashed", needs_reason_delivery_uncertain: "Could not confirm delivery", needs_reason_delivery_failed: "Delivery failed", needs_reason_task_review: "Waiting for your confirmation", needs_reason_task_blocked: "Blocked: asks you",
   },
   "zh-TW": {
     brand: "AgEnD", fleet: "Fleet", fleetOverview: "Fleet 概覽", view: "檢視", settings: "設定", instances: "Instances", newInstance: "新增 instance", newAgent: "新增 Agent",
@@ -145,6 +145,6 @@ register("app", {
     search: "搜尋", searchTitle: "搜尋聊天、agent 之間的訊息與任務（{0}）",
     confirmTitle: "請確認", confirmOk: "繼續", cancel: "取消",
     sidePanelLeave: "不儲存就離開「{0}」？你在那裡的修改會遺失。", sidePanelDiscard: "捨棄修改",
-    needs_reason_hang: "沒有回應", needs_reason_exited: "已結束", needs_reason_assist: "在終端機上等待", needs_reason_permission: "需要權限", needs_reason_dangerous_command: "危險指令待確認", needs_reason_login: "需要登入", needs_reason_dialog: "停在對話框", needs_reason_terminal_input: "可能在等輸入", needs_reason_auth_paused: "已暫停：需要登入", needs_reason_crashed: "已崩潰", needs_reason_delivery_uncertain: "無法確認是否送達", needs_reason_delivery_failed: "傳送失敗", needs_reason_task_review: "等你確認", needs_reason_task_blocked: "卡住，在問你",
+    needs_reason_hang: "沒有回應", needs_reason_exited: "已結束", needs_reason_assist: "在終端機上等待", needs_reason_permission: "需要權限", needs_reason_dangerous_command: "危險指令待確認", needs_reason_login: "需要登入", needs_reason_dialog: "停在對話框", needs_reason_terminal_input: "可能在等輸入", needs_reason_auth_paused: "已暫停：需要登入", needs_reason_backend_signin: "後端需要登入", needs_reason_crashed: "已崩潰", needs_reason_delivery_uncertain: "無法確認是否送達", needs_reason_delivery_failed: "傳送失敗", needs_reason_task_review: "等你確認", needs_reason_task_blocked: "卡住，在問你",
   },
 });

package/dist/ui/shared/app.css

@@ -1936,6 +1936,7 @@ html.oo-immersive .p-fleet > .panel-body { z-index: 50; }
 .us-bar { display: block; width: 100%; height: 6px; margin: 4px 0; }
 .us-bar-bg { fill: var(--surface-2); } .us-bar-fg { fill: var(--us-0); }
 .us-meta { display: block; font-size: var(--fs-xs); color: var(--text-3); overflow-wrap: anywhere; }
+.us-est { display: block; font-size: var(--fs-xs); font-weight: var(--fw-regular); color: var(--text-3); }
 .us-flags { display: flex; flex-wrap: wrap; gap: 4px; margin-top: 4px; }
 .us-trend, .us-heat { display: flex; flex-direction: column; gap: var(--s-2); min-width: 0; }
 .us-trend h3, .us-heat h3, .us-rest h3 { font-size: var(--fs-sm); font-weight: var(--fw-semibold); }

package/dist/ui/structured-signin.js

@@ -0,0 +1,115 @@
+/* Shared browser controls. No terminal relay, provider output or secrets in diagnostics. */
+const NAMES = { "kiro-cli": "Kiro", "claude-code": "Claude Code", codex: "Codex", antigravity: "Antigravity (console fallback)" };
+const CHOICES = { builder_id: "Builder ID", google: "Google", github: "GitHub", organization: "Your organization", subscription: "Claude subscription", console: "Anthropic Console" };
+const ERRORS = {
+  unsupported_prompt: "This CLI screen is not supported. Cancel and use the console fallback.",
+  cleanup_failed: "The login process could not be confirmed closed. Close it on the host and restart setup before retrying.",
+  signin_cleanup_failed: "The login process could not be confirmed closed. Close it on the host and restart setup before retrying.",
+  signin_action_stale: "That prompt changed or was already answered. Refresh its status; do not submit it again.",
+  signin_console_only: "This backend uses the explicit console fallback.",
+  backend_signin_local_only: "Backend sign-in is available only on this computer. Use the local setup page, or sign in later.",
+  signin_session_expired: "This setup session has ended. Reopen setup on the host.",
+  expired: "This login attempt expired. Start a new attempt.",
+  auth_unconfirmed: "The CLI exited, but credentials could not be verified. Retry or sign in later.",
+  provider_rejected: "The provider rejected this sign-in. Retry or sign in later.",
+};
+
+export function mountStructuredSignIns(root, { endpoint, fetcher = fetch, changed = () => {} } = {}) {
+  const doc = root.ownerDocument;
+  let view = null, busy = false, disposed = false, timer = null, generation = 0, message = "", rendered = "";
+  const el = (tag, text, parent = root) => { const node = doc.createElement(tag); if (text) node.textContent = text; parent.append(node); return node; };
+  const errorText = code => ERRORS[code] || "Could not complete sign-in. Check status, retry, or sign in later.";
+  const button = (parent, label, action) => { const b = el("button", label, parent); b.type = "button"; b.disabled = busy; b.onclick = action; return b; };
+  const request = async data => {
+    const response = await fetcher(endpoint, { method: data ? "POST" : "GET", cache: "no-store", headers: { "Content-Type": "application/json" }, ...(data ? { body: JSON.stringify(data) } : {}) });
+    const body = await response.json().catch(() => null);
+    if (!response.ok) throw new Error(body?.error || "signin_failed");
+    return body;
+  };
+  const accept = next => { view = next; root.dataset.ready = String(view.ready); changed(view); };
+  async function perform(data) {
+    if (busy || disposed) return;
+    busy = true; generation++; message = ""; render();
+    try { const next = await request(data); if (!disposed) accept(next); }
+    catch (error) { if (!disposed) message = errorText(error?.message); }
+    finally { busy = false; if (!disposed) render(); }
+  }
+  function render() {
+    const signature = JSON.stringify([view, busy, message]);
+    if (disposed || rendered === signature) return;
+    rendered = signature; root.replaceChildren();
+    el("h2", "Sign in your AI backends");
+    el("p", "Use the controls here; no terminal typing is needed for Kiro, Claude Code or Codex. You can sign in later from the dashboard.");
+    if (message) { const alert = el("p", message); alert.setAttribute("role", "alert"); }
+    if (!view) { button(root, "Check sign-ins", () => perform({ operation: "refresh" })); return; }
+    for (const backend of view.selected) {
+      const card = el("section"); card.dataset.backend = backend;
+      el("h3", NAMES[backend] || backend, card);
+      const state = view.states[backend], pending = view.pending.includes(backend), skipped = view.skipped.includes(backend);
+      el("p", skipped ? "Sign in later · remains in Needs you" : state === "valid" ? "Signed in ✓" : state === "not_installed" ? "Not installed on this host" : state === "console_only" ? "Use the explicit console fallback, or sign in later." : "Sign-in needed", card);
+      const login = view.login?.backend === backend ? view.login : null;
+      const active = login && login.phase !== "done" && !(login.phase === "failed" && login.reason);
+      if (active) {
+        el("p", login.phase === "waiting" || login.phase === "starting" ? "Waiting for the CLI…" : "Login: " + login.phase.replaceAll("_", " "), card);
+        if (login.phase === "method" && login.canAct) for (const choice of login.choices || []) {
+          if (CHOICES[choice]) button(card, CHOICES[choice], () => perform({ operation: "input", id: login.id, revision: login.revision, action: { kind: "method", choice } }));
+        }
+        if (login.url) {
+          // The host already allowlists these; still never turn a non-HTTPS URL into a link.
+          let url; try { url = new URL(login.url); } catch {}
+          if (url?.protocol === "https:" && !url.username && !url.password) {
+            const link = el("a", "Open provider sign-in", card); link.href = url.href; link.target = "_blank"; link.rel = "noopener noreferrer";
+          }
+        }
+        if (login.code) { el("p", "Device code:", card); el("code", login.code, card); }
+        if (login.canAct && ["code", "start_url", "region"].includes(login.phase)) {
+          const label = el("label", { code: "Paste the returned code", start_url: "Organization Start URL", region: "AWS region" }[login.phase], card);
+          const input = el("input", null, label); input.type = login.phase === "code" ? "password" : "text"; input.autocomplete = "off"; input.spellcheck = false;
+          input.setAttribute("aria-label", label.textContent); input.disabled = busy;
+          button(card, "Submit " + login.phase.replaceAll("_", " "), () => { const value = input.value; input.value = ""; void perform({ operation: "input", id: login.id, revision: login.revision, action: { kind: login.phase, value } }); });
+        }
+        if (["method", "code", "start_url", "region"].includes(login.phase) && !login.canAct) el("p", "Answer sent. Waiting for the next screen; it will not be sent twice.", card);
+        button(card, "Cancel sign-in", () => perform({ operation: "cancel" }));
+      } else {
+        if (login?.reason && login.reason !== "cancelled") el("p", errorText(login.reason), card);
+        const usable = !["antigravity"].includes(backend) && state !== "not_installed";
+        if (usable) button(card, state === "valid" ? "Sign in again" : "Sign in", () => {
+          const relogin = state === "valid";
+          if (relogin && !globalThis.confirm("Sign in again? Kiro will sign out its existing account first.")) return;
+          void perform({ operation: "start", backend, relogin });
+        });
+      }
+      if (pending && !skipped) button(card, "Sign in later", () => perform({ operation: "skip", backend }));
+    }
+    button(root, "Check sign-ins", () => perform({ operation: "refresh" }));
+    if (view.ready) el("p", "You can continue setup.");
+  }
+  async function poll() {
+    if (disposed) return;
+    const before = generation;
+    if (!busy) try { const next = await request(); if (!disposed && before === generation) { accept(next); render(); } }
+    catch (error) { if (!disposed && before === generation) { message = errorText(error?.message); render(); } }
+    if (!disposed) timer = setTimeout(poll, 1000);
+  }
+  render(); void poll();
+  return {
+    addBackends(backends) {
+      if (view && Array.isArray(backends) && backends.every(b => NAMES[b]) && backends.some(b => !view.selected.includes(b)))
+        return perform({ operation: "select", backends: [...new Set([...view.selected, ...backends])] });
+    },
+    addBackend(backend) { if (view && NAMES[backend] && !view.selected.includes(backend)) return perform({ operation: "select", backends: [...view.selected, backend] }); },
+    dispose() { disposed = true; generation++; clearTimeout(timer); root.replaceChildren(); },
+  };
+}
+
+const setupRoot = typeof document === "undefined" ? null : document.getElementById("setupSignins");
+if (setupRoot) {
+  const cards = mountStructuredSignIns(setupRoot, { endpoint: "setup/signins" });
+  const backend = document.getElementById("backend");
+  const select = () => cards.addBackend(backend?.value);
+  backend?.addEventListener("change", select);
+  const observer = new MutationObserver(select); if (backend) observer.observe(backend, { childList: true });
+  // Initial GET may finish after the environment list, so also observe our readiness result.
+  const ready = new MutationObserver(select); ready.observe(setupRoot, { attributes: true, attributeFilter: ["data-ready"] });
+  addEventListener("pagehide", () => { observer.disconnect(); ready.disconnect(); cards.dispose(); }, { once: true });
+}

package/dist/usage-report.d.ts

@@ -7,6 +7,9 @@
  * Honest by construction: an amount is "API-equivalent at list price (checked <date>) — not money spent"; an unpriced
  * model's tokens are shown and its amount is not; Codex's cache writes are "not reported" (every CLI seen records 0),
  * never priced as uncached; an instance whose backend AgEnD cannot measure is listed with its reason, never as $0.
+ * Kiro records no token counts: its rows are ESTIMATED from text size (kiro-usage.ts, design §10.2) and say so — on the
+ * row (`estimated`), on any total that includes one (`includes_estimates`, with the estimated part of the amount), in
+ * the API, on the page and in the CSV. An estimate never mixes silently into a measured number.
  */
 import type { Ledger } from "./cache-ledger.js";
 import { type UsageDays } from "./usage-rollup.js";
@@ -27,6 +30,12 @@ export declare const usageBasis: (checked?: string) => string;
  * latest whole days and says from which date (`dailyFrom`); the rows and totals always cover the whole range.
  */
 export declare const USAGE_DAILY_MAX = 20000;
+/** The backends whose usage is estimated, not measured (#2122 §10.2: Kiro records no token counts). */
+export declare const ESTIMATED_BACKENDS: ReadonlySet<string>;
+/** The backends whose transcripts report reasoning tokens (#2122 §10.3); elsewhere a 0 means not reported. */
+export declare const REPORTS_REASONING: ReadonlySet<string>;
+/** The backends whose transcripts carry a cache-write field that stays 0: "not reported" until a real write is seen. */
+export declare const WRITES_UNREPORTED: ReadonlySet<string>;
 export interface UsageInstanceInput {
     name: string;
     /** Its backend now: what it is collected with from here on (each slice of its history carries its own). */
@@ -63,7 +72,10 @@ export interface UsageInput {
 export interface UsageTotals {
     /** Uncached input. */
     input: number;
+    /** Output without its reasoning part — the units of tokscale's daily rows (design §10.3). */
     output: number;
+    /** The part of the output a CLI reports as reasoning (Codex); 0 where none is reported (Claude). */
+    reasoning: number;
     cacheRead: number;
     cacheWrite5m: number;
     cacheWrite1h: number;
@@ -73,6 +85,12 @@ export interface UsageTotals {
 }
 export interface UsageRow extends UsageTotals {
     key: string;
+    /** Whether any of it comes from a CLI that reports reasoning (REPORTS_REASONING): false → its 0 is "not reported". */
+    reasoningReported: boolean;
+    /** Some of it is estimated (ESTIMATED_BACKENDS); flagged "estimated" (a row) or "includes_estimates" (the totals). */
+    estimated: boolean;
+    /** The estimated part of `amount` (null: nothing estimated is priced). */
+    amountEstimated: number | null;
     total: number;
     /** Delivered messages; null where a message has no such key (by model, by profile). */
     messages: number | null;
@@ -92,6 +110,8 @@ export interface UsageRow extends UsageTotals {
 }
 export interface UsageDaily extends UsageTotals {
     date: string;
+    reasoningReported: boolean;
+    estimated: boolean;
     zone: string;
     instance: string;
     backend: string;

package/dist/usage-report.js

@@ -10,6 +10,12 @@ export const usageBasis = (checked = PRICES_CHECKED) => `API-equivalent at list
  */
 export const USAGE_DAILY_MAX = 20_000;
 const M = 1_000_000;
+/** The backends whose usage is estimated, not measured (#2122 §10.2: Kiro records no token counts). */
+export const ESTIMATED_BACKENDS = new Set(["kiro-cli"]);
+/** The backends whose transcripts report reasoning tokens (#2122 §10.3); elsewhere a 0 means not reported. */
+export const REPORTS_REASONING = new Set(["codex", "grok", "muse", "opencode", "antigravity"]);
+/** The backends whose transcripts carry a cache-write field that stays 0: "not reported" until a real write is seen. */
+export const WRITES_UNREPORTED = new Set(["codex", "muse"]);
 const DATE = /^\d{4}-\d{2}-\d{2}$/;
 /** A range as asked (query string or tool argument); anything else is the last 7 days. */
 export function usageRange(kind, from, to) {
@@ -31,19 +37,23 @@ export function rangeDates(range, now, zone) {
         case "custom": return { from: range.from, to: range.to };
     }
 }
-const zero = () => ({ input: 0, output: 0, cacheRead: 0, cacheWrite5m: 0, cacheWrite1h: 0, cacheWrite: 0, requests: 0 });
-const addTotals = (into, [n, uncached, read, w5, w1h, w, out]) => {
+const zero = () => ({ input: 0, output: 0, reasoning: 0, cacheRead: 0, cacheWrite5m: 0, cacheWrite1h: 0, cacheWrite: 0, requests: 0 });
+/** One slice into a row: `reasoning` is the part of the slice's output reported as reasoning (shown beside the rest). */
+const addTotals = (into, [n, uncached, read, w5, w1h, w, out], reasoning) => {
+    const r = Math.min(Math.max(0, reasoning), out);
     into.requests += n;
     into.input += uncached;
     into.cacheRead += read;
     into.cacheWrite5m += w5;
     into.cacheWrite1h += w1h;
     into.cacheWrite += w;
-    into.output += out;
+    into.output += out - r;
+    into.reasoning += r;
 };
 const splitKey = (mk) => { const bar = mk.lastIndexOf("|"); return { model: mk.slice(0, bar), long: mk.slice(bar + 1) === "1" }; };
 /**
- * The list-price amount of one slice, or null when its model is not in the table. Codex writes not reported are 0 in the
+ * The list-price amount of one slice, or null when its model is not in the table. Reasoning is a part of the slice's
+ * output, so the whole output is priced at the output rate once. Codex writes not reported are 0 in the
  * ledger (it marks writesSeen on the first one above 0), so they add nothing and are never priced as uncached input.
  */
 function amountOf(model, long, [, uncached, read, w5, w1h, w, out]) {
@@ -52,6 +62,7 @@ function amountOf(model, long, [, uncached, read, w5, w1h, w, out]) {
         return null;
     return (uncached * r.input + read * r.read + w5 * r.write5m + w1h * r.write1h + w * r.write + out * r.output) / M;
 }
+const estimatedSlice = (s) => ESTIMATED_BACKENDS.has(s.backend);
 const unknownSource = (s) => s.backend === "unknown" || s.profile === "unknown";
 export function buildUsageReport(input) {
     const { from, to } = rangeDates(input.range, input.now, input.zone);
@@ -70,14 +81,14 @@ export function buildUsageReport(input) {
         if (!i.ledger || !i.days)
             continue;
         coverage.push({ name: i.name, intervals: i.days.coverage.map(([a, b]) => [a, b]) });
-        // Codex: a write is reported only once a real one has been seen (every CLI so far records 0).
+        // Codex and Muse: a write is reported only once a real one has been seen (every CLI so far records 0).
         const writesSeen = i.ledger.writesSeen === true;
         const base = { instance: i.name, team: i.team };
         for (const row of i.days.rows) {
             if (!inRange(row.date))
                 continue;
             for (const [mk, tot] of Object.entries(row.m))
-                slices.push({ ...base, backend: row.be, writesReported: row.be !== "codex" || writesSeen, date: row.date, zone: row.zone, profile: row.pf, ...splitKey(mk), tot });
+                slices.push({ ...base, backend: row.be, writesReported: !WRITES_UNREPORTED.has(row.be) || writesSeen, date: row.date, zone: row.zone, profile: row.pf, ...splitKey(mk), tot, reasoning: row.r?.[mk] ?? 0, cost: row.c?.[mk] ?? 0 });
         }
         for (const [hk, hour] of Object.entries(i.ledger.hours)) {
             const h = Number(hk);
@@ -88,7 +99,7 @@ export function buildUsageReport(input) {
                 continue;
             for (const src of hourSources(hour)) {
                 for (const [mk, tot] of Object.entries(src.m))
-                    slices.push({ ...base, backend: src.backend, writesReported: src.backend !== "codex" || writesSeen, date, zone: input.zone, profile: src.profile, ...splitKey(mk), tot });
+                    slices.push({ ...base, backend: src.backend, writesReported: !WRITES_UNREPORTED.has(src.backend) || writesSeen, date, zone: input.zone, profile: src.profile, ...splitKey(mk), tot, reasoning: src.r[mk] ?? 0, cost: src.c[mk] ?? 0 });
             }
         }
     }
@@ -102,7 +113,7 @@ export function buildUsageReport(input) {
         }
     };
     const rows = new Map();
-    const newRow = (key) => ({ key, ...zero(), total: 0, messages: null, amount: null, priced: "none", flags: [], unpriced: [], instances: [], backends: [], models: [], profiles: [], _amount: 0, _pricedAny: false, _unpricedAny: false });
+    const newRow = (key) => ({ key, ...zero(), reasoningReported: false, estimated: false, amountEstimated: null, _estAmount: 0, _estPriced: false, total: 0, messages: null, amount: null, priced: "none", flags: [], unpriced: [], instances: [], backends: [], models: [], profiles: [], _amount: 0, _pricedAny: false, _unpricedAny: false });
     const uniq = (list, v) => { if (!list.includes(v))
         list.push(v); };
     // Daily rows: one per day, zone, agent, backend, model, tier and profile (an hour's slices summed into their day).
@@ -110,12 +121,18 @@ export function buildUsageReport(input) {
     for (const s of slices) {
         const key = keyOf(s);
         const row = rows.get(key) ?? (rows.set(key, newRow(key)), rows.get(key));
-        addTotals(row, s.tot);
+        addTotals(row, s.tot, s.reasoning);
+        if (REPORTS_REASONING.has(s.backend))
+            row.reasoningReported = true;
         uniq(row.instances, s.instance);
         uniq(row.backends, s.backend);
         uniq(row.models, s.model);
         uniq(row.profiles, s.profile);
-        const amount = amountOf(s.model, s.long, s.tot);
+        // List price first; a model the table lacks takes the cost its CLI reported (Grok), said so (design §10.2).
+        const listed = amountOf(s.model, s.long, s.tot), reported = listed === null && s.cost > 0;
+        const amount = listed ?? (reported ? s.cost : null);
+        if (reported)
+            uniq(row.flags, "cost_reported");
         if (amount === null) {
             row._unpricedAny = true;
             uniq(row.unpriced, s.model);
@@ -124,6 +141,14 @@ export function buildUsageReport(input) {
             row._pricedAny = true;
             row._amount += amount;
         }
+        if (estimatedSlice(s)) {
+            row.estimated = true;
+            uniq(row.flags, "estimated");
+            if (amount !== null) {
+                row._estPriced = true;
+                row._estAmount += amount;
+            }
+        }
         if (!s.writesReported)
             uniq(row.flags, "cache_write_not_reported");
         if (unknownSource(s))
@@ -132,11 +157,13 @@ export function buildUsageReport(input) {
         const dk = [s.date, s.zone, s.instance, s.backend, s.model, tier, s.profile].join("\u0000");
         let d = dailyBy.get(dk);
         if (!d) {
-            d = { date: s.date, zone: s.zone, instance: s.instance, backend: s.backend, model: s.model, tier, profile: s.profile, ...zero(), amount: amount === null ? null : 0,
-                flags: [...(s.writesReported ? [] : ["cache_write_not_reported"]), ...(amount === null ? ["not_priced"] : []), ...(unknownSource(s) ? ["source_unknown"] : [])] };
+            d = { date: s.date, zone: s.zone, instance: s.instance, backend: s.backend, model: s.model, tier, profile: s.profile, ...zero(), reasoningReported: REPORTS_REASONING.has(s.backend), estimated: estimatedSlice(s), amount: amount === null ? null : 0,
+                flags: [...(estimatedSlice(s) ? ["estimated"] : []), ...(s.writesReported ? [] : ["cache_write_not_reported"]), ...(amount === null ? ["not_priced"] : []), ...(unknownSource(s) ? ["source_unknown"] : [])] };
             dailyBy.set(dk, d);
         }
-        addTotals(d, s.tot);
+        addTotals(d, s.tot, s.reasoning);
+        if (reported && !d.flags.includes("cost_reported"))
+            d.flags.push("cost_reported");
         if (amount !== null && d.amount !== null)
             d.amount += amount;
     }
@@ -188,8 +215,9 @@ export function buildUsageReport(input) {
             row.messages ??= 0;
     }
     const finish = (row) => {
-        const { _amount, _pricedAny, _unpricedAny, ...rest } = row;
-        rest.total = rest.input + rest.output + rest.cacheRead + rest.cacheWrite5m + rest.cacheWrite1h + rest.cacheWrite;
+        const { _amount, _pricedAny, _unpricedAny, _estAmount, _estPriced, ...rest } = row;
+        rest.amountEstimated = _estPriced ? _estAmount : null;
+        rest.total = rest.input + rest.output + rest.reasoning + rest.cacheRead + rest.cacheWrite5m + rest.cacheWrite1h + rest.cacheWrite;
         rest.amount = _pricedAny ? _amount : null;
         rest.priced = _pricedAny ? (_unpricedAny ? "partial" : "all") : "none";
         if (_unpricedAny)
@@ -200,15 +228,24 @@ export function buildUsageReport(input) {
         .sort((a, b) => (b.amount ?? -1) - (a.amount ?? -1) || b.total - a.total || a.key.localeCompare(b.key));
     const totals = finish(newRow("all"));
     for (const r of out) {
-        for (const k of ["input", "output", "cacheRead", "cacheWrite5m", "cacheWrite1h", "cacheWrite", "requests"])
+        for (const k of ["input", "output", "reasoning", "cacheRead", "cacheWrite5m", "cacheWrite1h", "cacheWrite", "requests"])
             totals[k] += r[k];
         totals.total += r.total;
         if (r.messages !== null)
             totals.messages = (totals.messages ?? 0) + r.messages;
         if (r.amount !== null)
             totals.amount = (totals.amount ?? 0) + r.amount;
+        if (r.reasoningReported)
+            totals.reasoningReported = true;
+        if (r.estimated) {
+            totals.estimated = true;
+            uniq(totals.flags, "includes_estimates");
+        }
+        if (r.amountEstimated !== null)
+            totals.amountEstimated = (totals.amountEstimated ?? 0) + r.amountEstimated;
         for (const f of r.flags)
-            uniq(totals.flags, f);
+            if (f !== "estimated")
+                uniq(totals.flags, f);
         for (const m of r.unpriced)
             uniq(totals.unpriced, m);
     }