@agenticmail/enterprise 0.5.299 → 0.5.301

package/src/admin/routes.ts

@@ -2181,16 +2181,16 @@ export function createAdminRoutes(db: DatabaseAdapter) {
       const isPostgres = (db as any).pool;
       if (isPostgres) {
         await (db as any)._query(
-          `INSERT INTO client_organizations (id, name, slug, contact_name, contact_email, description) VALUES ($1, $2, $3, $4, $5, $6)`,
-          [id, body.name, body.slug, body.contact_name || null, body.contact_email || null, body.description || null]
+          `INSERT INTO client_organizations (id, name, slug, contact_name, contact_email, description, billing_rate_per_agent, currency) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,
+          [id, body.name, body.slug, body.contact_name || null, body.contact_email || null, body.description || null, body.billing_rate_per_agent || 0, body.currency || 'USD']
         );
         const { rows } = await (db as any)._query(`SELECT * FROM client_organizations WHERE id = $1`, [id]);
         return c.json(rows[0], 201);
       } else {
         const engineDb = db.getEngineDB();
         await engineDb!.run(
-          `INSERT INTO client_organizations (id, name, slug, contact_name, contact_email, description) VALUES (?, ?, ?, ?, ?, ?)`,
-          [id, body.name, body.slug, body.contact_name || null, body.contact_email || null, body.description || null]
+          `INSERT INTO client_organizations (id, name, slug, contact_name, contact_email, description, billing_rate_per_agent, currency) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
+          [id, body.name, body.slug, body.contact_name || null, body.contact_email || null, body.description || null, body.billing_rate_per_agent || 0, body.currency || 'USD']
         );
         const row = await engineDb!.get(`SELECT * FROM client_organizations WHERE id = ?`, [id]);
         return c.json(row, 201);
@@ -2236,7 +2236,7 @@ export function createAdminRoutes(db: DatabaseAdapter) {
       const values: any[] = [];
       const isPostgres = (db as any).pool;
       let idx = 1;
-      for (const key of ['name', 'contact_name', 'contact_email', 'description']) {
+      for (const key of ['name', 'contact_name', 'contact_email', 'description', 'billing_rate_per_agent', 'currency']) {
         if (body[key] !== undefined) {
           fields.push(isPostgres ? `${key} = $${idx++}` : `${key} = ?`);
           values.push(body[key]);
@@ -2393,6 +2393,95 @@ export function createAdminRoutes(db: DatabaseAdapter) {
     }
   });
 
+  // ─── Organization Billing ────────────────────────────
+
+  api.get('/organizations/:id/billing', requireRole('admin'), async (c) => {
+    const orgId = c.req.param('id');
+    const months = parseInt(c.req.query('months') || '12');
+    try {
+      const isPostgres = (db as any).pool;
+      let records: any[];
+      if (isPostgres) {
+        const { rows } = await (db as any)._query(
+          `SELECT * FROM org_billing_records WHERE org_id = $1 ORDER BY month DESC LIMIT $2`,
+          [orgId, months]
+        );
+        records = rows;
+      } else {
+        records = await db.getEngineDB()!.all(
+          `SELECT * FROM org_billing_records WHERE org_id = ? ORDER BY month DESC LIMIT ?`,
+          [orgId, months]
+        );
+      }
+      return c.json({ records });
+    } catch (e: any) {
+      return c.json({ error: e.message }, 500);
+    }
+  });
+
+  api.put('/organizations/:id/billing', requireRole('admin'), async (c) => {
+    const orgId = c.req.param('id');
+    const { records } = await c.req.json();
+    if (!Array.isArray(records)) return c.json({ error: 'records must be an array' }, 400);
+    try {
+      const isPostgres = (db as any).pool;
+      const { randomUUID } = await import('crypto');
+      for (const r of records) {
+        if (!r.month) continue;
+        if (isPostgres) {
+          await (db as any)._query(
+            `INSERT INTO org_billing_records (id, org_id, agent_id, month, revenue, token_cost, input_tokens, output_tokens, notes)
+             VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+             ON CONFLICT (org_id, agent_id, month) DO UPDATE SET
+               revenue = EXCLUDED.revenue, token_cost = EXCLUDED.token_cost,
+               input_tokens = EXCLUDED.input_tokens, output_tokens = EXCLUDED.output_tokens,
+               notes = EXCLUDED.notes, updated_at = NOW()`,
+            [randomUUID(), orgId, r.agentId || null, r.month, r.revenue || 0, r.tokenCost || 0, r.inputTokens || 0, r.outputTokens || 0, r.notes || null]
+          );
+        } else {
+          const id = randomUUID();
+          await db.getEngineDB()!.run(
+            `INSERT OR REPLACE INTO org_billing_records (id, org_id, agent_id, month, revenue, token_cost, input_tokens, output_tokens, notes)
+             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+            [id, orgId, r.agentId || null, r.month, r.revenue || 0, r.tokenCost || 0, r.inputTokens || 0, r.outputTokens || 0, r.notes || null]
+          );
+        }
+      }
+      return c.json({ success: true });
+    } catch (e: any) {
+      return c.json({ error: e.message }, 500);
+    }
+  });
+
+  // ─── Organization Billing Summary ─────────────────────
+
+  api.get('/organizations/:id/billing-summary', requireRole('admin'), async (c) => {
+    const orgId = c.req.param('id');
+    try {
+      const isPostgres = (db as any).pool;
+      let rows: any[];
+      if (isPostgres) {
+        const result = await (db as any)._query(
+          `SELECT month, SUM(revenue) as total_revenue, SUM(token_cost) as total_cost,
+                  SUM(input_tokens) as total_input_tokens, SUM(output_tokens) as total_output_tokens
+           FROM org_billing_records WHERE org_id = $1
+           GROUP BY month ORDER BY month ASC`, [orgId]
+        );
+        rows = result.rows;
+      } else {
+        rows = await db.getEngineDB()!.all(
+          `SELECT month, SUM(revenue) as total_revenue, SUM(token_cost) as total_cost,
+                  SUM(input_tokens) as total_input_tokens, SUM(output_tokens) as total_output_tokens
+           FROM org_billing_records WHERE org_id = ?
+           GROUP BY month ORDER BY month ASC`, [orgId]
+        );
+      }
+      return c.json({ summary: rows });
+    } catch (e: any) {
+      return c.json({ error: e.message }, 500);
+    }
+  });
+
   /** Stop and optionally delete tunnel */
   api.post('/tunnel/stop', requireRole('admin'), async (c) => {
     try {

package/src/dashboard/components/icons.js

@@ -56,6 +56,7 @@ export const I = {
   chevronLeft: () => h('svg', S, h('polyline', { points: '15 18 9 12 15 6' })),
 chevronRight: () => h('svg', S, h('polyline', { points: '9 18 15 12 9 6' })),
 chevronDown: () => h('svg', S, h('polyline', { points: '6 9 12 15 18 9' })),
+mail: () => h('svg', S, h('path', { d: 'M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z' }), h('polyline', { points: '22,6 12,13 2,6' })),
   building: () => h('svg', S, h('path', { d: 'M3 21h18M3 10h18M3 7l9-4 9 4M4 10v11M20 10v11M8 14v.01M12 14v.01M16 14v.01M8 18v.01M12 18v.01M16 18v.01' })),
   edit: () => h('svg', S, h('path', { d: 'M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7' }), h('path', { d: 'M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z' })),
 };

package/src/dashboard/pages/organizations.js

@@ -41,8 +41,18 @@ export function OrganizationsPage() {
   var femail = _femail[0]; var setFemail = _femail[1];
   var _fdesc = useState('');
   var fdesc = _fdesc[0]; var setFdesc = _fdesc[1];
+  var _fbilling = useState('');
+  var fbilling = _fbilling[0]; var setFbilling = _fbilling[1];
+  var _fcurrency = useState('USD');
+  var fcurrency = _fcurrency[0]; var setFcurrency = _fcurrency[1];
   var _slugManual = useState(false);
   var slugManual = _slugManual[0]; var setSlugManual = _slugManual[1];
+  var _detailTab = useState('agents');
+  var detailTab = _detailTab[0]; var setDetailTab = _detailTab[1];
+  var _billingSummary = useState([]);
+  var billingSummary = _billingSummary[0]; var setBillingSummary = _billingSummary[1];
+  var _billingRecords = useState([]);
+  var billingRecords = _billingRecords[0]; var setBillingRecords = _billingRecords[1];
 
   var loadOrgs = useCallback(function() {
     setLoading(true);
@@ -62,29 +72,33 @@ export function OrganizationsPage() {
   };
 
   var openCreate = function() {
-    setFname(''); setFslug(''); setFcontact(''); setFemail(''); setFdesc(''); setSlugManual(false);
+    setFname(''); setFslug(''); setFcontact(''); setFemail(''); setFdesc(''); setFbilling(''); setFcurrency('USD'); setSlugManual(false);
     setShowCreate(true);
   };
 
   var openEdit = function(org) {
     setFname(org.name || ''); setFslug(org.slug || ''); setFcontact(org.contact_name || ''); setFemail(org.contact_email || ''); setFdesc(org.description || '');
+    setFbilling(org.billing_rate_per_agent ? String(org.billing_rate_per_agent) : ''); setFcurrency(org.currency || 'USD');
     setEditOrg(org);
   };
 
   var openDetail = function(org) {
     setDetailOrg(org);
+    setDetailTab('agents');
     loadAllAgents();
     apiCall('/organizations/' + org.id).then(function(data) {
       setDetailAgents(data.agents || []);
       setDetailOrg(data);
     }).catch(function(err) { toast(err.message, 'error'); });
+    apiCall('/organizations/' + org.id + '/billing-summary').then(function(d) { setBillingSummary(d.summary || []); }).catch(function() {});
+    apiCall('/organizations/' + org.id + '/billing').then(function(d) { setBillingRecords(d.records || []); }).catch(function() {});
   };
 
   var doCreate = function() {
     setActing('create');
     apiCall('/organizations', {
       method: 'POST',
-      body: JSON.stringify({ name: fname, slug: fslug, contact_name: fcontact, contact_email: femail, description: fdesc })
+      body: JSON.stringify({ name: fname, slug: fslug, contact_name: fcontact, contact_email: femail, description: fdesc, billing_rate_per_agent: fbilling ? parseFloat(fbilling) : 0, currency: fcurrency })
     }).then(function() {
       toast('Organization created', 'success');
       setShowCreate(false);
@@ -97,7 +111,7 @@ export function OrganizationsPage() {
     setActing('edit');
     apiCall('/organizations/' + editOrg.id, {
       method: 'PATCH',
-      body: JSON.stringify({ name: fname, contact_name: fcontact, contact_email: femail, description: fdesc })
+      body: JSON.stringify({ name: fname, contact_name: fcontact, contact_email: femail, description: fdesc, billing_rate_per_agent: fbilling ? parseFloat(fbilling) : 0, currency: fcurrency })
     }).then(function() {
       toast('Organization updated', 'success');
       setEditOrg(null);
@@ -158,8 +172,9 @@ export function OrganizationsPage() {
     .finally(function() { setActing(''); });
   };
 
-  var unassignedAgents = allAgents.filter(function(a) {
-    return !a.client_org_id && detailAgents.every(function(da) { return da.id !== a.id; });
+  // Show agents not already in THIS org (includes unassigned AND agents from other orgs)
+  var assignableAgents = allAgents.filter(function(a) {
+    return detailAgents.every(function(da) { return da.id !== a.id; });
   });
 
   if (loading) return h('div', { style: { padding: 40, textAlign: 'center', color: 'var(--text-muted)' } }, 'Loading organizations...');
@@ -185,7 +200,11 @@ export function OrganizationsPage() {
     // Org cards
     orgs.length === 0
       ? h('div', { className: 'card', style: { textAlign: 'center', padding: 40 } },
-          h('div', { style: { fontSize: 48, marginBottom: 12 } }, '🏢'),
+          h('div', { style: { width: 48, height: 48, margin: '0 auto 12px', borderRadius: '50%', background: 'var(--bg-tertiary)', display: 'flex', alignItems: 'center', justifyContent: 'center' } },
+            h('svg', { width: 28, height: 28, viewBox: '0 0 24 24', fill: 'none', stroke: 'var(--text-muted)', strokeWidth: 1.5, strokeLinecap: 'round', strokeLinejoin: 'round' },
+              h('path', { d: 'M3 21h18M3 10h18M3 7l9-4 9 4M4 10v11M20 10v11M8 14v.01M12 14v.01M16 14v.01M8 18v.01M12 18v.01M16 18v.01' })
+            )
+          ),
           h('div', { style: { fontSize: 15, fontWeight: 600, marginBottom: 4 } }, 'No organizations yet'),
           h('div', { style: { color: 'var(--text-muted)', fontSize: 13, marginBottom: 16 } }, 'Create your first client organization to start managing multi-tenant agent deployments.'),
           h('button', { className: 'btn btn-primary', onClick: openCreate }, I.plus(), ' Create Organization')
@@ -204,8 +223,8 @@ export function OrganizationsPage() {
                 org.description && h('div', { style: { fontSize: 13, color: 'var(--text-secondary)', marginBottom: 12, lineHeight: 1.5 } }, org.description),
                 h('div', { style: { display: 'flex', gap: 16, fontSize: 12, color: 'var(--text-muted)' } },
                   h('span', null, I.agents(), ' ', (org.agent_count || 0), ' agent', (org.agent_count || 0) !== 1 ? 's' : ''),
-                  org.contact_email && h('span', null, '✉ ', org.contact_email),
-                  org.created_at && h('span', null, new Date(org.created_at).toLocaleDateString())
+                  org.billing_rate_per_agent > 0 && h('span', { style: { fontWeight: 600, color: 'var(--success, #15803d)' } }, (org.currency || '$') + ' ', parseFloat(org.billing_rate_per_agent).toFixed(2), '/agent/mo'),
+                  org.contact_email && h('span', null, I.mail(), ' ', org.contact_email)
                 ),
                 h('div', { style: { display: 'flex', gap: 6, marginTop: 12, borderTop: '1px solid var(--border)', paddingTop: 10 }, onClick: function(e) { e.stopPropagation(); } },
                   h('button', { className: 'btn btn-ghost btn-sm', onClick: function() { openEdit(org); } }, I.edit(), ' Edit'),
@@ -224,24 +243,36 @@ export function OrganizationsPage() {
       h('div', { style: { display: 'flex', flexDirection: 'column', gap: 14, padding: 4 } },
         h('div', null,
           h('label', { style: { fontSize: 12, fontWeight: 600, display: 'block', marginBottom: 4 } }, 'Name *'),
-          h('input', { className: 'input', value: fname, onInput: function(e) { setFname(e.target.value); if (!slugManual) setFslug(slugify(e.target.value)); }, placeholder: 'Acme Corporation' })
+          h('input', { className: 'input', value: fname, onInput: function(e) { setFname(e.target.value); if (!slugManual) setFslug(slugify(e.target.value)); }, placeholder: 'AgenticMail' })
         ),
         h('div', null,
           h('label', { style: { fontSize: 12, fontWeight: 600, display: 'block', marginBottom: 4 } }, 'Slug *'),
-          h('input', { className: 'input', value: fslug, onInput: function(e) { setFslug(e.target.value); setSlugManual(true); }, placeholder: 'acme-corporation', style: { fontFamily: 'var(--font-mono, monospace)' } })
+          h('input', { className: 'input', value: fslug, onInput: function(e) { setFslug(e.target.value); setSlugManual(true); }, placeholder: 'agenticmail', style: { fontFamily: 'var(--font-mono, monospace)' } })
         ),
         h('div', null,
           h('label', { style: { fontSize: 12, fontWeight: 600, display: 'block', marginBottom: 4 } }, 'Contact Name'),
-          h('input', { className: 'input', value: fcontact, onInput: function(e) { setFcontact(e.target.value); }, placeholder: 'John Doe' })
+          h('input', { className: 'input', value: fcontact, onInput: function(e) { setFcontact(e.target.value); }, placeholder: 'Ope Olatunji' })
         ),
         h('div', null,
           h('label', { style: { fontSize: 12, fontWeight: 600, display: 'block', marginBottom: 4 } }, 'Contact Email'),
-          h('input', { className: 'input', type: 'email', value: femail, onInput: function(e) { setFemail(e.target.value); }, placeholder: 'john@acme.com' })
+          h('input', { className: 'input', type: 'email', value: femail, onInput: function(e) { setFemail(e.target.value); }, placeholder: 'ope@agenticmail.io' })
         ),
         h('div', null,
           h('label', { style: { fontSize: 12, fontWeight: 600, display: 'block', marginBottom: 4 } }, 'Description'),
           h('textarea', { className: 'input', value: fdesc, onInput: function(e) { setFdesc(e.target.value); }, placeholder: 'Brief description...', rows: 3, style: { resize: 'vertical' } })
         ),
+        h('div', { style: { display: 'flex', gap: 12 } },
+          h('div', { style: { flex: 1 } },
+            h('label', { style: { fontSize: 12, fontWeight: 600, display: 'block', marginBottom: 4 } }, 'Billing Rate / Agent / Month'),
+            h('input', { className: 'input', type: 'number', step: '0.01', min: '0', value: fbilling, onInput: function(e) { setFbilling(e.target.value); }, placeholder: '0.00' })
+          ),
+          h('div', { style: { width: 100 } },
+            h('label', { style: { fontSize: 12, fontWeight: 600, display: 'block', marginBottom: 4 } }, 'Currency'),
+            h('select', { className: 'input', value: fcurrency, onChange: function(e) { setFcurrency(e.target.value); } },
+              h('option', { value: 'USD' }, 'USD'), h('option', { value: 'EUR' }, 'EUR'), h('option', { value: 'GBP' }, 'GBP'), h('option', { value: 'NGN' }, 'NGN'), h('option', { value: 'CAD' }, 'CAD'), h('option', { value: 'AUD' }, 'AUD')
+            )
+          )
+        ),
         h('div', { style: { display: 'flex', gap: 8, justifyContent: 'flex-end', marginTop: 8 } },
           h('button', { className: 'btn btn-secondary', onClick: function() { setShowCreate(false); } }, 'Cancel'),
           h('button', { className: 'btn btn-primary', disabled: !fname || !fslug || acting === 'create', onClick: doCreate }, acting === 'create' ? 'Creating...' : 'Create')
@@ -272,6 +303,18 @@ export function OrganizationsPage() {
           h('label', { style: { fontSize: 12, fontWeight: 600, display: 'block', marginBottom: 4 } }, 'Description'),
           h('textarea', { className: 'input', value: fdesc, onInput: function(e) { setFdesc(e.target.value); }, rows: 3, style: { resize: 'vertical' } })
         ),
+        h('div', { style: { display: 'flex', gap: 12 } },
+          h('div', { style: { flex: 1 } },
+            h('label', { style: { fontSize: 12, fontWeight: 600, display: 'block', marginBottom: 4 } }, 'Billing Rate / Agent / Month'),
+            h('input', { className: 'input', type: 'number', step: '0.01', min: '0', value: fbilling, onInput: function(e) { setFbilling(e.target.value); }, placeholder: '0.00' })
+          ),
+          h('div', { style: { width: 100 } },
+            h('label', { style: { fontSize: 12, fontWeight: 600, display: 'block', marginBottom: 4 } }, 'Currency'),
+            h('select', { className: 'input', value: fcurrency, onChange: function(e) { setFcurrency(e.target.value); } },
+              h('option', { value: 'USD' }, 'USD'), h('option', { value: 'EUR' }, 'EUR'), h('option', { value: 'GBP' }, 'GBP'), h('option', { value: 'NGN' }, 'NGN'), h('option', { value: 'CAD' }, 'CAD'), h('option', { value: 'AUD' }, 'AUD')
+            )
+          )
+        ),
         h('div', { style: { display: 'flex', gap: 8, justifyContent: 'flex-end', marginTop: 8 } },
           h('button', { className: 'btn btn-secondary', onClick: function() { setEditOrg(null); } }, 'Cancel'),
           h('button', { className: 'btn btn-primary', disabled: !fname || acting === 'edit', onClick: doEdit }, acting === 'edit' ? 'Saving...' : 'Save Changes')
@@ -280,10 +323,10 @@ export function OrganizationsPage() {
     ),
 
     // Detail Modal
-    detailOrg && h(Modal, { title: detailOrg.name || 'Organization Detail', onClose: function() { setDetailOrg(null); }, wide: true },
+    detailOrg && h(Modal, { title: detailOrg.name || 'Organization Detail', onClose: function() { setDetailOrg(null); }, width: 700 },
       h('div', { style: { padding: 4 } },
         // Org info
-        h('div', { style: { display: 'grid', gridTemplateColumns: '1fr 1fr 1fr', gap: 16, marginBottom: 20 } },
+        h('div', { style: { display: 'grid', gridTemplateColumns: '1fr 1fr 1fr 1fr', gap: 16, marginBottom: 16 } },
           h('div', null,
             h('div', { style: { fontSize: 11, color: 'var(--text-muted)', textTransform: 'uppercase', fontWeight: 600, marginBottom: 4 } }, 'Slug'),
             h('div', { style: { fontFamily: 'var(--font-mono, monospace)', fontSize: 13 } }, detailOrg.slug)
@@ -298,10 +341,29 @@ export function OrganizationsPage() {
             detailOrg.contact_email && h('div', { style: { fontSize: 12, color: 'var(--text-muted)' } }, detailOrg.contact_email)
           )
         ),
+        // Billing rate in header
+        detailOrg.billing_rate_per_agent > 0 && h('div', { style: { display: 'flex', alignItems: 'center', gap: 16, padding: '10px 14px', background: 'var(--success-soft, rgba(21,128,61,0.06))', borderRadius: 8, marginBottom: 16, fontSize: 13 } },
+          h('div', null, h('strong', null, 'Rate: '), (detailOrg.currency || 'USD') + ' ' + parseFloat(detailOrg.billing_rate_per_agent).toFixed(2) + '/agent/month'),
+          h('div', null, h('strong', null, 'Monthly Revenue: '), (detailOrg.currency || 'USD') + ' ' + (parseFloat(detailOrg.billing_rate_per_agent) * detailAgents.length).toFixed(2)),
+          h('div', null, h('strong', null, 'Agents: '), detailAgents.length)
+        ),
+
         detailOrg.description && h('div', { style: { fontSize: 13, color: 'var(--text-secondary)', marginBottom: 16, padding: 12, background: 'var(--bg-tertiary)', borderRadius: 'var(--radius)' } }, detailOrg.description),
 
-        // Linked agents
-        h('div', { style: { fontSize: 14, fontWeight: 700, marginBottom: 10 } }, 'Linked Agents (' + detailAgents.length + ')'),
+        // Tabs
+        h('div', { style: { display: 'flex', gap: 0, borderBottom: '1px solid var(--border)', marginBottom: 16 } },
+          ['agents', 'billing'].map(function(t) {
+            return h('button', {
+              key: t, type: 'button',
+              style: { padding: '8px 16px', fontSize: 13, fontWeight: 600, background: 'none', border: 'none', cursor: 'pointer', color: detailTab === t ? 'var(--primary)' : 'var(--text-muted)', borderBottom: detailTab === t ? '2px solid var(--primary)' : '2px solid transparent', fontFamily: 'var(--font)' },
+              onClick: function() { setDetailTab(t); }
+            }, t === 'agents' ? 'Agents (' + detailAgents.length + ')' : 'Billing & Costs');
+          })
+        ),
+
+        // ── Agents Tab ────────────────────────────
+        detailTab === 'agents' && h(Fragment, null,
+        h('div', { style: { fontSize: 14, fontWeight: 700, marginBottom: 10 } }, 'Linked Agents'),
         detailAgents.length > 0
           ? h('div', { style: { display: 'flex', flexDirection: 'column', gap: 6, marginBottom: 16 } },
               detailAgents.map(function(a) {
@@ -322,13 +384,114 @@ export function OrganizationsPage() {
         h('div', { style: { fontSize: 14, fontWeight: 700, marginBottom: 8 } }, 'Assign Agent'),
         h('div', { style: { display: 'flex', gap: 8 } },
           h('select', { className: 'input', value: assignAgentId, onChange: function(e) { setAssignAgentId(e.target.value); }, style: { flex: 1 } },
-            h('option', { value: '' }, '— Select an unassigned agent —'),
-            unassignedAgents.map(function(a) {
-              return h('option', { key: a.id, value: a.id }, a.name + (a.role ? ' (' + a.role + ')' : ''));
+            h('option', { value: '' }, '— Select an agent to assign —'),
+            assignableAgents.map(function(a) {
+              var label = a.name + (a.role ? ' (' + a.role + ')' : '');
+              if (a.client_org_id) {
+                var fromOrg = orgs.find(function(o) { return o.id === a.client_org_id; });
+                label += fromOrg ? ' [from ' + fromOrg.name + ']' : ' [assigned elsewhere]';
+              }
+              return h('option', { key: a.id, value: a.id }, label);
             })
           ),
           h('button', { className: 'btn btn-primary btn-sm', disabled: !assignAgentId || acting === 'assign', onClick: doAssignAgent }, acting === 'assign' ? 'Assigning...' : 'Assign')
         )
+        ), // end agents tab
+
+        // ── Billing Tab ───────────────────────────
+        detailTab === 'billing' && h(Fragment, null,
+          // Revenue vs Cost chart
+          billingSummary.length > 0 && h('div', { style: { marginBottom: 20 } },
+            h('div', { style: { fontSize: 14, fontWeight: 700, marginBottom: 12 } }, 'Revenue vs Cost'),
+            h('div', { style: { display: 'flex', alignItems: 'flex-end', gap: 4, height: 160, padding: '0 8px', borderBottom: '1px solid var(--border)' } },
+              billingSummary.map(function(m, i) {
+                var rev = parseFloat(m.total_revenue) || 0;
+                var cost = parseFloat(m.total_cost) || 0;
+                var maxVal = Math.max.apply(null, billingSummary.map(function(s) { return Math.max(parseFloat(s.total_revenue) || 0, parseFloat(s.total_cost) || 0); })) || 1;
+                var revH = Math.max(4, (rev / maxVal) * 140);
+                var costH = Math.max(4, (cost / maxVal) * 140);
+                var profit = rev - cost;
+                return h('div', { key: i, style: { flex: 1, display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 2 } },
+                  h('div', { style: { display: 'flex', alignItems: 'flex-end', gap: 2, height: 144 } },
+                    h('div', { title: 'Revenue: ' + rev.toFixed(2), style: { width: 14, height: revH, background: 'var(--success, #15803d)', borderRadius: '3px 3px 0 0', minHeight: 4 } }),
+                    h('div', { title: 'Cost: ' + cost.toFixed(2), style: { width: 14, height: costH, background: 'var(--danger, #dc2626)', borderRadius: '3px 3px 0 0', minHeight: 4, opacity: 0.7 } })
+                  ),
+                  h('div', { style: { fontSize: 9, color: 'var(--text-muted)', marginTop: 4, whiteSpace: 'nowrap' } }, m.month ? m.month.slice(5) : ''),
+                  h('div', { style: { fontSize: 9, color: profit >= 0 ? 'var(--success, #15803d)' : 'var(--danger)', fontWeight: 600 } }, profit >= 0 ? '+' + profit.toFixed(0) : profit.toFixed(0))
+                );
+              })
+            ),
+            h('div', { style: { display: 'flex', gap: 16, marginTop: 8, fontSize: 11 } },
+              h('span', { style: { display: 'flex', alignItems: 'center', gap: 4 } }, h('span', { style: { width: 10, height: 10, borderRadius: 2, background: 'var(--success, #15803d)', display: 'inline-block' } }), 'Revenue'),
+              h('span', { style: { display: 'flex', alignItems: 'center', gap: 4 } }, h('span', { style: { width: 10, height: 10, borderRadius: 2, background: 'var(--danger)', opacity: 0.7, display: 'inline-block' } }), 'Token Cost'),
+              (function() {
+                var totRev = billingSummary.reduce(function(a, m) { return a + (parseFloat(m.total_revenue) || 0); }, 0);
+                var totCost = billingSummary.reduce(function(a, m) { return a + (parseFloat(m.total_cost) || 0); }, 0);
+                return h('span', { style: { marginLeft: 'auto', fontWeight: 600, color: (totRev - totCost) >= 0 ? 'var(--success, #15803d)' : 'var(--danger)' } },
+                  'Net: ' + (detailOrg.currency || 'USD') + ' ' + (totRev - totCost).toFixed(2)
+                );
+              })()
+            )
+          ),
+
+          billingSummary.length === 0 && h('div', { style: { padding: 24, textAlign: 'center', color: 'var(--text-muted)', fontSize: 13, background: 'var(--bg-tertiary)', borderRadius: 8, marginBottom: 16 } },
+            'No billing data yet. Billing records are created as agents process tasks and accumulate token costs.'
+          ),
+
+          // Stats summary
+          (function() {
+            var totRev = billingSummary.reduce(function(a, m) { return a + (parseFloat(m.total_revenue) || 0); }, 0);
+            var totCost = billingSummary.reduce(function(a, m) { return a + (parseFloat(m.total_cost) || 0); }, 0);
+            var totIn = billingSummary.reduce(function(a, m) { return a + (parseInt(m.total_input_tokens) || 0); }, 0);
+            var totOut = billingSummary.reduce(function(a, m) { return a + (parseInt(m.total_output_tokens) || 0); }, 0);
+            var margin = totRev > 0 ? ((totRev - totCost) / totRev * 100) : 0;
+            return h('div', { style: { display: 'grid', gridTemplateColumns: 'repeat(4, 1fr)', gap: 12, marginBottom: 16 } },
+              h('div', { style: { padding: 12, background: 'var(--bg-tertiary)', borderRadius: 8, textAlign: 'center' } },
+                h('div', { style: { fontSize: 18, fontWeight: 700, color: 'var(--success, #15803d)' } }, (detailOrg.currency || 'USD') + ' ' + totRev.toFixed(2)),
+                h('div', { style: { fontSize: 11, color: 'var(--text-muted)' } }, 'Total Revenue')
+              ),
+              h('div', { style: { padding: 12, background: 'var(--bg-tertiary)', borderRadius: 8, textAlign: 'center' } },
+                h('div', { style: { fontSize: 18, fontWeight: 700, color: 'var(--danger)' } }, (detailOrg.currency || 'USD') + ' ' + totCost.toFixed(4)),
+                h('div', { style: { fontSize: 11, color: 'var(--text-muted)' } }, 'Token Cost')
+              ),
+              h('div', { style: { padding: 12, background: 'var(--bg-tertiary)', borderRadius: 8, textAlign: 'center' } },
+                h('div', { style: { fontSize: 18, fontWeight: 700, color: margin >= 0 ? 'var(--success, #15803d)' : 'var(--danger)' } }, margin.toFixed(1) + '%'),
+                h('div', { style: { fontSize: 11, color: 'var(--text-muted)' } }, 'Margin')
+              ),
+              h('div', { style: { padding: 12, background: 'var(--bg-tertiary)', borderRadius: 8, textAlign: 'center' } },
+                h('div', { style: { fontSize: 18, fontWeight: 700 } }, ((totIn + totOut) / 1000).toFixed(1) + 'K'),
+                h('div', { style: { fontSize: 11, color: 'var(--text-muted)' } }, 'Total Tokens')
+              )
+            );
+          })(),
+
+          // Per-agent breakdown table
+          billingRecords.length > 0 && h(Fragment, null,
+            h('div', { style: { fontSize: 14, fontWeight: 700, marginBottom: 8 } }, 'Records'),
+            h('div', { style: { overflowX: 'auto' } },
+              h('table', null,
+                h('thead', null, h('tr', null,
+                  h('th', null, 'Month'), h('th', null, 'Agent'), h('th', { style: { textAlign: 'right' } }, 'Revenue'), h('th', { style: { textAlign: 'right' } }, 'Token Cost'), h('th', { style: { textAlign: 'right' } }, 'Profit'), h('th', { style: { textAlign: 'right' } }, 'Tokens')
+                )),
+                h('tbody', null,
+                  billingRecords.map(function(r, i) {
+                    var rev = parseFloat(r.revenue) || 0;
+                    var cost = parseFloat(r.token_cost) || 0;
+                    var agent = detailAgents.find(function(a) { return a.id === r.agent_id; });
+                    return h('tr', { key: i },
+                      h('td', { style: { fontFamily: 'var(--font-mono)', fontSize: 12 } }, r.month),
+                      h('td', null, agent ? agent.name : (r.agent_id ? r.agent_id.slice(0, 8) : 'All')),
+                      h('td', { style: { textAlign: 'right', color: 'var(--success, #15803d)' } }, rev.toFixed(2)),
+                      h('td', { style: { textAlign: 'right', color: 'var(--danger)' } }, cost.toFixed(4)),
+                      h('td', { style: { textAlign: 'right', fontWeight: 600, color: (rev - cost) >= 0 ? 'var(--success, #15803d)' : 'var(--danger)' } }, (rev - cost).toFixed(2)),
+                      h('td', { style: { textAlign: 'right', fontSize: 12, color: 'var(--text-muted)' } }, ((parseInt(r.input_tokens) || 0) + (parseInt(r.output_tokens) || 0)).toLocaleString())
+                    );
+                  })
+                )
+              )
+            )
+          )
+        ) // end billing tab
       )
     )
   );

package/src/db/postgres.ts

@@ -209,7 +209,24 @@ export class PostgresAdapter extends DatabaseAdapter {
         );
       `);
       await client.query(`
+        ALTER TABLE client_organizations ADD COLUMN IF NOT EXISTS billing_rate_per_agent NUMERIC(10,2) DEFAULT 0;
+        ALTER TABLE client_organizations ADD COLUMN IF NOT EXISTS currency TEXT DEFAULT 'USD';
         ALTER TABLE agents ADD COLUMN IF NOT EXISTS client_org_id TEXT REFERENCES client_organizations(id);
+
+        CREATE TABLE IF NOT EXISTS org_billing_records (
+          id TEXT PRIMARY KEY DEFAULT gen_random_uuid(),
+          org_id TEXT NOT NULL REFERENCES client_organizations(id) ON DELETE CASCADE,
+          agent_id TEXT,
+          month TEXT NOT NULL,
+          revenue NUMERIC(10,2) DEFAULT 0,
+          token_cost NUMERIC(10,4) DEFAULT 0,
+          input_tokens BIGINT DEFAULT 0,
+          output_tokens BIGINT DEFAULT 0,
+          notes TEXT,
+          created_at TIMESTAMP DEFAULT NOW(),
+          updated_at TIMESTAMP DEFAULT NOW(),
+          UNIQUE(org_id, agent_id, month)
+        );
       `).catch(() => {});
       await client.query(`
         CREATE TABLE IF NOT EXISTS agent_knowledge_access (

package/src/db/sqlite.ts

@@ -78,7 +78,15 @@ export class SqliteAdapter extends DatabaseAdapter {
           updated_at TEXT DEFAULT (datetime('now'))
         );
       `);
+      try { this.db.exec(`ALTER TABLE client_organizations ADD COLUMN billing_rate_per_agent REAL DEFAULT 0`); } catch { /* exists */ }
+      try { this.db.exec(`ALTER TABLE client_organizations ADD COLUMN currency TEXT DEFAULT 'USD'`); } catch { /* exists */ }
       try { this.db.exec(`ALTER TABLE agents ADD COLUMN client_org_id TEXT REFERENCES client_organizations(id)`); } catch { /* exists */ }
+      this.db.exec(`CREATE TABLE IF NOT EXISTS org_billing_records (
+        id TEXT PRIMARY KEY, org_id TEXT NOT NULL, agent_id TEXT, month TEXT NOT NULL,
+        revenue REAL DEFAULT 0, token_cost REAL DEFAULT 0, input_tokens INTEGER DEFAULT 0,
+        output_tokens INTEGER DEFAULT 0, notes TEXT, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+        updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, UNIQUE(org_id, agent_id, month)
+      )`);
       this.db.exec(`
         CREATE TABLE IF NOT EXISTS agent_knowledge_access (
           id TEXT PRIMARY KEY,