@agenticmail/enterprise 0.5.301 → 0.5.303

package/src/dashboard/pages/knowledge.js

@@ -1,14 +1,17 @@
-import { h, useState, useEffect, useCallback, Fragment, useApp, engineCall, getOrgId } from '../components/utils.js';
+import { h, useState, useEffect, useCallback, Fragment, useApp, engineCall, apiCall, getOrgId } from '../components/utils.js';
 import { I } from '../components/icons.js';
 import { Modal } from '../components/modal.js';
 import { KnowledgeImportWizard, ImportJobsList } from './knowledge-import.js';
 import { HelpButton } from '../components/help-button.js';
+import { useOrgContext } from '../components/org-switcher.js';
 
 export function KnowledgeBasePage() {
   const { toast } = useApp();
   const [kbs, setKbs] = useState([]);
   const [creating, setCreating] = useState(false);
-  const [form, setForm] = useState({ name: '', description: '' });
+  const [form, setForm] = useState({ name: '', description: '', orgId: '' });
+  const [clientOrgs, setClientOrgs] = useState([]);
+  const orgCtx = useOrgContext();
   const [selected, setSelected] = useState(null); // full KB detail
   const [docs, setDocs] = useState([]);
   const [chunks, setChunks] = useState([]);
@@ -25,14 +28,20 @@ export function KnowledgeBasePage() {
 
   const load = useCallback(() => {
     engineCall('/knowledge-bases').then(d => setKbs(d.knowledgeBases || [])).catch(() => {});
+    apiCall('/organizations').then(d => setClientOrgs(d.organizations || [])).catch(() => {});
   }, []);
   useEffect(() => { load(); }, [load]);
 
+  // Filter KBs by selected org context
+  const filteredKbs = orgCtx.selectedOrgId
+    ? kbs.filter(kb => kb.orgId === orgCtx.selectedOrgId || kb.clientOrgId === orgCtx.selectedOrgId)
+    : kbs;
+
   const create = async () => {
     try {
-      await engineCall('/knowledge-bases', { method: 'POST', body: JSON.stringify({ name: form.name, description: form.description, orgId: getOrgId() }) });
+      await engineCall('/knowledge-bases', { method: 'POST', body: JSON.stringify({ name: form.name, description: form.description, orgId: getOrgId(), clientOrgId: form.orgId || null }) });
       toast('Knowledge base created', 'success');
-      setCreating(false); setForm({ name: '', description: '' }); load();
+      setCreating(false); setForm({ name: '', description: '', orgId: '' }); load();
     } catch (e) { toast(e.message, 'error'); }
   };
 
@@ -315,16 +324,29 @@ export function KnowledgeBasePage() {
       h('button', { className: 'btn btn-primary', onClick: () => setCreating(true) }, I.plus(), ' New Knowledge Base')
     ),
 
+    // Org context switcher
+    h(orgCtx.Switcher),
+
     creating && h(Modal, { title: 'Create Knowledge Base', onClose: () => setCreating(false), footer: h(Fragment, null, h('button', { className: 'btn btn-secondary', onClick: () => setCreating(false) }, 'Cancel'), h('button', { className: 'btn btn-primary', onClick: create, disabled: !form.name }, 'Create')) },
       h('div', { className: 'form-group' }, h('label', { className: 'form-label' }, 'Name'), h('input', { className: 'input', value: form.name, onChange: e => setForm(f => ({ ...f, name: e.target.value })) })),
-      h('div', { className: 'form-group' }, h('label', { className: 'form-label' }, 'Description'), h('textarea', { className: 'input', value: form.description, onChange: e => setForm(f => ({ ...f, description: e.target.value })) }))
+      h('div', { className: 'form-group' }, h('label', { className: 'form-label' }, 'Description'), h('textarea', { className: 'input', value: form.description, onChange: e => setForm(f => ({ ...f, description: e.target.value })) })),
+      clientOrgs.length > 0 && h('div', { className: 'form-group' },
+        h('label', { className: 'form-label' }, 'Organization'),
+        h('select', { className: 'input', value: form.orgId, onChange: e => setForm(f => ({ ...f, orgId: e.target.value })) },
+          h('option', { value: '' }, 'My Organization (internal)'),
+          clientOrgs.filter(o => o.is_active !== false).map(o =>
+            h('option', { key: o.id, value: o.id }, o.name)
+          )
+        ),
+        h('div', { style: { fontSize: 11, color: 'var(--text-muted)', marginTop: 4 } }, 'Assign this knowledge base to a client organization for data isolation')
+      )
     ),
 
     loading && h('div', { style: { textAlign: 'center', padding: 40 } }, 'Loading...'),
 
-    !loading && kbs.length === 0
-      ? h('div', { className: 'card' }, h('div', { className: 'card-body' }, h('div', { className: 'empty-state' }, I.knowledge(), h('h3', null, 'No knowledge bases'), h('p', null, 'Create a knowledge base to give agents access to your documents, policies, and data.'))))
-      : !loading && h('div', { style: { display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(300px, 1fr))', gap: 16 } }, kbs.map(kb =>
+    !loading && filteredKbs.length === 0
+      ? h('div', { className: 'card' }, h('div', { className: 'card-body' }, h('div', { className: 'empty-state' }, I.knowledge(), h('h3', null, orgCtx.selectedOrgId ? 'No knowledge bases for this organization' : 'No knowledge bases'), h('p', null, orgCtx.selectedOrgId ? 'Create a knowledge base assigned to this organization to get started.' : 'Create a knowledge base to give agents access to your documents, policies, and data.'))))
+      : !loading && h('div', { style: { display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(300px, 1fr))', gap: 16 } }, filteredKbs.map(kb =>
           h('div', { key: kb.id, className: 'card', style: { cursor: 'pointer', transition: 'border-color 0.15s' }, onClick: () => selectKb(kb) },
             h('div', { className: 'card-body' },
               h('h3', { style: { fontSize: 15, fontWeight: 600, marginBottom: 4 } }, kb.name),
@@ -332,7 +354,8 @@ export function KnowledgeBasePage() {
               h('div', { style: { display: 'flex', gap: 8, flexWrap: 'wrap' } },
                 h('span', { className: 'badge badge-info' }, (kb.stats?.documentCount || kb.stats?.documents || kb.stats?.totalDocuments || kb.documents?.length || 0) + ' docs'),
                 h('span', { className: 'badge badge-neutral' }, (kb.stats?.chunkCount || kb.stats?.chunks || kb.stats?.totalChunks || 0) + ' chunks'),
-                kb.agentIds && kb.agentIds.length > 0 && h('span', { className: 'badge badge-success' }, kb.agentIds.length + ' agent(s)')
+                kb.agentIds && kb.agentIds.length > 0 && h('span', { className: 'badge badge-success' }, kb.agentIds.length + ' agent(s)'),
+                (function() { var org = kb.clientOrgId && clientOrgs.find(function(o) { return o.id === kb.clientOrgId; }); return org ? h('span', { className: 'badge', style: { background: 'var(--bg-secondary)', fontSize: 10 } }, I.building(), ' ', org.name) : null; })()
               ),
               h('div', { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginTop: 10 } },
                 h('div', { style: { fontSize: 11, color: 'var(--text-muted)' } }, 'Click to view details \u2192'),

package/src/dashboard/pages/messages.js

@@ -1,8 +1,11 @@
 import { h, useState, useEffect, useRef, Fragment, useApp, engineCall, buildAgentEmailMap, resolveAgentEmail, buildAgentDataMap, renderAgentBadge, getOrgId } from '../components/utils.js';
 import { I } from '../components/icons.js';
 import { HelpButton } from '../components/help-button.js';
+import { useOrgContext } from '../components/org-switcher.js';
 
 export function MessagesPage() {
+  var orgCtx = useOrgContext();
+  var effectiveOrgId = orgCtx.selectedOrgId || getOrgId();
   const { toast } = useApp();
   const [messages, setMessages] = useState([]);
   const [agents, setAgents] = useState([]);
@@ -10,19 +13,19 @@ export function MessagesPage() {
   const [mainTab, setMainTab] = useState('messages');
   const [subTab, setSubTab] = useState('all');
   const [showModal, setShowModal] = useState(false);
-  const [form, setForm] = useState({ orgId: getOrgId(), fromAgentId: '', toAgentId: '', subject: '', content: '', priority: 'normal' });
+  const [form, setForm] = useState({ orgId: effectiveOrgId, fromAgentId: '', toAgentId: '', subject: '', content: '', priority: 'normal' });
   const [selectedNode, setSelectedNode] = useState(null);
   const [nodePositions, setNodePositions] = useState([]);
   const svgRef = useRef(null);
 
   const loadMessages = () => {
-    engineCall('/messages?orgId=' + getOrgId() + '&limit=100').then(d => setMessages(d.messages || [])).catch(() => {});
+    engineCall('/messages?orgId=' + effectiveOrgId + '&limit=100').then(d => setMessages(d.messages || [])).catch(() => {});
   };
   const loadAgents = () => {
-    engineCall('/agents?orgId=' + getOrgId()).then(d => setAgents(d.agents || [])).catch(() => {});
+    engineCall('/agents?orgId=' + effectiveOrgId).then(d => setAgents(d.agents || [])).catch(() => {});
   };
   const loadTopology = () => {
-    engineCall('/messages/topology?orgId=' + getOrgId()).then(d => setTopology(d.topology || null)).catch(() => {});
+    engineCall('/messages/topology?orgId=' + effectiveOrgId).then(d => setTopology(d.topology || null)).catch(() => {});
   };
   useEffect(() => { loadMessages(); loadAgents(); loadTopology(); }, []);
 
@@ -200,6 +203,7 @@ export function MessagesPage() {
   var _tip = { marginTop: 12, padding: 12, background: 'var(--bg-secondary, #1e293b)', borderRadius: 'var(--radius, 8px)', fontSize: 13 };
 
   return h('div', { className: 'page-inner' },
+    h(orgCtx.Switcher),
     // Page header
     h('div', { className: 'page-header' }, h('h1', { style: { display: 'flex', alignItems: 'center' } }, 'Agent Messages', h(HelpButton, { label: 'Agent Messages' },
       h('p', null, 'All inter-agent and external communications in one place. See how your agents talk to each other and to the outside world.'),

package/src/dashboard/pages/org-chart.js

@@ -1,6 +1,7 @@
 import { h, useState, useEffect, useCallback, useRef, Fragment, useApp, engineCall, getOrgId } from '../components/utils.js';
 import { I } from '../components/icons.js';
 import { HelpButton } from '../components/help-button.js';
+import { useOrgContext } from '../components/org-switcher.js';
 
 // ─── Inject theme CSS once ───────────────────────────────
 var _injected = false;
@@ -133,6 +134,8 @@ function OrgSummary(props) {
 
 // ─── Main Component ─────────────────────────────────────
 export function OrgChartPage() {
+  var orgCtx = useOrgContext();
+  var effectiveOrgId = orgCtx.selectedOrgId || getOrgId();
   injectCSS();
   var app = useApp();
   var toast = app.toast;
@@ -151,7 +154,7 @@ export function OrgChartPage() {
     setLoading(true); setError(null);
     Promise.all([
       engineCall('/hierarchy/org-chart').catch(function() { return null; }),
-      engineCall('/agents?orgId=' + getOrgId()).catch(function() { return { agents: [] }; }),
+      engineCall('/agents?orgId=' + effectiveOrgId).catch(function() { return { agents: [] }; }),
     ]).then(function(res) {
       var hierRes = res[0]; var agentRes = res[1];
       var avatarMap = {};
@@ -211,6 +214,7 @@ export function OrgChartPage() {
   );
 
   return h('div', { style: { height: '100%', display: 'flex', flexDirection: 'column', background: 'var(--oc-bg)', borderRadius: 'var(--radius-lg)', overflow: 'hidden' } },
+    h(orgCtx.Switcher, { style: { margin: '8px 12px 0', borderRadius: 6 } }),
     // Toolbar
     h('div', { style: { display: 'flex', alignItems: 'center', gap: 10, padding: '10px 16px', borderBottom: '1px solid var(--oc-border)', background: 'var(--oc-toolbar)', flexShrink: 0, flexWrap: 'wrap' } },
       h('div', { style: { fontWeight: 700, fontSize: 14, color: 'var(--oc-text)', display: 'flex', alignItems: 'center', gap: 6 } },

package/src/dashboard/pages/organizations.js

@@ -342,9 +342,15 @@ export function OrganizationsPage() {
           )
         ),
         // 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)),
+        (detailOrg.billing_rate_per_agent > 0 || detailAgents.some(function(a) { return a.billing_rate > 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, flexWrap: 'wrap' } },
+          h('div', null, h('strong', null, 'Default Rate: '), (detailOrg.currency || 'USD') + ' ' + parseFloat(detailOrg.billing_rate_per_agent || 0).toFixed(2) + '/agent/month'),
+          h('div', null, h('strong', null, 'Monthly Revenue: '), (function() {
+            var total = detailAgents.reduce(function(sum, a) {
+              var rate = a.billing_rate > 0 ? parseFloat(a.billing_rate) : parseFloat(detailOrg.billing_rate_per_agent || 0);
+              return sum + rate;
+            }, 0);
+            return (detailOrg.currency || 'USD') + ' ' + total.toFixed(2);
+          })()),
           h('div', null, h('strong', null, 'Agents: '), detailAgents.length)
         ),
 
@@ -438,6 +444,36 @@ export function OrganizationsPage() {
             'No billing data yet. Billing records are created as agents process tasks and accumulate token costs.'
           ),
 
+          // Per-agent billing rates
+          detailAgents.length > 0 && h('div', { style: { marginBottom: 20 } },
+            h('div', { style: { fontSize: 14, fontWeight: 700, marginBottom: 8 } }, 'Per-Agent Billing Rates'),
+            h('div', { style: { fontSize: 11, color: 'var(--text-muted)', marginBottom: 10 } }, 'Set custom billing rates per agent. Leave blank to use the default org rate (' + (detailOrg.currency || 'USD') + ' ' + parseFloat(detailOrg.billing_rate_per_agent || 0).toFixed(2) + '/agent/month).'),
+            h('div', { style: { display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(220px, 1fr))', gap: 10 } },
+              detailAgents.map(function(a) {
+                var agentRate = a.billing_rate > 0 ? parseFloat(a.billing_rate) : 0;
+                var effectiveRate = agentRate > 0 ? agentRate : parseFloat(detailOrg.billing_rate_per_agent || 0);
+                return h('div', { key: a.id, style: { padding: 10, background: 'var(--bg-tertiary)', borderRadius: 8 } },
+                  h('div', { style: { fontWeight: 600, fontSize: 13, marginBottom: 6 } }, a.name || a.id),
+                  h('div', { style: { display: 'flex', gap: 6, alignItems: 'center' } },
+                    h('span', { style: { fontSize: 12, color: 'var(--text-muted)' } }, detailOrg.currency || 'USD'),
+                    h('input', { className: 'input', type: 'number', step: '0.01', min: '0', value: agentRate > 0 ? agentRate : '',
+                      placeholder: effectiveRate.toFixed(2),
+                      onChange: function(e) {
+                        var val = parseFloat(e.target.value) || 0;
+                        apiCall('/agents/' + a.id, { method: 'PATCH', body: JSON.stringify({ billingRate: val }) })
+                          .then(function() { toast('Rate updated for ' + (a.name || a.id), 'success'); })
+                          .catch(function(err) { toast(err.message, 'error'); });
+                      },
+                      style: { width: 90, fontSize: 12, padding: '4px 6px' }
+                    }),
+                    h('span', { style: { fontSize: 10, color: 'var(--text-muted)' } }, '/mo')
+                  ),
+                  agentRate > 0 && h('div', { style: { fontSize: 10, color: 'var(--success, #15803d)', marginTop: 4 } }, 'Custom rate')
+                );
+              })
+            )
+          ),
+
           // Stats summary
           (function() {
             var totRev = billingSummary.reduce(function(a, m) { return a + (parseFloat(m.total_revenue) || 0); }, 0);

package/src/dashboard/pages/skills.js

@@ -2,8 +2,11 @@ import { h, useState, useEffect, useCallback, Fragment, useApp, engineCall, getO
 import { I } from '../components/icons.js';
 import { Modal } from '../components/modal.js';
 import { HelpButton } from '../components/help-button.js';
+import { useOrgContext } from '../components/org-switcher.js';
 
 export function SkillsPage() {
+  var orgCtx = useOrgContext();
+  var effectiveOrgId = orgCtx.selectedOrgId || getOrgId();
   var app = useApp();
   var toast = app.toast;
   var setPage = app.setPage;
@@ -66,7 +69,7 @@ export function SkillsPage() {
   // Load installed skills + statuses
   var loadInstalled = useCallback(function() {
     setInstalledLoading(true);
-    engineCall('/community/installed?orgId=' + getOrgId())
+    engineCall('/community/installed?orgId=' + effectiveOrgId)
       .then(function(d) {
         var items = d.installed || [];
         setInstalled(items);
@@ -162,7 +165,7 @@ export function SkillsPage() {
       var payload = isMultiField
         ? { credentials: tokenModal.fields.reduce(function(o, f) { o[f] = credFields[f].trim(); return o; }, {}) }
         : { token: tokenValue };
-      await engineCall('/oauth/authorize/' + tokenModal.skillId + '?orgId=' + getOrgId(), {
+      await engineCall('/oauth/authorize/' + tokenModal.skillId + '?orgId=' + effectiveOrgId, {
         method: 'POST',
         body: JSON.stringify(payload)
       });
@@ -183,7 +186,7 @@ export function SkillsPage() {
     try {
       await engineCall('/community/skills/' + skillId + '/' + (enable ? 'enable' : 'disable'), {
         method: 'PUT',
-        body: JSON.stringify({ orgId: getOrgId() })
+        body: JSON.stringify({ orgId: effectiveOrgId })
       });
       toast('Skill ' + (enable ? 'enabled' : 'disabled'), 'success');
       loadInstalled();
@@ -201,7 +204,7 @@ export function SkillsPage() {
     try {
       await engineCall('/community/skills/' + skillId + '/uninstall', {
         method: 'DELETE',
-        body: JSON.stringify({ orgId: getOrgId() })
+        body: JSON.stringify({ orgId: effectiveOrgId })
       });
       toast('Skill uninstalled', 'success');
       loadInstalled();
@@ -240,7 +243,7 @@ export function SkillsPage() {
     try {
       await engineCall('/community/skills/' + skillId + '/install', {
         method: 'POST',
-        body: JSON.stringify({ orgId: getOrgId() })
+        body: JSON.stringify({ orgId: effectiveOrgId })
       });
       toast('Skill installed', 'success');
       loadInstalled();
@@ -269,7 +272,7 @@ export function SkillsPage() {
 
   var loadIntegrations = useCallback(function() {
     setIntLoading(true);
-    engineCall('/integrations/catalog?orgId=' + getOrgId())
+    engineCall('/integrations/catalog?orgId=' + effectiveOrgId)
       .then(function(d) {
         setIntegrations(d.catalog || []);
         setIntCategories(d.categories || []);
@@ -302,7 +305,7 @@ export function SkillsPage() {
     setOauthSaving(false);
     // For OAuth2, check if app is already configured
     if (int.authType === 'oauth2' && int.oauthProvider) {
-      engineCall('/oauth/app-config/' + int.oauthProvider + '?orgId=' + getOrgId())
+      engineCall('/oauth/app-config/' + int.oauthProvider + '?orgId=' + effectiveOrgId)
         .then(function(d) { if (d.configured) setOauthAppConfigured(true); })
         .catch(function() {});
     }
@@ -312,14 +315,14 @@ export function SkillsPage() {
     if (!tokenModal || !tokenModal.oauthProvider) return;
     if (!oauthClientId.trim() || !oauthClientSecret.trim()) return;
     setOauthSaving(true);
-    engineCall('/oauth/app-config/' + tokenModal.oauthProvider + '?orgId=' + getOrgId(), {
+    engineCall('/oauth/app-config/' + tokenModal.oauthProvider + '?orgId=' + effectiveOrgId, {
       method: 'POST',
       body: JSON.stringify({ clientId: oauthClientId.trim(), clientSecret: oauthClientSecret.trim() })
     })
       .then(function() {
         setOauthAppConfigured(true);
         toast('OAuth app configured for ' + tokenModal.skill.name, 'success');
-        return engineCall('/oauth/authorize/' + tokenModal.skillId + '?orgId=' + getOrgId());
+        return engineCall('/oauth/authorize/' + tokenModal.skillId + '?orgId=' + effectiveOrgId);
       })
       .then(function(d) {
         if (d && (d.authUrl || d.authorizationUrl)) {
@@ -336,7 +339,7 @@ export function SkillsPage() {
 
   var launchOauthFlow = function() {
     if (!tokenModal) return;
-    engineCall('/oauth/authorize/' + tokenModal.skillId + '?orgId=' + getOrgId())
+    engineCall('/oauth/authorize/' + tokenModal.skillId + '?orgId=' + effectiveOrgId)
       .then(function(d) {
         if (d && (d.authUrl || d.authorizationUrl)) {
           var popup = window.open(d.authUrl || d.authorizationUrl, 'oauth_connect', 'width=600,height=700,popup=yes');
@@ -353,7 +356,7 @@ export function SkillsPage() {
 
   var disconnectIntegration = function(int) {
     if (!confirm('Disconnect ' + int.name + '? Agents will lose access to its tools.')) return;
-    engineCall('/oauth/disconnect/' + int.skillId + '?orgId=' + getOrgId(), { method: 'DELETE' })
+    engineCall('/oauth/disconnect/' + int.skillId + '?orgId=' + effectiveOrgId, { method: 'DELETE' })
       .then(function() { toast(int.name + ' disconnected', 'success'); loadIntegrations(); })
       .catch(function(e) { toast('Failed: ' + e.message, 'error'); });
   };
@@ -380,6 +383,7 @@ export function SkillsPage() {
   // ── Builtin Tab ──
   var renderBuiltin = function() {
     return h(Fragment, null,
+    h(orgCtx.Switcher),
       h('div', { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 } },
         h('div', { style: { position: 'relative', flex: 1, maxWidth: 320 } },
           h('input', {

package/src/dashboard/pages/task-pipeline.js

@@ -1,6 +1,7 @@
 import { h, useState, useEffect, useCallback, useRef, Fragment, useApp, engineCall, getOrgId } from '../components/utils.js';
 import { I } from '../components/icons.js';
 import { HelpButton } from '../components/help-button.js';
+import { useOrgContext } from '../components/org-switcher.js';
 
 // ─── Constants ───────────────────────────────────────────
 var NODE_W = 200;
@@ -438,6 +439,8 @@ export function TaskPipelinePage() {
   injectCSS();
   var app = useApp();
   var toast = app.toast;
+  var orgCtx = useOrgContext();
+  var effectiveOrgId = orgCtx.selectedOrgId || effectiveOrgId;
   var _tasks = useState([]);
   var tasks = _tasks[0]; var setTasks = _tasks[1];
   var _stats = useState({ created: 0, assigned: 0, inProgress: 0, completed: 0, failed: 0, cancelled: 0, total: 0, todayCompleted: 0, todayFailed: 0, todayCreated: 0, avgDurationMs: 0, totalCost: 0, totalTokens: 0, topAgents: [] });
@@ -474,7 +477,7 @@ export function TaskPipelinePage() {
     Promise.all([
       engineCall('/task-pipeline?limit=200'),
       engineCall('/task-pipeline/stats'),
-      engineCall('/agents?orgId=' + getOrgId()).catch(function() { return { agents: [] }; }),
+      engineCall('/agents?orgId=' + effectiveOrgId).catch(function() { return { agents: [] }; }),
     ]).then(function(res) {
       setTasks(res[0]?.tasks || []);
       setStats(res[1] || stats);
@@ -486,7 +489,7 @@ export function TaskPipelinePage() {
       setAgentMap(map);
     }).catch(function(err) { console.error('[TaskPipeline]', err); })
       .finally(function() { setLoading(false); });
-  }, []);
+  }, [effectiveOrgId]);
 
   // SSE
   useEffect(function() {
@@ -1074,6 +1077,7 @@ export function AgentTaskPipeline(props) {
   }
 
   return h(Fragment, null,
+    h(orgCtx.Switcher),
     active.length > 0 && h('div', { style: { marginBottom: 12 } },
       h('div', { style: { fontSize: 11, fontWeight: 600, color: STATUS_COLORS.in_progress, marginBottom: 6, display: 'flex', alignItems: 'center', gap: 4 } },
         h('div', { style: { width: 6, height: 6, borderRadius: '50%', background: STATUS_COLORS.in_progress, animation: 'flowPulse 2s infinite' } }),

package/src/dashboard/pages/users.js

@@ -5,7 +5,7 @@ import { HelpButton } from '../components/help-button.js';
 
 // ─── Permission Editor Component ───────────────────
 
-function PermissionEditor({ userId, userName, currentPerms, pageRegistry, onSave, onClose }) {
+function PermissionEditor({ userId, userName, currentPerms, pageRegistry, onSave, onClose, userObj }) {
   // Deep clone perms (skip _allowedAgents from page grants)
   var [grants, setGrants] = useState(function() {
     if (currentPerms === '*') {
@@ -34,8 +34,13 @@ function PermissionEditor({ userId, userName, currentPerms, pageRegistry, onSave
     return (currentPerms || {})._allowedAgents === '*' || !(currentPerms || {})._allowedAgents;
   });
 
+  // Client org assignment
+  var [permOrgs, setPermOrgs] = useState([]);
+  var [userOrgId, setUserOrgId] = useState((userObj && userObj.clientOrgId) || '');
+
   useEffect(function() {
     apiCall('/agents').then(function(d) { setAgents(d.agents || d || []); }).catch(function() {});
+    apiCall('/organizations').then(function(d) { setPermOrgs(d.organizations || []); }).catch(function() {});
   }, []);
   var [saving, setSaving] = useState(false);
   var [expandedPage, setExpandedPage] = useState(null);
@@ -415,8 +420,9 @@ export function UsersPage() {
   var toast = app.toast;
   var [users, setUsers] = useState([]);
   var [creating, setCreating] = useState(false);
-  var [form, setForm] = useState({ email: '', password: '', name: '', role: 'viewer', permissions: '*' });
+  var [form, setForm] = useState({ email: '', password: '', name: '', role: 'viewer', permissions: '*', clientOrgId: '' });
   var [resetTarget, setResetTarget] = useState(null);
+  var [clientOrgs, setClientOrgs] = useState([]);
   var [newPassword, setNewPassword] = useState('');
   var [resetting, setResetting] = useState(false);
   var [permTarget, setPermTarget] = useState(null);    // user object for permission editing
@@ -427,6 +433,7 @@ export function UsersPage() {
   useEffect(function() {
     load();
     apiCall('/page-registry').then(function(d) { setPageRegistry(d); }).catch(function() {});
+    apiCall('/organizations').then(function(d) { setClientOrgs(d.organizations || []); }).catch(function() {});
   }, []);
 
   var generateCreatePassword = function() {
@@ -442,9 +449,10 @@ export function UsersPage() {
     try {
       var body = { email: form.email, password: form.password, name: form.name, role: form.role };
       if (form.permissions !== '*') body.permissions = form.permissions;
+      if (form.clientOrgId) body.clientOrgId = form.clientOrgId;
       await apiCall('/users', { method: 'POST', body: JSON.stringify(body) });
       toast('User created. They will be prompted to set a new password on first login.', 'success');
-      setCreating(false); setForm({ email: '', password: '', name: '', role: 'viewer', permissions: '*' }); setShowCreatePerms(false); load();
+      setCreating(false); setForm({ email: '', password: '', name: '', role: 'viewer', permissions: '*', clientOrgId: '' }); setShowCreatePerms(false); load();
     } catch (e) { toast(e.message, 'error'); }
   };
 
@@ -566,6 +574,17 @@ export function UsersPage() {
         )
       ),
       h('div', { className: 'form-group' }, h('label', { className: 'form-label' }, 'Role'), h('select', { className: 'input', value: form.role, onChange: function(e) { setForm(function(f) { return Object.assign({}, f, { role: e.target.value }); }); } }, h('option', { value: 'viewer' }, 'Viewer'), h('option', { value: 'member' }, 'Member'), h('option', { value: 'admin' }, 'Admin'), h('option', { value: 'owner' }, 'Owner'))),
+      // Client organization assignment
+      clientOrgs.length > 0 && h('div', { className: 'form-group' },
+        h('label', { className: 'form-label' }, 'Client Organization'),
+        h('select', { className: 'input', value: form.clientOrgId, onChange: function(e) { setForm(function(f) { return Object.assign({}, f, { clientOrgId: e.target.value }); }); } },
+          h('option', { value: '' }, 'None (internal user)'),
+          clientOrgs.filter(function(o) { return o.is_active !== false; }).map(function(o) {
+            return h('option', { key: o.id, value: o.id }, o.name);
+          })
+        ),
+        h('div', { style: { fontSize: 11, color: 'var(--text-muted)', marginTop: 4 } }, 'Assigning to a client org restricts this user to only see that organization\'s agents and data.')
+      ),
       // Inline permissions for member/viewer
       (form.role === 'member' || form.role === 'viewer') && h('div', { style: { marginTop: 4 } },
         h('div', { style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between' } },
@@ -700,7 +719,7 @@ export function UsersPage() {
       h('div', { className: 'card-body-flush' },
         users.length === 0 ? h('div', { style: { padding: 24, textAlign: 'center', color: 'var(--text-muted)' } }, 'No users')
         : h('table', null,
-            h('thead', null, h('tr', null, h('th', null, 'Name'), h('th', null, 'Email'), h('th', null, 'Role'), h('th', null, 'Status'), h('th', null, 'Access'), h('th', null, '2FA'), h('th', null, 'Created'), h('th', { style: { width: 200 } }, 'Actions'))),
+            h('thead', null, h('tr', null, h('th', null, 'Name'), h('th', null, 'Email'), h('th', null, 'Role'), h('th', null, 'Organization'), h('th', null, 'Status'), h('th', null, 'Access'), h('th', null, '2FA'), h('th', null, 'Created'), h('th', { style: { width: 240 } }, 'Actions'))),
             h('tbody', null, users.map(function(u) {
               var isRestricted = u.role === 'member' || u.role === 'viewer';
               var isDeactivated = u.isActive === false;
@@ -709,6 +728,10 @@ export function UsersPage() {
                 h('td', null, h('strong', null, u.name || '-')),
                 h('td', null, h('span', { style: { fontFamily: 'var(--font-mono)', fontSize: 12 } }, u.email)),
                 h('td', null, h('span', { className: 'badge badge-' + (u.role === 'owner' ? 'warning' : u.role === 'admin' ? 'primary' : 'neutral') }, u.role)),
+                h('td', null, (function() {
+                  var org = u.clientOrgId && clientOrgs.find(function(o) { return o.id === u.clientOrgId; });
+                  return org ? h('span', { className: 'badge badge-info', style: { fontSize: 10 } }, org.name) : h('span', { style: { color: 'var(--text-muted)', fontSize: 11 } }, 'Internal');
+                })()),
                 h('td', null, isDeactivated
                   ? h('span', { className: 'badge badge-danger', style: { fontSize: 10 } }, 'Deactivated')
                   : h('span', { className: 'badge badge-success', style: { fontSize: 10 } }, 'Active')
@@ -725,6 +748,13 @@ export function UsersPage() {
                       style: !isRestricted ? { opacity: 0.4 } : {}
                     }, I.shield()),
                     h('button', { className: 'btn btn-ghost btn-sm', title: 'Reset Password', onClick: function() { setResetTarget(u); setNewPassword(''); } }, I.lock()),
+                    // Impersonate (owner-only, not self)
+                    !isSelf && app.user && app.user.role === 'owner' && !isDeactivated && h('button', {
+                      className: 'btn btn-ghost btn-sm',
+                      title: 'View as ' + (u.name || u.email),
+                      onClick: function() { if (app.startImpersonation) app.startImpersonation(u.id); },
+                      style: { color: 'var(--primary)' }
+                    }, I.agents()),
                     // Deactivate / Reactivate
                     !isSelf && h('button', {
                       className: 'btn btn-ghost btn-sm',

package/src/dashboard/pages/workforce.js

@@ -2,8 +2,11 @@ import { h, useState, useEffect, useCallback, Fragment, useApp, engineCall, buil
 import { I } from '../components/icons.js';
 import { TimezoneSelect } from '../components/timezones.js';
 import { HelpButton } from '../components/help-button.js';
+import { useOrgContext } from '../components/org-switcher.js';
 
 export function WorkforcePage() {
+  var orgCtx = useOrgContext();
+  var effectiveOrgId = orgCtx.selectedOrgId || getOrgId();
   const { toast } = useApp();
   const [tab, setTab] = useState('overview');
   const [status, setStatus] = useState(null);
@@ -44,7 +47,7 @@ export function WorkforcePage() {
       setSchedules(schedulesRes.schedules || []);
       setBudgetData(budgetRes);
       setClockRecords(recordsRes.records || []);
-      engineCall('/agents?orgId=' + getOrgId()).then(d => setAgents(d.agents || [])).catch(() => {});
+      engineCall('/agents?orgId=' + effectiveOrgId).then(d => setAgents(d.agents || [])).catch(() => {});
     } catch (err) { toast('Failed to load workforce data', 'error'); }
     setLoading(false);
   };
@@ -251,6 +254,7 @@ export function WorkforcePage() {
   var _tip = { marginTop: 12, padding: 12, background: 'var(--bg-secondary, #1e293b)', borderRadius: 'var(--radius, 8px)', fontSize: 13 };
 
   return h('div', { className: 'page-inner' },
+    h(orgCtx.Switcher),
     h('div', { className: 'page-header' },
       h('h1', { style: { display: 'flex', alignItems: 'center' } }, 'Workforce Management', h(HelpButton, { label: 'Workforce Management' },
         h('p', null, 'Manage your agents like employees — set work schedules, assign tasks, track budgets, and monitor clock-in/out history.'),

package/src/db/adapter.ts

@@ -68,6 +68,7 @@ export interface User {
   permissions?: any;         // '*' or { pageId: true | string[] }
   mustResetPassword?: boolean;
   isActive?: boolean;
+  clientOrgId?: string | null;
   createdAt: Date;
   updatedAt: Date;
   lastLoginAt?: Date;

package/src/db/postgres.ts

@@ -192,6 +192,8 @@ export class PostgresAdapter extends DatabaseAdapter {
         ALTER TABLE users ADD COLUMN IF NOT EXISTS permissions JSONB DEFAULT '"*"';
         ALTER TABLE users ADD COLUMN IF NOT EXISTS must_reset_password BOOLEAN DEFAULT FALSE;
         ALTER TABLE users ADD COLUMN IF NOT EXISTS is_active BOOLEAN DEFAULT TRUE;
+        ALTER TABLE users ADD COLUMN IF NOT EXISTS client_org_id TEXT;
+        ALTER TABLE agents ADD COLUMN IF NOT EXISTS billing_rate NUMERIC(10,2) DEFAULT 0;
       `).catch(() => {});
       // ─── Client Organizations ────────────────────────────
       await client.query(`
@@ -757,6 +759,7 @@ export class PostgresAdapter extends DatabaseAdapter {
       permissions: r.permissions != null ? (typeof r.permissions === 'string' ? (() => { try { return JSON.parse(r.permissions); } catch { return '*'; } })() : r.permissions) : '*',
       mustResetPassword: !!r.must_reset_password,
       isActive: r.is_active !== false && r.is_active !== 0, // default true
+      clientOrgId: r.client_org_id || null,
       createdAt: new Date(r.created_at), updatedAt: new Date(r.updated_at),
       lastLoginAt: r.last_login_at ? new Date(r.last_login_at) : undefined,
     };

package/src/db/sqlite.ts

@@ -63,6 +63,8 @@ export class SqliteAdapter extends DatabaseAdapter {
       try { this.db.exec(`ALTER TABLE users ADD COLUMN permissions TEXT DEFAULT '"*"'`); } catch { /* exists */ }
       try { this.db.exec(`ALTER TABLE users ADD COLUMN must_reset_password INTEGER DEFAULT 0`); } catch { /* exists */ }
       try { this.db.exec(`ALTER TABLE users ADD COLUMN is_active INTEGER DEFAULT 1`); } catch { /* exists */ }
+      try { this.db.exec(`ALTER TABLE users ADD COLUMN client_org_id TEXT`); } catch { /* exists */ }
+      try { this.db.exec(`ALTER TABLE agents ADD COLUMN billing_rate REAL DEFAULT 0`); } catch { /* exists */ }
       // ─── Client Organizations ────────────────────────────
       this.db.exec(`
         CREATE TABLE IF NOT EXISTS client_organizations (
@@ -433,6 +435,11 @@ export class SqliteAdapter extends DatabaseAdapter {
     return {
       id: r.id, email: r.email, name: r.name, role: r.role,
       passwordHash: r.password_hash, ssoProvider: r.sso_provider, ssoSubject: r.sso_subject,
+      totpSecret: r.totp_secret, totpEnabled: !!r.totp_enabled, totpBackupCodes: r.totp_backup_codes,
+      permissions: r.permissions != null ? (typeof r.permissions === 'string' ? (() => { try { return JSON.parse(r.permissions); } catch { return '*'; } })() : r.permissions) : '*',
+      mustResetPassword: !!r.must_reset_password,
+      isActive: r.is_active !== 0 && r.is_active !== false,
+      clientOrgId: r.client_org_id || null,
       createdAt: new Date(r.created_at), updatedAt: new Date(r.updated_at),
       lastLoginAt: r.last_login_at ? new Date(r.last_login_at) : undefined,
     };