diff --git a/src/js/api.js b/src/js/api.js
index cd44553..6729085 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -310,7 +310,7 @@ const API = {
adminCreateUser(username, email, password, role) {
return this._post('/api/v1/admin/users', { username, email, password, role });
},
- adminResetPassword(id, pw) { return this._post(`/api/v1/admin/users/${id}/reset-password`, { new_password: pw }); },
+ adminResetPassword(id, pw) { return this._post(`/api/v1/admin/users/${id}/reset-password`, { password: pw }); },
adminUpdateRole(id, role) { return this._put(`/api/v1/admin/users/${id}/role`, { role }); },
adminToggleActive(id, active, teamIds, teamRole) {
const body = { is_active: active };
@@ -433,6 +433,60 @@ const API = {
searchNotes(query, limit = 20) { return this._get(`/api/v1/notes/search?q=${encodeURIComponent(query)}&limit=${limit}`); },
listNoteFolders() { return this._get('/api/v1/notes/folders'); },
+ // ── Admin Roles ─────────────────────────
+ adminListRoles() { return this._get('/api/v1/admin/roles'); },
+ adminGetRole(role) { return this._get(`/api/v1/admin/roles/${role}`); },
+ adminUpdateRole(role, config) { return this._put(`/api/v1/admin/roles/${role}`, config); },
+ adminTestRole(role) { return this._post(`/api/v1/admin/roles/${role}/test`, {}); },
+
+ // ── Admin Usage & Pricing ───────────────
+ adminGetUsage(params) {
+ const q = new URLSearchParams();
+ if (params?.period) q.set('period', params.period);
+ if (params?.since) q.set('since', params.since);
+ if (params?.until) q.set('until', params.until);
+ if (params?.group_by) q.set('group_by', params.group_by);
+ return this._get(`/api/v1/admin/usage?${q}`);
+ },
+ adminGetUserUsage(userId, params) {
+ const q = new URLSearchParams();
+ if (params?.period) q.set('period', params.period);
+ if (params?.group_by) q.set('group_by', params.group_by);
+ return this._get(`/api/v1/admin/usage/users/${userId}?${q}`);
+ },
+ adminGetTeamUsage(teamId, params) {
+ const q = new URLSearchParams();
+ if (params?.period) q.set('period', params.period);
+ if (params?.group_by) q.set('group_by', params.group_by);
+ return this._get(`/api/v1/admin/usage/teams/${teamId}?${q}`);
+ },
+ adminListPricing() { return this._get('/api/v1/admin/pricing'); },
+ adminUpsertPricing(entry) { return this._put('/api/v1/admin/pricing', entry); },
+ adminDeletePricing(providerConfigId, modelId) {
+ return this._del(`/api/v1/admin/pricing/${providerConfigId}/${encodeURIComponent(modelId)}`);
+ },
+
+ // ── User Usage ──────────────────────────
+ getMyUsage(params) {
+ const q = new URLSearchParams();
+ if (params?.period) q.set('period', params.period);
+ if (params?.group_by) q.set('group_by', params.group_by);
+ return this._get(`/api/v1/usage?${q}`);
+ },
+
+ // ── Team Roles ──────────────────────────
+ teamListRoles(teamId) { return this._get(`/api/v1/teams/${teamId}/roles`); },
+ teamUpdateRole(teamId, role, config) { return this._put(`/api/v1/teams/${teamId}/roles/${role}`, config); },
+ teamDeleteRole(teamId, role) { return this._del(`/api/v1/teams/${teamId}/roles/${role}`); },
+
+ // ── Team Usage ──────────────────────────
+ teamGetUsage(teamId, params) {
+ const q = new URLSearchParams();
+ if (params?.period) q.set('period', params.period);
+ if (params?.group_by) q.set('group_by', params.group_by);
+ return this._get(`/api/v1/teams/${teamId}/usage?${q}`);
+ },
+
// ── HTTP Internals ───────────────────────
_esc(s) {
diff --git a/src/js/app.js b/src/js/app.js
index 08a1ecf..746bb9f 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -1381,6 +1381,11 @@ function initListeners() {
document.getElementById('auditPrevBtn')?.addEventListener('click', () => { if (UI._auditPage > 1) UI.loadAuditLog(UI._auditPage - 1); });
document.getElementById('auditNextBtn')?.addEventListener('click', () => UI.loadAuditLog(UI._auditPage + 1));
+ // Admin — usage
+ document.getElementById('usageRefreshBtn')?.addEventListener('click', () => UI.loadAdminUsage());
+ document.getElementById('usagePeriod')?.addEventListener('change', () => UI.loadAdminUsage());
+ document.getElementById('usageGroupBy')?.addEventListener('change', () => UI.loadAdminUsage());
+
// Input
const input = document.getElementById('messageInput');
input.addEventListener('keydown', (e) => {
@@ -1807,6 +1812,23 @@ async function createAdminUser() {
} catch (e) { UI.toast(e.message, 'error'); }
}
+async function adminResetUserPassword(id, username) {
+ const pw = prompt(
+ `Reset password for "${username}"?\n\n` +
+ `⚠️ WARNING: This will DESTROY the user's personal vault.\n` +
+ `All personal API keys (BYOK) will be permanently deleted.\n` +
+ `The user will need to re-add any personal provider keys.\n\n` +
+ `Enter new password (min 8 chars):`
+ );
+ if (!pw) return;
+ if (pw.length < 8) { UI.toast('Password must be at least 8 characters', 'warning'); return; }
+ if (!confirm(`Final confirmation: Reset password AND destroy personal vault for "${username}"?`)) return;
+ try {
+ await API.adminResetPassword(id, pw);
+ UI.toast(`Password reset for ${username}. Vault destroyed.`, 'success');
+ } catch (e) { UI.toast(e.message, 'error'); }
+}
+
async function deleteGlobalProvider(id) {
if (!confirm('Delete this global provider?')) return;
try { await API.adminDeleteGlobalConfig(id); UI.toast('Provider deleted', 'success'); await UI.loadAdminProviders(); }
@@ -1905,6 +1927,59 @@ async function bulkSetVisibility(visibility) {
} catch (e) { UI.toast(e.message, 'error'); hint.textContent = 'Failed'; }
}
+// ── Admin Roles ────────────────────────────
+
+async function adminRoleProviderChanged(role, slot) {
+ const provId = document.getElementById(`role-${role}-${slot}-provider`)?.value;
+ const modelSelect = document.getElementById(`role-${role}-${slot}-model`);
+ if (!modelSelect) return;
+
+ modelSelect.innerHTML = '
';
+ if (!provId || !window._adminModelList) return;
+
+ const models = window._adminModelList.filter(m => m.provider_config_id === provId);
+ models.forEach(m => {
+ const opt = document.createElement('option');
+ opt.value = m.model_id;
+ opt.textContent = m.display_name || m.model_id;
+ modelSelect.appendChild(opt);
+ });
+}
+
+async function adminSaveRole(role) {
+ const status = document.getElementById(`role-${role}-status`);
+ try {
+ const getBinding = (slot) => {
+ const prov = document.getElementById(`role-${role}-${slot}-provider`)?.value;
+ const model = document.getElementById(`role-${role}-${slot}-model`)?.value;
+ return (prov && model) ? { provider_config_id: prov, model_id: model } : null;
+ };
+ await API.adminUpdateRole(role, {
+ primary: getBinding('primary'),
+ fallback: getBinding('fallback')
+ });
+ if (status) { status.textContent = '✓ Saved'; status.style.color = 'var(--success)'; }
+ setTimeout(() => { if (status) status.textContent = ''; }, 3000);
+ } catch (e) {
+ if (status) { status.textContent = '✗ ' + e.message; status.style.color = 'var(--error)'; }
+ }
+}
+
+async function adminTestRole(role) {
+ const status = document.getElementById(`role-${role}-status`);
+ if (status) { status.textContent = 'Testing...'; status.style.color = 'var(--text-muted)'; }
+ try {
+ const result = await API.adminTestRole(role);
+ if (status) {
+ const fb = result.used_fallback ? ' (fallback)' : '';
+ status.textContent = `✓ ${result.model}${fb}`;
+ status.style.color = 'var(--success)';
+ }
+ } catch (e) {
+ if (status) { status.textContent = '✗ ' + e.message; status.style.color = 'var(--error)'; }
+ }
+}
+
// ── User Model Preferences ──────────────────
async function toggleUserModelVisibility(modelId, currentlyHidden) {
diff --git a/src/js/ui.js b/src/js/ui.js
index 5f107ed..0c75e5d 100644
--- a/src/js/ui.js
+++ b/src/js/ui.js
@@ -843,6 +843,7 @@ const UI = {
UI.checkUserProvidersAllowed();
}
if (tab === 'models') { UI.loadUserModels(); UI.loadUserPresets(); UI.checkUserPresetsAllowed(); }
+ if (tab === 'usage') UI.loadMyUsage();
if (tab === 'appearance') UI.loadAppearanceSettings();
if (tab === 'teams') UI.loadTeamsTab();
},
@@ -1000,6 +1001,7 @@ const UI = {
UI.loadTeamManageMembers(teamId),
UI.loadTeamManageProviders(teamId),
UI.loadTeamManagePresets(teamId),
+ UI.loadTeamUsage(),
UI.loadTeamAuditLog(1),
]);
},
@@ -1083,6 +1085,111 @@ const UI = {
} catch (e) { el.innerHTML = `
${esc(e.message)}
`; }
},
+ async loadMyUsage() {
+ const totalsEl = document.getElementById('myUsageTotals');
+ const resultsEl = document.getElementById('myUsageResults');
+ if (!totalsEl) return;
+
+ const period = document.getElementById('myUsagePeriod')?.value || '30d';
+ const groupBy = document.getElementById('myUsageGroupBy')?.value || 'model';
+
+ totalsEl.innerHTML = '
Loading...
';
+ resultsEl.innerHTML = '';
+
+ try {
+ const data = await API.getMyUsage({ period, group_by: groupBy });
+ const t = data.totals || {};
+
+ if (!t.requests) {
+ totalsEl.innerHTML = '
No usage recorded in this period
';
+ return;
+ }
+
+ totalsEl.innerHTML = `
+
+
${(t.requests || 0).toLocaleString()}
Requests
+
${(t.input_tokens || 0).toLocaleString()}
Input
+
${(t.output_tokens || 0).toLocaleString()}
Output
+
$${(t.total_cost || 0).toFixed(4)}
Est. Cost
+
`;
+
+ const results = data.results || [];
+ if (results.length > 0) {
+ resultsEl.innerHTML = `
+
+
+ | ${groupBy === 'day' ? 'Date' : 'Model'} |
+ Reqs |
+ Input |
+ Output |
+ Cost |
+
+ ${results.map(r => `
+ | ${esc(r.label || r.group_key)} |
+ ${(r.requests || 0).toLocaleString()} |
+ ${(r.input_tokens || 0).toLocaleString()} |
+ ${(r.output_tokens || 0).toLocaleString()} |
+ $${(r.total_cost || 0).toFixed(4)} |
+
`).join('')}
+
`;
+ }
+ } catch (e) { totalsEl.innerHTML = `
${esc(e.message)}
`; }
+ },
+
+ async loadTeamUsage() {
+ const teamId = UI._managingTeamId;
+ if (!teamId) return;
+
+ const totalsEl = document.getElementById('settingsTeamUsageTotals');
+ const resultsEl = document.getElementById('settingsTeamUsageResults');
+ if (!totalsEl) return;
+
+ const period = document.getElementById('teamUsagePeriod')?.value || '30d';
+ const groupBy = document.getElementById('teamUsageGroupBy')?.value || 'model';
+
+ totalsEl.innerHTML = '
Loading...
';
+ resultsEl.innerHTML = '';
+
+ try {
+ const data = await API.teamGetUsage(teamId, { period, group_by: groupBy });
+ const t = data.totals || {};
+
+ if (!t.requests) {
+ totalsEl.innerHTML = '
No usage recorded for team providers in this period
';
+ return;
+ }
+
+ totalsEl.innerHTML = `
+
+
${(t.requests || 0).toLocaleString()}
Requests
+
${(t.input_tokens || 0).toLocaleString()}
Input
+
${(t.output_tokens || 0).toLocaleString()}
Output
+
$${(t.total_cost || 0).toFixed(4)}
Est. Cost
+
`;
+
+ const results = data.results || [];
+ if (results.length > 0) {
+ resultsEl.innerHTML = `
+
+
+ | ${groupBy === 'day' ? 'Date' : groupBy === 'user' ? 'User' : 'Model'} |
+ Reqs |
+ Input |
+ Output |
+ Cost |
+
+ ${results.map(r => `
+ | ${esc(r.label || r.group_key)} |
+ ${(r.requests || 0).toLocaleString()} |
+ ${(r.input_tokens || 0).toLocaleString()} |
+ ${(r.output_tokens || 0).toLocaleString()} |
+ $${(r.total_cost || 0).toFixed(4)} |
+
`).join('')}
+
`;
+ }
+ } catch (e) { totalsEl.innerHTML = `
${esc(e.message)}
`; }
+ },
+
_teamAuditPage: 1,
_teamAuditPerPage: 20,
@@ -1253,6 +1360,8 @@ const UI = {
if (tab === 'presets') await this.loadAdminPresets();
if (tab === 'teams') await this.loadAdminTeams();
if (tab === 'settings') await this.loadAdminSettings();
+ if (tab === 'roles') await this.loadAdminRoles();
+ if (tab === 'usage') await this.loadAdminUsage();
},
async loadAdminUsers(quiet) {
@@ -1280,6 +1389,7 @@ const UI = {
: `
`
}
+