@agenticmail/enterprise 0.5.301 → 0.5.302

package/dist/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/dist/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/dist/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/enterprise",
-  "version": "0.5.301",
+  "version": "0.5.302",
   "description": "AgenticMail Enterprise — cloud-hosted AI agent identity, email, auth & compliance for organizations",
   "type": "module",
   "bin": {

package/src/dashboard/components/org-switcher.js

@@ -0,0 +1,96 @@
+import { h, useState, useEffect, Fragment, apiCall } from './utils.js';
+import { I } from './icons.js';
+
+/**
+ * OrgContextSwitcher — Global org context picker for multi-tenant pages.
+ *
+ * Props:
+ *   onOrgChange(orgId, org) — called when org selection changes
+ *   selectedOrgId — currently selected org ID ('' = my org)
+ *   style — optional container style override
+ *   showLabel — show "Viewing:" label (default true)
+ *
+ * The component loads client_organizations from the API and renders a
+ * compact dropdown that switches between "My Organization" and client orgs.
+ */
+export function OrgContextSwitcher(props) {
+  var onOrgChange = props.onOrgChange;
+  var selectedOrgId = props.selectedOrgId || '';
+  var showLabel = props.showLabel !== false;
+  var style = props.style || {};
+
+  var _orgs = useState([]);
+  var orgs = _orgs[0]; var setOrgs = _orgs[1];
+  var _loaded = useState(false);
+  var loaded = _loaded[0]; var setLoaded = _loaded[1];
+
+  useEffect(function() {
+    apiCall('/organizations').then(function(d) {
+      setOrgs(d.organizations || []);
+      setLoaded(true);
+    }).catch(function() { setLoaded(true); });
+  }, []);
+
+  // Don't render if no client orgs exist
+  if (loaded && orgs.length === 0) return null;
+  if (!loaded) return null;
+
+  var selectedOrg = orgs.find(function(o) { return o.id === selectedOrgId; });
+
+  return h('div', {
+    style: Object.assign({
+      display: 'flex', alignItems: 'center', gap: 10, padding: '8px 14px',
+      background: 'var(--bg-tertiary)', borderRadius: 'var(--radius, 8px)',
+      marginBottom: 16, fontSize: 13
+    }, style)
+  },
+    showLabel && h('span', { style: { color: 'var(--text-muted)', fontWeight: 600, whiteSpace: 'nowrap' } }, I.building(), ' Viewing:'),
+    h('select', {
+      value: selectedOrgId,
+      onChange: function(e) {
+        var id = e.target.value;
+        var org = orgs.find(function(o) { return o.id === id; });
+        onOrgChange(id, org || null);
+      },
+      style: {
+        padding: '6px 10px', borderRadius: 6, border: '1px solid var(--border)',
+        background: 'var(--bg-card)', color: 'var(--text)', fontSize: 13,
+        cursor: 'pointer', fontWeight: 600, flex: 1, maxWidth: 300
+      }
+    },
+      h('option', { value: '' }, 'My Organization'),
+      orgs.filter(function(o) { return o.is_active !== false; }).map(function(o) {
+        return h('option', { key: o.id, value: o.id }, o.name + (o.billing_rate_per_agent > 0 ? ' (' + (o.currency || 'USD') + ' ' + parseFloat(o.billing_rate_per_agent).toFixed(0) + '/agent)' : ''));
+      })
+    ),
+    selectedOrg && h('span', { style: { fontSize: 11, color: 'var(--text-muted)' } },
+      selectedOrg.contact_name ? selectedOrg.contact_name : '',
+      selectedOrg.contact_email ? ' \u2022 ' + selectedOrg.contact_email : ''
+    )
+  );
+}
+
+/**
+ * useOrgContext — Hook that provides org switching state.
+ * Returns [selectedOrgId, selectedOrg, onOrgChange, OrgSwitcher component]
+ */
+export function useOrgContext() {
+  var _sel = useState('');
+  var selectedOrgId = _sel[0]; var setSelectedOrgId = _sel[1];
+  var _org = useState(null);
+  var selectedOrg = _org[0]; var setSelectedOrg = _org[1];
+
+  var onOrgChange = function(id, org) {
+    setSelectedOrgId(id);
+    setSelectedOrg(org);
+  };
+
+  var Switcher = function(extraProps) {
+    return h(OrgContextSwitcher, Object.assign({
+      selectedOrgId: selectedOrgId,
+      onOrgChange: onOrgChange
+    }, extraProps || {}));
+  };
+
+  return { selectedOrgId: selectedOrgId, selectedOrg: selectedOrg, onOrgChange: onOrgChange, Switcher: Switcher };
+}

package/src/dashboard/pages/agents.js

@@ -3,6 +3,7 @@ import { I } from '../components/icons.js';
 import { E } from '../assets/icons/emoji-icons.js';
 import { CULTURES, LANGUAGES, PersonaForm } from '../components/persona-fields.js';
 import { HelpButton } from '../components/help-button.js';
+import { useOrgContext } from '../components/org-switcher.js';
 
 // ════════════════════════════════════════════════════════════
 // DEPLOY MODAL
@@ -1127,6 +1128,7 @@ export function CreateAgentWizard({ onClose, onCreated, toast }) {
 export function AgentsPage({ onSelectAgent }) {
   const app = useApp();
   const toast = app.toast;
+  var orgCtx = useOrgContext();
   const [agents, setAgents] = useState([]);
   const [creating, setCreating] = useState(false);
 
@@ -1138,9 +1140,13 @@ export function AgentsPage({ onSelectAgent }) {
     if (allowedAgents !== '*' && Array.isArray(allowedAgents)) {
       all = all.filter(a => allowedAgents.indexOf(a.id) >= 0);
     }
+    // Filter by selected org context
+    if (orgCtx.selectedOrgId) {
+      all = all.filter(a => a.client_org_id === orgCtx.selectedOrgId);
+    }
     setAgents(all);
   }).catch(() => {});
-  useEffect(() => { load(); }, []);
+  useEffect(() => { load(); }, [orgCtx.selectedOrgId]);
 
   // Delete moved to agent detail overview tab with triple confirmation
 
@@ -1149,6 +1155,7 @@ export function AgentsPage({ onSelectAgent }) {
   var _tip = { marginTop: 12, padding: 12, background: 'var(--bg-secondary, #1e293b)', borderRadius: 'var(--radius, 8px)', fontSize: 13 };
 
   return h(Fragment, null,
+    h(orgCtx.Switcher),
     h('div', { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 20 } },
       h('div', null, h('h1', { style: { fontSize: 20, fontWeight: 700, display: 'flex', alignItems: 'center' } }, 'Agents', h(HelpButton, { label: 'Agents' },
         h('p', null, 'Your AI workforce. Each agent has its own email identity, personality, skills, permissions, and deployment target.'),

package/src/dashboard/pages/approvals.js

@@ -1,8 +1,11 @@
 import { h, useState, useEffect, Fragment, useApp, engineCall, showConfirm, buildAgentEmailMap, buildAgentDataMap, resolveAgentEmail, 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 ApprovalsPage() {
+  var orgCtx = useOrgContext();
+  var effectiveOrgId = orgCtx.selectedOrgId || getOrgId();
   const { toast } = useApp();
   const [pending, setPending] = useState([]);
   const [history, setHistory] = useState([]);
@@ -13,7 +16,7 @@ export function ApprovalsPage() {
   const load = () => {
     engineCall('/approvals/pending').then(d => setPending(d.requests || [])).catch(() => {});
     engineCall('/approvals/history?limit=50').then(d => setHistory(d.requests || [])).catch(() => {});
-    engineCall('/agents?orgId=' + getOrgId()).then(d => setAgents(d.agents || [])).catch(() => {});
+    engineCall('/agents?orgId=' + effectiveOrgId).then(d => setAgents(d.agents || [])).catch(() => {});
   };
   useEffect(() => { load(); }, []);
 
@@ -33,6 +36,7 @@ export function ApprovalsPage() {
   var _tip = { marginTop: 12, padding: 12, background: 'var(--bg-secondary, #1e293b)', borderRadius: 'var(--radius, 8px)', fontSize: 13 };
 
   return h(Fragment, null,
+    h(orgCtx.Switcher),
     h('div', { style: { marginBottom: 20 } },
       h('h1', { style: { fontSize: 20, fontWeight: 700, display: 'flex', alignItems: 'center' } }, 'Approvals', h(HelpButton, { label: 'Approvals' },
         h('p', null, 'The human-in-the-loop checkpoint. When agents attempt sensitive actions (based on your permission settings), they pause and wait for your approval here.'),

package/src/dashboard/pages/dashboard.js

@@ -2,6 +2,7 @@ import { h, useState, useEffect, Fragment, buildAgentEmailMap, buildAgentDataMap
 import { I } from '../components/icons.js';
 import { DetailModal } from '../components/modal.js';
 import { HelpButton } from '../components/help-button.js';
+import { useOrgContext } from '../components/org-switcher.js';
 
 export function SetupChecklist({ onNavigate }) {
   const [status, setStatus] = useState(null);
@@ -46,6 +47,8 @@ export function SetupChecklist({ onNavigate }) {
 }
 
 export function DashboardPage() {
+  var orgCtx = useOrgContext();
+  var effectiveOrgId = orgCtx.selectedOrgId || effectiveOrgId;
   const [stats, setStats] = useState(null);
   const [agents, setAgents] = useState([]);
   const [events, setEvents] = useState([]);
@@ -58,9 +61,9 @@ export function DashboardPage() {
   useEffect(() => {
     apiCall('/stats').then(setStats).catch(() => {});
     apiCall('/agents').then(d => setAgents(d.agents || d || [])).catch(() => {});
-    engineCall('/agents?orgId=' + getOrgId()).then(d => setEngineAgents(d.agents || [])).catch(() => {});
+    engineCall('/agents?orgId=' + effectiveOrgId).then(d => setEngineAgents(d.agents || [])).catch(() => {});
     engineCall('/activity/events?limit=10').then(d => setEvents(d.events || [])).catch(() => {});
-  }, []);
+  }, [effectiveOrgId]);
 
   // Merge admin + engine agents; engine agents (appended last) win in the data map
   var mergedForMap = [].concat(agents, engineAgents);
@@ -73,6 +76,7 @@ export function DashboardPage() {
   var _tip = { marginTop: 12, padding: 12, background: 'var(--bg-secondary, #1e293b)', borderRadius: 'var(--radius, 8px)', fontSize: 13 };
 
   return h(Fragment, null,
+    h(orgCtx.Switcher),
     h(SetupChecklist, { onNavigate: function(pg) { if (navTo) navTo(pg); } }),
     h('div', { className: 'stat-grid' },
       h('div', { className: 'stat-card' }, h('div', { className: 'stat-label', style: { display: 'flex', alignItems: 'center' } }, 'Total Agents', h(HelpButton, { label: 'Total Agents' },

package/src/dashboard/pages/guardrails.js

@@ -1,6 +1,7 @@
 import { h, useState, useEffect, useCallback, 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';
 
 // ─── Constants ──────────────────────────────────────────
 
@@ -93,6 +94,8 @@ function EmptyState(props) {
 // ─── Main Page ──────────────────────────────────────────
 
 export function GuardrailsPage() {
+  var orgCtx = useOrgContext();
+  var effectiveOrgId = orgCtx.selectedOrgId || getOrgId();
   var app = useApp();
   var toast = app.toast;
   var tab = useState('overview');
@@ -101,7 +104,7 @@ export function GuardrailsPage() {
   var _ag = useState([]);
   var agents = _ag[0]; var setAgents = _ag[1];
   useEffect(function() {
-    engineCall('/agents?orgId=' + getOrgId()).then(function(d) { setAgents(d.agents || []); }).catch(function() {});
+    engineCall('/agents?orgId=' + effectiveOrgId).then(function(d) { setAgents(d.agents || []); }).catch(function() {});
   }, []);
 
   var TABS = [
@@ -164,8 +167,8 @@ function OverviewTab(props) {
   var load = function() {
     setLoading(true);
     Promise.all([
-      engineCall('/guardrails/interventions?orgId=' + getOrgId() + '&limit=10').catch(function() { return { interventions: [] }; }),
-      engineCall('/policies?orgId=' + getOrgId()).catch(function() { return { policies: [] }; }),
+      engineCall('/guardrails/interventions?orgId=' + effectiveOrgId + '&limit=10').catch(function() { return { interventions: [] }; }),
+      engineCall('/policies?orgId=' + effectiveOrgId).catch(function() { return { policies: [] }; }),
       engineCall('/onboarding/org/default').catch(function() { return { progress: [] }; }),
     ]).then(function(res) {
       setInterventions(res[0].interventions || []);
@@ -203,6 +206,7 @@ function OverviewTab(props) {
   var typeColor = function(t) { return t === 'kill' ? '#ef4444' : t === 'pause' ? '#f59e0b' : t === 'resume' ? '#15803d' : '#0ea5e9'; };
 
   return h(Fragment, null,
+    h(orgCtx.Switcher),
     // Quick action bar
     h('div', { className: 'card', style: { marginBottom: 16 } },
       h('div', { className: 'card-body', style: { display: 'flex', gap: 8, alignItems: 'center', flexWrap: 'wrap' } },
@@ -282,17 +286,17 @@ function PoliciesTab() {
   var editPolicy = _edit[0]; var setEditPolicy = _edit[1];
   var _exp = useState(null);
   var expanded = _exp[0]; var setExpanded = _exp[1];
-  var _form = useState({ orgId: getOrgId(), name: '', category: 'code_of_conduct', description: '', content: '', priority: 0, enforcement: 'mandatory', appliesTo: ['*'], tags: [], enabled: true });
+  var _form = useState({ orgId: effectiveOrgId, name: '', category: 'code_of_conduct', description: '', content: '', priority: 0, enforcement: 'mandatory', appliesTo: ['*'], tags: [], enabled: true });
   var form = _form[0]; var setForm = _form[1];
 
   var load = function() {
-    engineCall('/policies?orgId=' + getOrgId()).then(function(d) { setPolicies(d.policies || []); }).catch(function() {});
+    engineCall('/policies?orgId=' + effectiveOrgId).then(function(d) { setPolicies(d.policies || []); }).catch(function() {});
   };
   useEffect(load, []);
 
   var openCreate = function() {
     setEditPolicy(null);
-    setForm({ orgId: getOrgId(), name: '', category: 'code_of_conduct', description: '', content: '', priority: 0, enforcement: 'mandatory', appliesTo: ['*'], tags: [], enabled: true });
+    setForm({ orgId: effectiveOrgId, name: '', category: 'code_of_conduct', description: '', content: '', priority: 0, enforcement: 'mandatory', appliesTo: ['*'], tags: [], enabled: true });
     setShowModal(true);
   };
   var openEdit = function(p) {
@@ -314,7 +318,7 @@ function PoliciesTab() {
       .catch(function(e) { toast(e.message, 'error'); });
   };
   var applyDefaults = function() {
-    engineCall('/policies/templates/apply', { method: 'POST', body: JSON.stringify({ orgId: getOrgId(), createdBy: 'admin' }) })
+    engineCall('/policies/templates/apply', { method: 'POST', body: JSON.stringify({ orgId: effectiveOrgId, createdBy: 'admin' }) })
       .then(function(d) { toast('Applied ' + (d.policies ? d.policies.length : 0) + ' default templates', 'success'); load(); })
       .catch(function(e) { toast(e.message, 'error'); });
   };
@@ -451,7 +455,7 @@ function OnboardingTab(props) {
 
   var initiate = function() {
     if (!initAgentId) { toast('Enter an agent ID', 'error'); return; }
-    engineCall('/onboarding/initiate/' + initAgentId, { method: 'POST', body: JSON.stringify({ orgId: getOrgId() }) })
+    engineCall('/onboarding/initiate/' + initAgentId, { method: 'POST', body: JSON.stringify({ orgId: effectiveOrgId }) })
       .then(function() { toast('Onboarding initiated', 'success'); setInitAgentId(''); load(); })
       .catch(function(e) { toast(e.message, 'error'); });
   };
@@ -461,7 +465,7 @@ function OnboardingTab(props) {
       .catch(function(e) { toast(e.message, 'error'); });
   };
   var checkChanges = function() {
-    engineCall('/onboarding/check-changes', { method: 'POST', body: JSON.stringify({ orgId: getOrgId() }) })
+    engineCall('/onboarding/check-changes', { method: 'POST', body: JSON.stringify({ orgId: effectiveOrgId }) })
       .then(function(d) {
         var stale = d.staleAgents || [];
         if (stale.length === 0) { toast('All agents up to date', 'success'); }
@@ -555,7 +559,7 @@ function MemoryTab(props) {
   var showCreate = _show[0]; var setShowCreate = _show[1];
   var _exp = useState(null);
   var expanded = _exp[0]; var setExpanded = _exp[1];
-  var _form = useState({ agentId: '', orgId: getOrgId(), category: 'org_knowledge', title: '', content: '', source: 'admin', importance: 'normal', tags: [] });
+  var _form = useState({ agentId: '', orgId: effectiveOrgId, category: 'org_knowledge', title: '', content: '', source: 'admin', importance: 'normal', tags: [] });
   var form = _form[0]; var setForm = _form[1];
 
   var loadMemories = function(aid) {
@@ -762,13 +766,13 @@ function RulesTab(props) {
   var _showAnomaly = useState(false);
   var showAnomalyModal = _showAnomaly[0]; var setShowAnomalyModal = _showAnomaly[1];
   var _form = useState({
-    orgId: getOrgId(), name: '', description: '', category: 'anomaly', ruleType: 'threshold',
+    orgId: effectiveOrgId, name: '', description: '', category: 'anomaly', ruleType: 'threshold',
     conditions: { threshold: 10, windowMinutes: 60 },
     action: 'alert', severity: 'medium', cooldownMinutes: 15, enabled: true
   });
   var form = _form[0]; var setForm = _form[1];
   var _anomalyForm = useState({
-    orgId: getOrgId(), name: '', ruleType: 'error_rate',
+    orgId: effectiveOrgId, name: '', ruleType: 'error_rate',
     config: { maxErrorsPerHour: 50, windowMinutes: 60 }, action: 'pause', enabled: true
   });
   var anomalyForm = _anomalyForm[0]; var setAnomalyForm = _anomalyForm[1];
@@ -777,9 +781,9 @@ function RulesTab(props) {
 
   var load = function() {
     Promise.all([
-      engineCall('/guardrails/rules?orgId=' + getOrgId()).catch(function() { return { rules: [] }; }),
-      engineCall('/anomaly-rules?orgId=' + getOrgId()).catch(function() { return { rules: [] }; }),
-      engineCall('/guardrails/interventions?orgId=' + getOrgId() + '&limit=50').catch(function() { return { interventions: [] }; }),
+      engineCall('/guardrails/rules?orgId=' + effectiveOrgId).catch(function() { return { rules: [] }; }),
+      engineCall('/anomaly-rules?orgId=' + effectiveOrgId).catch(function() { return { rules: [] }; }),
+      engineCall('/guardrails/interventions?orgId=' + effectiveOrgId + '&limit=50').catch(function() { return { interventions: [] }; }),
     ]).then(function(res) {
       setRules(res[0].rules || []);
       setAnomalyRules(res[1].rules || []);
@@ -791,7 +795,7 @@ function RulesTab(props) {
   // Guardrail rules CRUD
   var openCreateRule = function() {
     setEditRule(null);
-    setForm({ orgId: getOrgId(), name: '', description: '', category: 'anomaly', ruleType: 'threshold', conditions: { threshold: 10, windowMinutes: 60 }, action: 'alert', severity: 'medium', cooldownMinutes: 15, enabled: true });
+    setForm({ orgId: effectiveOrgId, name: '', description: '', category: 'anomaly', ruleType: 'threshold', conditions: { threshold: 10, windowMinutes: 60 }, action: 'alert', severity: 'medium', cooldownMinutes: 15, enabled: true });
     setShowModal(true);
   };
   var openEditRule = function(r) {

package/src/dashboard/pages/journal.js

@@ -1,8 +1,11 @@
 import { h, useState, useEffect, Fragment, useApp, engineCall, buildAgentEmailMap, buildAgentDataMap, resolveAgentEmail, 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 JournalPage() {
+  var orgCtx = useOrgContext();
+  var effectiveOrgId = orgCtx.selectedOrgId || getOrgId();
   const { toast } = useApp();
   const [entries, setEntries] = useState([]);
   const [total, setTotal] = useState(0);
@@ -11,9 +14,9 @@ export function JournalPage() {
   const [agents, setAgents] = useState([]);
 
   const load = () => {
-    engineCall('/journal?orgId=' + getOrgId() + '&limit=50').then(d => { setEntries(d.entries || []); setTotal(d.total || 0); }).catch(() => {});
+    engineCall('/journal?orgId=' + effectiveOrgId + '&limit=50').then(d => { setEntries(d.entries || []); setTotal(d.total || 0); }).catch(() => {});
     engineCall('/journal/stats/default').then(d => setStats(d)).catch(() => {});
-    engineCall('/agents?orgId=' + getOrgId()).then(d => setAgents(d.agents || [])).catch(() => {});
+    engineCall('/agents?orgId=' + effectiveOrgId).then(d => setAgents(d.agents || [])).catch(() => {});
   };
   useEffect(load, []);
 
@@ -29,6 +32,7 @@ export function JournalPage() {
   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' } }, 'Action Journal', h(HelpButton, { label: 'Action Journal' },
       h('p', null, 'A tamper-proof log of every action agents have taken. Think of it as an audit trail — every tool call, every side effect, recorded with full context.'),
       h('h4', { style: _h4 }, 'Why it matters'),