@xuda.io/account_module 1.2.2311 → 1.2.2312

package/index.mjs

@@ -7839,9 +7839,11 @@ const _list_owner_members = async function (owner_uid, profiles) {
       const acc = await db_module.get_couch_doc_native('xuda_accounts', u);
       const ai = acc?.account_info || {};
       const name = ai.account_type === 'business' ? ai.business_name || 'Member' : `${ai.first_name || ''} ${ai.last_name || ''}`.trim() || ai.email || 'Member';
-      out.push({ uid: u, name });
+      // owner is reported (UI-163) so the member card can say so without the
+      // dashboard having to infer it from the order of this list.
+      out.push({ uid: u, name, owner: u === owner_uid });
     } catch (e) {
-      out.push({ uid: u, name: 'Member' });
+      out.push({ uid: u, name: 'Member', owner: u === owner_uid });
     }
   }
   return out;
@@ -7882,7 +7884,139 @@ export const get_credit_management = async function (req) {
     const profiles = await _list_owner_profiles(uid, app_id, account_doc?.account_profile_id);
     const members = await _list_owner_members(uid, profiles);
 
-    return { code: 1, data: { rules, can_edit, plan, entitlements, usage_breakdown, model_catalog, profiles, members } };
+    // main_profile_id is reported (UI-163) so the spend chart can name the
+    // owner's own profile: it is deliberately absent from `profiles` (no member
+    // to scope a rule to), and without the id its spend can only be labelled
+    // "some other profile".
+    return { code: 1, data: { rules, can_edit, plan, entitlements, usage_breakdown, model_catalog, profiles, members, main_profile_id: account_doc?.account_profile_id || '' } };
+  } catch (err) {
+    return { code: -1, data: err.message };
+  }
+};
+
+/////////////////////////////////////////////////////////////////////////
+// USAGE HISTORY (UI-163)
+//
+// The drill-down behind the "N credits used" line on a profile or member card:
+// day by day spend, which models it went on, and the calls themselves. It reads
+// the same raw ai_usage docs _get_scoped_usage aggregates, and calibrates them
+// the same way, so a card's total and its history cannot tell two stories.
+//
+// Calibration: raw token cost is not the credit unit the ledger reports, so the
+// scan also covers the CURRENT PERIOD and the two totals give the conversion
+// factor (authoritative period spend / raw period cost). That is a unit
+// conversion, so it holds for any window inside the scan.
+/////////////////////////////////////////////////////////////////////////
+const _CREDIT_HISTORY_MAX_DOCS = 20000;
+const _CREDIT_HISTORY_MAX_DAYS = 180;
+const _CREDIT_HISTORY_SCAN_DAYS = 120;
+const _DAY_MS = 86400000;
+const _utc_day = function (ts) {
+  return new Date(ts).toISOString().slice(0, 10);
+};
+const _raw_usage_cost = function (doc) {
+  const c = doc?.cost || { input: 1, output: 1 };
+  return ((Number(doc?.input_tokens) || 0) * (Number(c.input) || 0) + (Number(doc?.output_tokens) || 0) * (Number(c.output) || 0)) / 1e6;
+};
+
+export const get_credit_usage_history = async function (req) {
+  try {
+    const uid = req?.uid || req?.token_ret?.data?.uid;
+    if (!uid) return { code: -1, data: 'not authorized' };
+
+    const scope = ['profile', 'user'].includes(req?.scope) ? req.scope : 'account';
+    const id = typeof req?.id === 'string' ? req.id : '';
+    if (scope !== 'account' && !id) return { code: -1, data: 'id is required for a profile or member history' };
+
+    let days = Math.round(Number(req?.days) || 30);
+    if (!(days >= 1)) days = 30;
+    days = Math.min(_CREDIT_HISTORY_MAX_DAYS, days);
+
+    const account_doc = await db_module.get_couch_doc_native('xuda_accounts', uid);
+    const period = _current_credit_period(account_doc);
+
+    // UTC day buckets, so the series is the same series wherever it is read.
+    const today_start = Math.floor(Date.now() / _DAY_MS) * _DAY_MS;
+    const window_from = today_start - (days - 1) * _DAY_MS;
+    // Reach back to the period start even when the window is shorter (the factor
+    // needs it), but never further than the scan bound: a yearly period must not
+    // turn one drill-down into a full-history scan.
+    const scan_from = Math.max(Math.min(window_from, period.start), today_start - _CREDIT_HISTORY_SCAN_DAYS * _DAY_MS);
+
+    // ignore_warning=true: same nested selector as _get_scoped_usage, and the
+    // same index note applies (an index on account_profile_info.uid before any
+    // prod rollout).
+    const raw = await db_module.find_couch_query(
+      'xuda_usage',
+      {
+        selector: { docType: 'ai_usage', 'account_profile_info.uid': uid, date_created_ts: { $gte: scan_from } },
+        fields: ['date_created_ts', 'uid', 'model', 'source', 'prompt', 'input_tokens', 'output_tokens', 'cost', 'account_profile_info.account_profile_id'],
+        limit: _CREDIT_HISTORY_MAX_DOCS,
+      },
+      true,
+    );
+    const docs = raw?.docs || [];
+
+    let raw_period_total = 0;
+    for (const d of docs) if ((Number(d.date_created_ts) || 0) >= period.start) raw_period_total += _raw_usage_cost(d);
+    const su = await _get_scoped_usage(uid, false);
+    const factor = raw_period_total > 0 && su.total > 0 ? su.total / raw_period_total : 1;
+
+    const in_scope = function (d) {
+      if (scope === 'profile') return d?.account_profile_info?.account_profile_id === id;
+      if (scope === 'user') return d?.uid === id;
+      return true;
+    };
+
+    const series = {};
+    for (let t = window_from; t <= today_start; t += _DAY_MS) series[_utc_day(t)] = 0;
+
+    const by_model = {};
+    const events = [];
+    let total = 0;
+    for (const d of docs) {
+      const ts = Number(d.date_created_ts) || 0;
+      if (ts < window_from || !in_scope(d)) continue;
+      const credits = _raw_usage_cost(d) * factor;
+      total += credits;
+      const day = _utc_day(ts);
+      if (day in series) series[day] += credits;
+      const code = _conf.ai_model_aliases?.[d.model] || d.model || 'unknown';
+      by_model[code] = (by_model[code] || 0) + credits;
+      events.push({
+        ts,
+        credits,
+        model: code,
+        model_name: _conf.ai_models?.[code]?.name || d.model || code,
+        source: d.source || 'other',
+        uid: d.uid || '',
+        account_profile_id: d?.account_profile_info?.account_profile_id || '',
+        prompt: typeof d.prompt === 'string' ? d.prompt : '',
+      });
+    }
+    events.sort((a, b) => b.ts - a.ts);
+
+    const r2 = (n) => Math.round(n * 100) / 100;
+    return {
+      code: 1,
+      data: {
+        scope,
+        id,
+        days,
+        total: r2(total),
+        calls: events.length,
+        // The scan is capped, so say so rather than quietly reporting a partial
+        // history as the whole of it.
+        truncated: docs.length >= _CREDIT_HISTORY_MAX_DOCS,
+        series: Object.keys(series)
+          .sort()
+          .map((day) => ({ day, credits: r2(series[day]) })),
+        by_model: Object.entries(by_model)
+          .map(([code, credits]) => ({ code, name: _conf.ai_models?.[code]?.name || code, credits: r2(credits) }))
+          .sort((a, b) => b.credits - a.credits),
+        events: events.slice(0, 60).map((e) => ({ ...e, credits: Math.round(e.credits * 10000) / 10000 })),
+      },
+    };
   } catch (err) {
     return { code: -1, data: err.message };
   }
@@ -9156,7 +9290,10 @@ const _newsletter_blast = async (issue, by_uid) => {
   } catch (e) {
     console.error('[newsletter] finalize failed:', e.message);
   }
-  _ops_notify_ops(`Newsletter #${issue.issue_number} published`, [['Issue', '#' + issue.issue_number], ['Sent', sent], ['Failed', failed], ['Recipients', total]], 'NL-DONE-' + issue.issue_number);
+  // No ops notification on completion: the "Publishing newsletter #N" alert
+  // already announces the blast, and the result lands on the issue doc
+  // (sent.count / sent.failed) plus the log line below.
+  console.log(`[newsletter] #${issue.issue_number} published: sent=${sent} failed=${failed} recipients=${total}`);
 };
 
 export const newsletter_publish = async function (req = {}) {

package/index_ms.mjs

@@ -541,6 +541,10 @@ export const get_credit_management = async function (...args) {
   return await broker.send_to_queue("get_credit_management", ...args);
 };
 
+export const get_credit_usage_history = async function (...args) {
+  return await broker.send_to_queue("get_credit_usage_history", ...args);
+};
+
 export const set_credit_rules = async function (...args) {
   return await broker.send_to_queue("set_credit_rules", ...args);
 };

package/index_msa.mjs

@@ -541,6 +541,10 @@ export const get_credit_management =  function (...args) {
    broker.send_to_queue_async("get_credit_management", ...args);
 };
 
+export const get_credit_usage_history =  function (...args) {
+   broker.send_to_queue_async("get_credit_usage_history", ...args);
+};
+
 export const set_credit_rules =  function (...args) {
    broker.send_to_queue_async("set_credit_rules", ...args);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.2311",
+  "version": "1.2.2312",
   "description": "Xuda Account Server Module",
   "main": "index.mjs",
   "dependencies": {