fraim 2.0.183 → 2.0.185

package/public/ai-hub/script.js

@@ -668,10 +668,16 @@ function stripReviewHandoffBlocks(text) {
     .trim();
 }
 
-function stripHubInjectedPromptBlocks(text) {
+function stripHubInjectedNotes(text) {
   return String(text || '')
     .replace(/(?:^|\n)\s*\[How to talk to me\][\s\S]*?(?=\n\s*\[[^\]\n]+\]|\n\s*#{1,6}\s|\n\s*[-*]\s|\n{2,}|$)/gi, '\n')
-    .replace(/(?:^|\n)\s*(?:[$/]fraim)\s+[a-z0-9-]+(?:\s*\[[^\]\n]*\])?[^\n]*(?=\n|$)/gi, '\n')
+    .replace(/\n{3,}/g, '\n\n')
+    .trim();
+}
+
+function stripHubInjectedPromptBlocks(text) {
+  return stripHubInjectedNotes(text)
+    .replace(/(?:^|\n)\s*(?:[$/@]fraim)\s+[a-z0-9-]+(?:\s*\[[^\]\n]*\])?[^\n]*(?=\n|$)/gi, '\n')
     .replace(/\n{3,}/g, '\n\n')
     .trim();
 }
@@ -833,11 +839,9 @@ function renderRail() {
   renderTeamRoster();
   els['conv-list'].innerHTML = '';
   // R4: filter by selected persona when one is active.
-  // #521: in the project workspace, project-lifecycle jobs (onboarding +
-  // sleep-on-learnings) have their own "Project Updates" home, so keep them out
-  // of the general Runs list to avoid showing the same run twice.
-  const inWorkspace = !!document.querySelector('#proj-workspace .workspace-conv');
-  const projectUpdateJobs = new Set(['project-onboarding', 'sleep-on-learnings']);
+  // #693 R1: the "Project Updates" section was retired; project-lifecycle runs
+  // (project-onboarding + sleep-on-learnings) now surface in the Runs list under
+  // their employee like any other run, so their history stays reachable.
   const allProjectConversations = projectConversations();
   const managedChildren = allProjectConversations.filter(isManagedDelegationChild);
   const childrenByManager = new Map();
@@ -850,7 +854,6 @@ function renderRail() {
   const list = allProjectConversations.filter((conv) =>
     (!state.selectedPersonaKey || conv.personaKey === state.selectedPersonaKey) &&
     !isManagedDelegationChild(conv) &&
-    !(inWorkspace && projectUpdateJobs.has(conv.jobId)) &&
     !AREA_SCOPED_JOBS.has(conv.jobId)
   );
 
@@ -880,6 +883,31 @@ function renderRail() {
     groups.get(key).conversations.push(conv);
   }
 
+  // #693 R1 (PR round 2): this Runs list is the single employees section in the
+  // workspace tree, so include every project employee — team, manager-team, and
+  // assigned — even before they have a run, so you can assign/delegate to them.
+  const tfProjId = (typeof tf !== 'undefined' && tf) ? tf.activeProjectId : null;
+  const managerTeamKeys = (state.bootstrap?.managerTeam || []).map((e) => e.personaKey).filter(Boolean);
+  // merge: master resolves the tree's employees via tfProjectTeamKeys() (hired personas),
+  // not project.team; align on it so every hired employee appears in the single section.
+  const projectEmployeeKeys = new Set([
+    ...(typeof tfProjectTeamKeys === 'function' ? tfProjectTeamKeys() : []),
+    ...(tfProjId && typeof tfProjectAssignments === 'function' ? tfProjectAssignments(tfProjId).map((a) => a.employeeKey).filter(Boolean) : []),
+    ...managerTeamKeys,
+  ]);
+  for (const key of projectEmployeeKeys) {
+    if (groups.has(key)) continue;
+    const p = typeof tfPersonaByKey === 'function' ? tfPersonaByKey(key) : null;
+    if (p && p.status !== 'hired') continue; // reconcile against real entitlements (#538 follow-up)
+    groups.set(key, {
+      key,
+      label: p ? p.displayName : key,
+      detail: p ? (p.role || 'AI Employee') : '',
+      sample: p ? { personaKey: key } : { agentName: key },
+      conversations: [],
+    });
+  }
+
   function buildRunButton(conv, options = {}) {
     const btn = document.createElement('button');
     btn.type = 'button';
@@ -993,9 +1021,33 @@ function renderRail() {
     summary.appendChild(avatar);
     summary.appendChild(copy);
     summary.appendChild(addBtn);
+    // #693 R1 (PR round 2): hire-a-human-manager (#538) affordance, ported from the
+    // retired emp-hero list. The old per-employee "Delegate" button is intentionally
+    // omitted — it did the same openPalette('/persona') as the "+" above, so it was
+    // redundant and only squeezed the employee-name column.
+    if (state.bootstrap && state.bootstrap.managerHiring && state.bootstrap.managerHiring.roles && state.bootstrap.managerHiring.roles[group.key]) {
+      const hireBtn = document.createElement('button');
+      hireBtn.type = 'button';
+      hireBtn.className = 'eh-hire-manager';
+      hireBtn.textContent = '🧑‍💼';
+      hireBtn.title = 'Find a human manager for ' + group.label;
+      hireBtn.setAttribute('aria-label', 'Find a human manager for ' + group.label);
+      hireBtn.addEventListener('click', (e) => { e.preventDefault(); e.stopPropagation(); openHireManagerModal(group.key); });
+      summary.appendChild(hireBtn);
+    }
     summary.appendChild(count);
     details.appendChild(summary);
-    details.appendChild(buildGroupList(group.conversations));
+    if (group.conversations.length) {
+      details.appendChild(buildGroupList(group.conversations));
+    } else {
+      const emptyWrap = document.createElement('div');
+      emptyWrap.className = 'conv-employee-list';
+      const em = document.createElement('div');
+      em.className = 'eh-empty';
+      em.textContent = 'No runs yet — + to assign a job.';
+      emptyWrap.appendChild(em);
+      details.appendChild(emptyWrap);
+    }
     els['conv-list'].appendChild(details);
   }
 
@@ -1010,9 +1062,11 @@ function renderRail() {
     wcDetails.open = true;
     const wcSummary = document.createElement('summary');
     wcSummary.className = 'conv-employee-tab';
-    // R4: dashed-border avatar placeholder — no image or initials.
+    // #693.8: watercooler icon (replaces the blank dashed placeholder).
     const wcAvatar = document.createElement('span');
-    wcAvatar.className = 'conv-employee-avatar conv-employee-avatar--adhoc';
+    wcAvatar.className = 'conv-employee-avatar conv-employee-avatar--watercooler';
+    wcAvatar.setAttribute('aria-hidden', 'true');
+    wcAvatar.innerHTML = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="7" y="2.5" width="10" height="6" rx="1.2"></rect><path d="M8.5 8.5h7v9a2 2 0 0 1-2 2h-3a2 2 0 0 1-2-2z"></path><line x1="9.5" y1="21.5" x2="14.5" y2="21.5"></line></svg>';
     const wcCopy = document.createElement('span');
     wcCopy.className = 'conv-employee-tab-copy';
     const wcLabel = document.createElement('strong');
@@ -2628,8 +2682,8 @@ function closeTemplatePopover() {
 }
 
 function applyTemplateInvocation(managerJobId) {
-  // The invocation prefix ($fraim / /fraim) is an implementation detail that
-  // the server adds based on the active employee — the user should never see it.
+  // The server adds the invocation prefix based on the active employee. Keep
+  // that syntax out of the editable textarea; the thread shows it after send.
   // Store the job ID as a pending coaching job. The #coach-note shows a
   // human-readable label; the textarea gets editable context the user can amend.
   // When the user clicks Send, continueRun sends { coachingJobId, instructions }.
@@ -2638,7 +2692,7 @@ function applyTemplateInvocation(managerJobId) {
   // for sessions that stored raw invocation text before this change).
   const textarea = els['coach-text'];
   textarea.value = textarea.value
-    .replace(/(?:^|\n|\s)[/$]fraim\s+[a-z0-9-]+(?:\s|$)/ig, ' ')
+    .replace(/(?:^|\n|\s)[$/@]fraim\s+[a-z0-9-]+(?:\s|$)/ig, ' ')
     .replace(/\s+/g, ' ')
     .trim();
   textarea.focus();
@@ -2677,17 +2731,20 @@ function stripStubReference(text) {
 }
 
 function surfaceText(role, text, conv) {
-  const raw = stripHubInjectedPromptBlocks(stripStubReference(text));
+  const withoutStub = stripStubReference(text);
+  const raw = role === 'manager'
+    ? stripHubInjectedNotes(withoutStub)
+    : stripHubInjectedPromptBlocks(withoutStub);
   if (!raw) return '';
 
   if (role === 'manager') {
-    const invocationOnly = raw.match(/^(?:[$/]fraim)\s+([a-z0-9-]+)\s*$/i);
+    const invocationOnly = raw.match(/^(?:[$/@]fraim)\s+([a-z0-9-]+)\s*$/i);
     if (invocationOnly) return raw;
     const slugPattern = '[a-z0-9]+(?:-[a-z0-9]+)+';
-    const invocationWithSlug = new RegExp(`^(?:[$/]fraim)\\s+(${slugPattern})\\s*`, 'i');
+    const invocationWithSlug = new RegExp(`^(?:[$/@]fraim)\\s+(${slugPattern})\\s*`, 'i');
     return raw
       .replace(invocationWithSlug, '')
-      .replace(/^(?:[$/]fraim)\s*/i, '')
+      .replace(/^(?:[$/@]fraim)\s*/i, '')
       .trim();
   }
 
@@ -2980,7 +3037,6 @@ function convAwaitingReview(conv) {
   // output, not deliverables submitted to the human manager. Other manager jobs (e.g.,
   // stakeholder-status-reporting) may legitimately surface artifacts for human review.
   if (delegationLedgerForConversation(conv)) return false;
-  if (conv.status === 'completed' && Array.isArray(conv.artifacts) && conv.artifacts.length > 0) return true;
   // #521: a plain completed turn is NOT awaiting review — the approve/reject card
   // only belongs when the employee actually submits for review (a review_handoff,
   // emitted by the submit phase). A turn that just finished (a question, a pause
@@ -3045,20 +3101,22 @@ function normalizeReviewHandoff(raw) {
   if (targetType === 'pull_request') {
     const url = safeHttpUrl(rawTarget && rawTarget.url);
     if (!url) return null;
+    if (artifacts.length > 0) return null;
     return {
       reviewRequired: true,
       reviewTarget: { type: 'pull_request', label: targetLabel || 'Pull request', url },
-      artifacts,
+      artifacts: [],
       summary: typeof raw.summary === 'string' ? raw.summary.trim() : '',
       feedbackMode: typeof raw.feedbackMode === 'string' ? raw.feedbackMode.trim() : 'pull_request_comments',
     };
   }
 
-  if (targetType === 'artifact_set' && artifacts.length > 0) {
+  const fileArtifacts = artifacts.filter((artifact) => artifact.path && !artifact.url);
+  if (targetType === 'artifact_set' && fileArtifacts.length > 0 && fileArtifacts.length === artifacts.length) {
     return {
       reviewRequired: true,
       reviewTarget: { type: 'artifact_set', label: targetLabel || `${artifacts.length || 1} artifact${artifacts.length === 1 ? '' : 's'}` },
-      artifacts,
+      artifacts: fileArtifacts,
       summary: typeof raw.summary === 'string' ? raw.summary.trim() : '',
       feedbackMode: typeof raw.feedbackMode === 'string' ? raw.feedbackMode.trim() : 'inline',
     };
@@ -3750,7 +3808,7 @@ async function handleArtifactAction(conv, action) {
       'Please resend the review handoff contract as valid JSON inside <review_handoff>...</review_handoff>.',
       'Do not rely on prose.',
       'Include reviewRequired, reviewTarget, artifacts, summary, and feedbackMode.',
-      'Use reviewTarget.type "pull_request" only for a real PR URL, or "artifact_set" for one or more review files.',
+      'Use reviewTarget.type "pull_request" with only the PR URL and no artifacts, or "artifact_set" with exact local file paths and no PR URL.',
     ].join(' ');
     if (conv && conv.sessionId) {
       els['coach-text'].value = message;
@@ -3945,17 +4003,14 @@ function wirePopovers() {
 
     if (e.key === 'Escape') {
       const cpModal = document.getElementById('cp-modal');
-      const schedModal = document.getElementById('dep-schedule-modal');
-      const webhookModal = document.getElementById('dep-webhook-modal');
+      const assignModal = document.getElementById('dep-assignment-modal');
       const aomModal = document.getElementById('area-onboard-modal');
       if (aomModal && !aomModal.hidden) {
         tfCloseAreaOnboardModal();
       } else if (cpModal && !cpModal.hidden) {
         closePalette();
-      } else if (schedModal && !schedModal.hidden) {
-        schedModal.hidden = true;
-      } else if (webhookModal && !webhookModal.hidden) {
-        webhookModal.hidden = true;
+      } else if (assignModal && !assignModal.hidden) {
+        assignModal.hidden = true;
       } else if (els['modal'].classList.contains('open')) {
         closeModal();
       } else {
@@ -4136,13 +4191,37 @@ function renderCpRows(searchText) {
     });
   }
 
-  // Update employee footer
-  const footer = document.getElementById('cp-employee-name');
-  if (footer) {
-    const emp = state.bootstrap && state.bootstrap.employees
-      ? state.bootstrap.employees.find((e) => e.id === (state.cpEmployee || 'claude'))
-      : null;
-    footer.textContent = emp ? emp.label : (state.cpEmployee || 'claude');
+  // #693 R5: agent picker — choose the AI agent for this launch.
+  renderCpAgentPicker();
+}
+
+// #693 R5: render the command-palette AI-agent picker. Lists only agents
+// available on the machine as selectable; unavailable agents are shown disabled
+// with an install hint. Defaults to the saved agent (state.cpEmployee); if that
+// agent is not installed, falls back to the first available one.
+function renderCpAgentPicker() {
+  const picker = document.getElementById('cp-agent-picker');
+  if (!picker) return;
+  picker.innerHTML = '';
+  const employees = (state.bootstrap && state.bootstrap.employees) || [];
+  const list = employees.length ? employees : [{ id: 'claude', label: 'Claude', available: true }];
+  const curOk = list.some((e) => e.id === state.cpEmployee && e.available !== false);
+  if (!curOk) {
+    const firstAvail = list.find((e) => e.available !== false);
+    if (firstAvail) state.cpEmployee = firstAvail.id;
+  }
+  for (const e of list) {
+    const pill = document.createElement('button');
+    pill.type = 'button';
+    pill.className = 'cp-agent-pill' + (e.id === state.cpEmployee ? ' on' : '');
+    pill.textContent = e.label + (e.available === false ? ' · install' : '');
+    if (e.available === false) {
+      pill.disabled = true;
+      pill.title = e.label + ' is not installed on this machine';
+    } else {
+      pill.addEventListener('click', () => { state.cpEmployee = e.id; renderCpAgentPicker(); });
+    }
+    picker.appendChild(pill);
   }
 }
 
@@ -4640,9 +4719,9 @@ function deriveTitle(jobTitle, instructions) {
   const trimmedJob = (jobTitle || '').trim();
   const raw = (instructions || '').trim();
   // Capture FRAIM job slug before stripping (e.g. "/fraim pricing-strategy-definition" → "pricing-strategy-definition")
-  const fraimSlugMatch = raw.match(/^[/$]fraim\s+([a-z0-9][a-z0-9-]*)(?:\s|$)/i);
+  const fraimSlugMatch = raw.match(/^[$/@]fraim\s+([a-z0-9][a-z0-9-]*)(?:\s|$)/i);
   const stripped = raw
-    .replace(/^[/$]fraim(?:\s+[a-z0-9-]+)?\s*/i, '')
+    .replace(/^[$/@]fraim(?:\s+[a-z0-9-]+)?\s*/i, '')
     .replace(/\s+/g, ' ')
     .trim();
   const words = stripped.split(' ').filter(Boolean).slice(0, 6);
@@ -4910,29 +4989,25 @@ function foldRunIntoConversation(conv, run) {
     conv.personaKey = run.personaKey;
   }
   const runHandoff = normalizeReviewHandoff(run.reviewHandoff);
-  if (runHandoff) conv.reviewHandoff = runHandoff;
-  else reviewHandoffForConversation(conv);
+  if (runHandoff) {
+    conv.reviewHandoff = runHandoff;
+  } else if (run.reviewHandoff) {
+    conv.reviewHandoff = run.reviewHandoff;
+  } else {
+    conv.reviewHandoff = null;
+  }
   const runDelegation = normalizeDelegationLedger(run.delegation);
   if (runDelegation) conv.delegation = runDelegation;
   else delegationLedgerForConversation(conv);
   if (Array.isArray(run.artifacts)) {
     conv.artifacts = run.artifacts;
+  } else {
+    conv.artifacts = [];
   }
   // Update status.
   if (run.status === 'completed') conv.status = 'completed';
   else if (run.status === 'failed') conv.status = 'failed';
   else conv.status = 'running';
-  // Fallback for server responses that do not include structured artifacts.
-  // The browser only parses output text when that structured field is absent.
-  if (!Array.isArray(run.artifacts)) {
-    for (const e of conv.events) {
-      for (const found of extractArtifacts(e.text)) {
-        if (!conv.artifacts.some((a) => a.name === found.name && a.where === found.where)) {
-          conv.artifacts.push(found);
-        }
-      }
-    }
-  }
   conv.lastUpdatedAt = Date.now();
 }
 
@@ -4951,42 +5026,6 @@ function foldCompareRunIntoConversation(conv, compareRun) {
   };
 }
 
-// Paths under these directories are FRAIM lifecycle bookkeeping (RCAs,
-// raw learnings, evidence dumps, mock files), not deliverables the
-// manager should be drawn to. Excluding them keeps the artifact callout
-// meaningful — it should mean "the employee produced this file for you".
-const ARTIFACT_EXCLUDE_RE = /(^|\/)(retrospectives|evidence|learnings|mocks|raw|archive)\//i;
-function extractArtifact(text) {
-  return extractArtifacts(text)[0] || null;
-}
-
-function extractArtifacts(text) {
-  if (!text) return [];
-  const artifacts = [];
-  const seen = new Set();
-  const matches = String(text)
-    .split(/[\s`"'()<>{}\[\],;:]+/)
-    .filter((token) => /^(docs|public|src|tests)\//.test(token));
-  for (const candidate of matches) {
-    const fullPath = candidate.replace(/[.)]+$/g, '');
-    if (!/\.[A-Za-z0-9]+$/.test(fullPath)) continue;
-    if (ARTIFACT_EXCLUDE_RE.test(fullPath)) continue;
-    const segments = fullPath.split('/');
-    const name = segments[segments.length - 1];
-    const where = segments.slice(0, -1).join('/') + '/';
-    // Store the absolute path so the agent can re-read the artifact (and any
-    // .docx export written alongside it) without guessing the project root.
-    const absPath = state.projectPath
-      ? state.projectPath.replace(/\\/g, '/').replace(/\/$/, '') + '/' + fullPath
-      : null;
-    const key = absPath || fullPath;
-    if (seen.has(key)) continue;
-    seen.add(key);
-    artifacts.push({ name, where, path: absPath });
-  }
-  return artifacts;
-}
-
 function startPolling() {
   if (state.pollHandle) window.clearInterval(state.pollHandle);
   state.pollHandle = window.setInterval(async () => {
@@ -6004,7 +6043,7 @@ const tf = {
   area: 'projects',          // company | manager | projects | brain
   projectView: 'overview',   // overview | workspace
   activeProjectId: null,
-  projects: [],              // [{ id, name, intent, brief, team:[personaKey] }]
+  projects: [],              // [{ id, name, intent, brief }] — roster derived from hired personas, not stored
   assignments: {},           // { [projectId]: [{ id, employeeKey, jobName, jobId }] }
   npStep: 1,
   npSelectedEmployees: [],
@@ -6026,6 +6065,12 @@ function tfPersonas() { return (state.bootstrap && state.bootstrap.personas) ||
 function tfHiredPersonas() { return tfPersonas().filter((p) => p.status === 'hired'); }
 function tfAvailablePersonas() { return tfPersonas().filter((p) => p.status !== 'hired'); }
 function tfPersonaByKey(key) { return tfPersonas().find((p) => p.key === key) || null; }
+// A project's employee roster is derived from the hired personas in the bootstrap
+// (DB-authoritative), NOT from per-machine local state. With the legacy-workspace
+// bypass every user sees the full employee catalog, and the roster is identical on
+// every machine the user signs in from. Deliberately not persisted to disk /
+// localStorage — see AiHubProjectListEntry in src/ai-hub/types.ts.
+function tfProjectTeamKeys() { return tfHiredPersonas().map((p) => p.key); }
 
 // ---------------------------------------------------------------------------
 // Persistence (projects + assignments, mirrors the conversation model)
@@ -6056,7 +6101,8 @@ function tfNormalizeProject(raw, fallbackPath) {
     outcome: raw.outcome || '',
     rules: raw.rules || '',
     brief: raw.brief || raw.intent || '',
-    team: Array.isArray(raw.team) ? raw.team.filter((key) => typeof key === 'string') : [],
+    // Roster is derived from hired personas at render time (tfProjectTeamKeys),
+    // never stored per machine. Any legacy `team` on stored state is dropped.
     updatedAt: raw.updatedAt || undefined,
   };
 }
@@ -6086,9 +6132,6 @@ function tfMergeProjects(projects) {
     const existing = merged.get(key);
     if (existing) {
       const next = { ...existing, ...normalized, folderPath: normalized.folderPath || existing.folderPath };
-      if ((!Array.isArray(normalized.team) || normalized.team.length === 0) && Array.isArray(existing.team) && existing.team.length > 0) {
-        next.team = existing.team;
-      }
       merged.set(key, next);
     } else {
       merged.set(key, normalized);
@@ -6110,7 +6153,6 @@ function tfEnsureCurrentProject() {
     id: tfProjectIdForPath(state.projectPath),
     name: friendlyProjectShortName(state.projectPath),
     folderPath: state.projectPath,
-    team: tfHiredPersonas().map((p) => p.key),
   }, state.projectPath);
   tfMergeProjects([current]);
   const resolved = tfProjectForPath(state.projectPath);
@@ -6411,7 +6453,7 @@ function tfRenderOverview() {
     const team = document.createElement('div');
     team.className = 'proj-team';
     const assigned = tfProjectAssignments(proj.id);
-    const empKeys = Array.from(new Set([...(proj.team || []), ...assigned.map((a) => a.employeeKey).filter(Boolean)]));
+    const empKeys = Array.from(new Set([...tfProjectTeamKeys(), ...assigned.map((a) => a.employeeKey).filter(Boolean)]));
     empKeys.slice(0, 6).forEach((key, i) => {
       const persona = tfPersonaByKey(key);
       const av = tfAvatarFor(persona ? persona.displayName : key, i);
@@ -6683,10 +6725,10 @@ function tfRenderTree() {
   });
   host.appendChild(briefNav);
   host.appendChild(tfTreeSep());
-  // #521: "Project Updates" — the project-lifecycle jobs (project onboarding +
-  // sleep-on-learnings) grouped in one accordion with run history, above New job.
-  host.appendChild(tfProjectUpdatesSection());
-  host.appendChild(tfTreeSep());
+  // #693 R1: the standalone "Project Updates" accordion is retired. Its two
+  // lifecycle actions now live where their output lands — Run Project Onboarding
+  // in the Brief section and Sleep on learnings in the Learnings section
+  // (see tfRenderProjectContextTop). No separate tree section.
   // The legacy standalone "+ New job" entry (#new-conv-btn → openModal → the
   // #job-catalog/#next1/#instructions/#start chain) lives in the old `.rail`,
   // which the shell suppresses (display:none). Relocate the live node to the
@@ -6699,127 +6741,20 @@ function tfRenderTree() {
     host.appendChild(newConvBtn);
     host.appendChild(tfTreeSep());
   }
-  // The legacy conversation switcher (#conv-list → .conv-item buttons, rendered
-  // by renderRail) also lives in the suppressed rail. Relocate the whole Runs
-  // section so standalone conversations stay switchable — the contract behind
-  // #429 R6 (thread-collapse persists across conversation switches). renderRail
-  // keeps targeting the same cached #conv-list node wherever it now lives.
+  // #693 R1 (PR round 2): the per-employee "Runs" accordions (renderRail's
+  // conv-employee-group) ARE the single employees section — they list every
+  // project employee with that employee's runs nested under their accordion.
+  // Relocate that section into the tree; the redundant emp-hero list is retired.
   const convList = (typeof els !== 'undefined' && els['conv-list']) || document.getElementById('conv-list');
   const runsSection = convList && convList.closest('.rail-section--runs');
   if (runsSection) {
     runsSection.classList.add('tree-runs');
     host.appendChild(runsSection);
   }
-  const projectId = tf.activeProjectId;
-  const assigned = tfProjectAssignments(projectId);
-  const project = tf.projects.find((p) => p.id === projectId);
-  const onProject = (project && project.team) || [];
-  // Issue #540 R8: include personas on the manager's team so delegate buttons
-  // appear in the workspace tree even when the persona hasn't been assigned yet.
-  const managerTeamPersonaKeys = (state.bootstrap?.managerTeam || []).map((e) => e.personaKey);
-  const empKeys = Array.from(new Set([...onProject, ...assigned.map((a) => a.employeeKey).filter(Boolean), ...managerTeamPersonaKeys]))
-    // #538 follow-up: reconcile against real entitlements. The localStorage
-    // project.team can hold members who are no longer hired (or were seeded
-    // before an entitlement change), which made un-hired personas like swen
-    // appear in a workspace where only beza/pam are actually hired. Drop any
-    // key that resolves to a known persona that is NOT hired; keep hired
-    // personas and genuinely custom employees (no persona record).
-    .filter((key) => { const p = tfPersonaByKey(key); return !p || p.status === 'hired'; });
-  const managerTeamKeySet = new Set(managerTeamPersonaKeys);
-
-  empKeys.forEach((key, i) => {
-    const persona = tfPersonaByKey(key);
-    const name = persona ? persona.displayName : key;
-    const role = (persona && persona.role) || '';
-    const av = tfAvatarFor(name, i);
-    // R1 (#521): each employee is a large hero accordion — the team are the
-    // heroes of the workspace, not a thin nav list. Their jobs nest inside.
-    const details = document.createElement('details');
-    details.className = 'emp-hero';
-    details.dataset.accKey = 'emp:' + key; // #533 R5: stable key for open-state preservation
-    details.open = true;
-    const summary = document.createElement('summary');
-    summary.title = name;
-    const avEl = document.createElement('div');
-    avEl.className = 'eh-av';
-    avEl.style.background = av.color;
-    avEl.textContent = av.badge;
-    const idWrap = document.createElement('div');
-    idWrap.className = 'eh-id';
-    const nameEl = document.createElement('div');
-    nameEl.className = 'eh-name';
-    nameEl.textContent = name;
-    idWrap.appendChild(nameEl);
-    if (role) {
-      const roleEl = document.createElement('div');
-      roleEl.className = 'eh-role';
-      roleEl.textContent = role;
-      idWrap.appendChild(roleEl);
-    }
-    const addBtn = document.createElement('button');
-    addBtn.type = 'button';
-    addBtn.className = 'eh-add';
-    addBtn.textContent = '+';
-    addBtn.title = 'Assign a job to ' + name;
-    addBtn.addEventListener('click', (e) => { e.preventDefault(); e.stopPropagation(); tfOpenAssignJob(key); });
-    // Issue #538 — per-employee entry point: hire a human manager for this role.
-    let hireBtn = null;
-    if (state.bootstrap && state.bootstrap.managerHiring && state.bootstrap.managerHiring.roles && state.bootstrap.managerHiring.roles[key]) {
-      hireBtn = document.createElement('button');
-      hireBtn.type = 'button';
-      hireBtn.className = 'eh-hire-manager';
-      hireBtn.textContent = '🧑‍💼';
-      hireBtn.title = 'Find a human manager for ' + name;
-      hireBtn.setAttribute('aria-label', 'Find a human manager for ' + name);
-      hireBtn.addEventListener('click', (e) => { e.preventDefault(); e.stopPropagation(); openHireManagerModal(key); });
-    }
-    const empDot = tfEmployeeDot(projectId, key);
-    const dot = document.createElement('span');
-    dot.className = 'eh-dot t-dot dot-' + empDot;
-    dot.style.background = 'var(--' + empDot + ')';
-    dot.title = tfDotTitle(empDot);
-    const chev = document.createElement('span');
-    chev.className = 'eh-chev';
-    chev.textContent = '▸';
-    summary.appendChild(avEl);
-    summary.appendChild(idWrap);
-    if (hireBtn) summary.appendChild(hireBtn);
-    summary.appendChild(addBtn);
-    // Issue #540 R8: delegate button for personas on the manager's team.
-    if (managerTeamKeySet.has(key)) {
-      summary.appendChild(renderDelegateButton(key));
-    }
-    summary.appendChild(dot);
-    summary.appendChild(chev);
-    details.appendChild(summary);
-
-    const body = document.createElement('div');
-    body.className = 'eh-jobs';
-    const empJobs = assigned.filter((x) => x.employeeKey === key);
-    if (empJobs.length === 0) {
-      const none = document.createElement('div');
-      none.className = 'eh-empty';
-      none.textContent = 'No jobs yet — + to assign one.';
-      body.appendChild(none);
-    }
-    for (const a of empJobs) {
-      const jobRow = document.createElement('div');
-      jobRow.className = 'tree-job';
-      const jobDot = tfAssignmentDot(a);
-      const label = document.createElement('span');
-      label.className = 'tj-label';
-      label.textContent = a.jobName;
-      const jd = document.createElement('span');
-      jd.className = 'tj-dot dot-' + jobDot;
-      jd.style.background = 'var(--' + jobDot + ')';
-      jd.title = tfDotTitle(jobDot);
-      jobRow.appendChild(label); jobRow.appendChild(jd);
-      jobRow.addEventListener('click', () => tfSelectAssignmentConversation(a));
-      body.appendChild(jobRow);
-    }
-    details.appendChild(body);
-    host.appendChild(details);
-  });
+  // #693 R1 (PR round 2): the redundant emp-hero employee list was removed. The
+  // relocated Runs section above (renderRail's conv-employee-group) is now the
+  // single employees section — every project employee, with their runs nested
+  // under their own accordion, plus per-employee assign/hire-manager.
 
   // #521 R5/R6.4: the project brief and learnings moved OUT of the tree into the
   // collapsible top sections (#proj-brief-acc / #proj-learnings-acc), rendered by
@@ -6920,6 +6855,37 @@ function tfRenderProjectContextTop() {
     // #533 #4: project-LEVEL manager learnings (repo-local) live in the project tab.
     tfRenderLearningsList(learnHost, 'manager', 'project', 'Nothing here yet — what your team learns about working with you on THIS project (preferences, patterns to avoid, validated approaches) appears here. Add one with + Add learning.');
   }
+  // #693 R1: the retired "Project Updates" section's actions now live where their
+  // output lands — Run Project Onboarding in the Brief section, Sleep on learnings
+  // in the Learnings section.
+  tfEnsureAccAction('proj-brief-acc', '🚀', 'Run Project Onboarding', () => tfOpenOnboardInput('run'));
+  tfEnsureAccAction('proj-learnings-acc', '🧠', 'Sleep on learnings', () => tfRunShareLearnings('project'));
+}
+
+// #693 R1: insert (idempotently) a single lifecycle-action button at the top of a
+// ctx accordion's body. Used to place onboarding/sleep actions inside the Brief,
+// Learnings, and Company/Manager context sections they populate.
+function tfEnsureAccAction(accId, ico, label, onClick) {
+  const acc = document.getElementById(accId);
+  if (!acc) return;
+  const body = acc.querySelector('.ctx-acc-body');
+  if (!body) return;
+  let row = body.querySelector(':scope > .ctx-acc-action-row');
+  if (!row) {
+    row = document.createElement('div');
+    row.className = 'ctx-acc-action-row';
+    body.insertBefore(row, body.firstChild);
+  }
+  // Rebuild the button so repeated renders don't stack duplicates or stale handlers.
+  row.innerHTML = '';
+  const btn = document.createElement('button');
+  btn.type = 'button';
+  btn.className = 'ctx-acc-action';
+  const ic = document.createElement('span'); ic.className = 'caa-ico'; ic.textContent = ico;
+  const tx = document.createElement('span'); tx.textContent = label;
+  btn.appendChild(ic); btn.appendChild(tx);
+  btn.addEventListener('click', (e) => { e.preventDefault(); e.stopPropagation(); onClick(); });
+  row.appendChild(btn);
 }
 
 // #521: the Brief section is the project's real captured context + rules — the two
@@ -6991,9 +6957,12 @@ async function loadDeployments() {
   const list = document.getElementById('proj-deployments-list');
   if (!list) return;
   try {
+    const params = new URLSearchParams();
+    if (state.projectPath) params.set('projectPath', state.projectPath);
+    const suffix = params.toString() ? '?' + params.toString() : '';
     const [schResp, whResp] = await Promise.all([
-      fetch('/api/ai-hub/schedules'),
-      fetch('/api/ai-hub/webhooks'),
+      fetch('/api/ai-hub/schedules' + suffix),
+      fetch('/api/ai-hub/webhooks' + suffix),
     ]);
     const schedules = schResp.ok ? await schResp.json() : [];
     const webhooks = whResp.ok ? await whResp.json() : [];
@@ -7085,119 +7054,181 @@ function cronToHuman(expr) {
   return expr;
 }
 
+// #693 R3 (PR round 2): render assignments grouped by the EMPLOYEE the job maps to
+// (job.requiredPersonaKey), not the AI agent, reusing the Runs section's
+// conv-employee-group accordion so the two sections look and behave the same.
 function renderDeploymentList(container, deployments) {
   container.innerHTML = '';
   if (!deployments.length) {
     const empty = document.createElement('p');
     empty.className = 'dep-empty';
-    empty.textContent = 'No assignments yet. Use + Schedule or + Trigger above to set up scheduled and triggered assignments.';
+    empty.textContent = 'No assignments yet. Use + New Assignment above to schedule a job or trigger it from an external system.';
     container.appendChild(empty);
     return;
   }
+  const jobs = state.bootstrap?.jobs ?? [];
+  const UNASSIGNED = '__unassigned__';
+  // The employee is determined by the job: its requiredPersonaKey. Fall back to an
+  // "Unassigned" group for generic jobs with no required specialist.
+  const personaKeyForDep = (dep) => {
+    const j = jobs.find((x) => x.id === dep.jobId);
+    return (j && j.requiredPersonaKey) || UNASSIGNED;
+  };
+  const groups = new Map();
   for (const dep of deployments) {
-    const card = document.createElement('div');
-    card.className = 'dep-card';
-    const top = document.createElement('div');
-    top.className = 'dep-card-top';
-    const icon = document.createElement('span');
-    icon.className = 'dep-type-icon';
-    icon.textContent = dep.type === 'scheduled' ? '⏱' : '🔗';
-    const label = document.createElement('span');
-    label.className = 'dep-label';
-    label.textContent = dep.label;
-    const typeBadge = document.createElement('span');
-    typeBadge.className = 'dep-type-badge dep-type-badge--' + dep.type;
-    typeBadge.textContent = dep.type === 'scheduled' ? 'Scheduled' : 'Triggered';
-    top.appendChild(icon);
-    top.appendChild(label);
-    top.appendChild(typeBadge);
-    card.appendChild(top);
-
-    if (dep.cronExpr) {
-      const cron = document.createElement('div');
-      cron.className = 'dep-detail';
-      const human = cronToHuman(dep.cronExpr);
-      cron.textContent = human !== dep.cronExpr ? human : dep.cronExpr;
-      if (human !== dep.cronExpr) cron.title = dep.cronExpr;
-      card.appendChild(cron);
-    }
-
-    const employee = (state.bootstrap?.employees || []).find((e) => e.id === dep.hostId);
-    if (employee) {
-      const empRow = document.createElement('div');
-      empRow.className = 'dep-detail dep-detail--emp';
-      empRow.textContent = employee.label;
-      card.appendChild(empRow);
+    const key = personaKeyForDep(dep);
+    if (!groups.has(key)) groups.set(key, []);
+    groups.get(key).push(dep);
+  }
+  for (const [personaKey, deps] of groups) {
+    const persona = personaKey === UNASSIGNED ? null : tfPersonaByKey(personaKey);
+    const empLabel = persona ? persona.displayName : 'Unassigned';
+    const empDetail = persona ? (persona.role || 'AI Employee') : 'No specialist required';
+    const details = document.createElement('details');
+    details.className = 'conv-employee-group';
+    details.open = true;
+    const summary = document.createElement('summary');
+    summary.className = 'conv-employee-tab';
+    // DiceBear when the employee has an avatar; else an initials chip.
+    let avatar;
+    if (persona && persona.avatarUrl) {
+      avatar = document.createElement('img');
+      avatar.className = 'conv-employee-avatar';
+      avatar.src = persona.avatarUrl; avatar.alt = empLabel;
+    } else {
+      avatar = document.createElement('span');
+      avatar.className = 'conv-employee-avatar';
+      avatar.textContent = initialBadge(empLabel);
     }
-
-    if (dep.inboundUrl) {
-      const urlRow = document.createElement('div');
-      urlRow.className = 'dep-detail dep-detail--url';
-      const urlCode = document.createElement('code');
-      urlCode.textContent = dep.inboundUrl;
-      urlCode.className = 'dep-inbound-url dep-inbound-url--inline';
-      const copyBtn = document.createElement('button');
-      copyBtn.type = 'button';
-      copyBtn.className = 'hm-copy-btn';
-      copyBtn.textContent = 'Copy';
-      copyBtn.addEventListener('click', () => { navigator.clipboard.writeText(dep.inboundUrl).then(() => { copyBtn.textContent = 'Copied!'; setTimeout(() => { copyBtn.textContent = 'Copy'; }, 1500); }).catch(() => {}); });
-      urlRow.appendChild(urlCode);
-      urlRow.appendChild(copyBtn);
-      card.appendChild(urlRow);
+    const copy = document.createElement('span');
+    copy.className = 'conv-employee-tab-copy';
+    const label = document.createElement('strong');
+    label.className = 'conv-employee-tab-label';
+    label.textContent = empLabel;
+    const detail = document.createElement('small');
+    detail.className = 'conv-employee-tab-detail';
+    detail.textContent = empDetail;
+    copy.appendChild(label); copy.appendChild(detail);
+    const count = document.createElement('span');
+    count.className = 'conv-employee-tab-count';
+    count.textContent = String(deps.length);
+    const addBtn = document.createElement('button');
+    addBtn.type = 'button';
+    addBtn.className = 'conv-employee-add';
+    addBtn.textContent = '+';
+    addBtn.title = 'New assignment for ' + empLabel;
+    addBtn.setAttribute('aria-label', 'New assignment for ' + empLabel);
+    addBtn.addEventListener('click', (e) => {
+      e.preventDefault(); e.stopPropagation();
+      openDeploymentModal();
+      // Pre-select a job that maps to this employee so the grouping stays consistent.
+      if (persona) {
+        const sel = document.getElementById('dep-job');
+        const match = jobs.find((x) => x.requiredPersonaKey === personaKey);
+        if (sel && match && Array.from(sel.options).some((o) => o.value === match.id)) sel.value = match.id;
+      }
+    });
+    summary.appendChild(avatar);
+    summary.appendChild(copy);
+    summary.appendChild(addBtn);
+    summary.appendChild(count);
+    details.appendChild(summary);
+    const list = document.createElement('div');
+    list.className = 'conv-employee-list';
+    for (const dep of deps) {
+      list.appendChild(buildDeploymentRow(dep));
+      if (dep.inboundUrl) list.appendChild(buildInboundUrlRow(dep));
     }
+    details.appendChild(list);
+    container.appendChild(details);
+  }
+}
 
-    const cardActions = document.createElement('div');
-    cardActions.className = 'dep-card-actions';
-
-    const editBtn = document.createElement('button');
-    editBtn.type = 'button';
-    editBtn.className = 'dep-edit-btn';
-    editBtn.title = 'Edit this assignment';
-    editBtn.textContent = 'Edit';
-    editBtn.addEventListener('click', () => { openDeploymentModal(dep.type === 'scheduled' ? 'schedule' : 'webhook', dep); });
-    cardActions.appendChild(editBtn);
-
-    const delBtn = document.createElement('button');
-    delBtn.type = 'button';
-    delBtn.className = 'dep-del-btn';
-    delBtn.title = 'Remove this assignment';
-    delBtn.textContent = 'Remove';
-    delBtn.addEventListener('click', async () => {
-      const endpoint = dep.type === 'scheduled' ? 'schedules' : 'webhooks';
-      await fetch('/api/ai-hub/' + endpoint + '/' + dep.id, { method: 'DELETE' });
-      await loadDeployments();
-    });
-    cardActions.appendChild(delBtn);
-    card.appendChild(cardActions);
-    container.appendChild(card);
+// #693 R3: a single assignment rendered as a Runs-style row.
+function buildDeploymentRow(dep) {
+  const row = document.createElement('div');
+  // #693 R3: a dedicated class (not .conv-item) so run-list logic never treats an
+  // assignment as a run; styled to match the Runs rows via CSS.
+  row.className = 'dep-row';
+  const body = document.createElement('span');
+  body.className = 'conv-body';
+  const title = document.createElement('span');
+  title.className = 'dep-row-title';
+  title.textContent = dep.label;
+  body.appendChild(title);
+  const meta = document.createElement('span');
+  meta.className = 'assign-row-meta';
+  const badge = document.createElement('span');
+  badge.className = 'assign-badge assign-badge--' + (dep.type === 'scheduled' ? 'scheduled' : 'triggered');
+  badge.textContent = dep.type === 'scheduled' ? 'Scheduled' : 'Triggered';
+  meta.appendChild(badge);
+  const detailText = document.createElement('span');
+  if (dep.type === 'scheduled' && dep.cronExpr) {
+    const human = cronToHuman(dep.cronExpr);
+    detailText.textContent = human !== dep.cronExpr ? human : dep.cronExpr;
+    if (human !== dep.cronExpr) detailText.title = dep.cronExpr;
+  } else {
+    detailText.textContent = 'Inbound webhook';
   }
+  meta.appendChild(detailText);
+  body.appendChild(meta);
+  row.appendChild(body);
+  const actions = document.createElement('span');
+  actions.className = 'dep-row-actions';
+  const editBtn = document.createElement('button');
+  editBtn.type = 'button'; editBtn.className = 'dep-edit-btn'; editBtn.textContent = 'Edit'; editBtn.title = 'Edit this assignment';
+  editBtn.addEventListener('click', () => openDeploymentModal(dep));
+  const delBtn = document.createElement('button');
+  delBtn.type = 'button'; delBtn.className = 'dep-del-btn'; delBtn.textContent = 'Remove'; delBtn.title = 'Remove this assignment';
+  delBtn.addEventListener('click', async () => {
+    const endpoint = dep.type === 'scheduled' ? 'schedules' : 'webhooks';
+    await fetch('/api/ai-hub/' + endpoint + '/' + dep.id, { method: 'DELETE' });
+    await loadDeployments();
+  });
+  actions.appendChild(editBtn); actions.appendChild(delBtn);
+  row.appendChild(actions);
+  return row;
+}
+
+// #693 R3: inbound-URL sub-row for triggered assignments (kept from the old card).
+function buildInboundUrlRow(dep) {
+  const urlRow = document.createElement('div');
+  // #693 R3: self-contained class — do NOT add .dep-detail (its width:100% plus this
+  // row's left margin overflows the container and forces a horizontal scrollbar).
+  urlRow.className = 'dep-inbound-sub';
+  const urlCode = document.createElement('code');
+  urlCode.textContent = dep.inboundUrl;
+  urlCode.className = 'dep-inbound-url dep-inbound-url--inline';
+  const copyBtn = document.createElement('button');
+  copyBtn.type = 'button';
+  copyBtn.className = 'hm-copy-btn';
+  copyBtn.textContent = 'Copy';
+  copyBtn.addEventListener('click', () => { navigator.clipboard.writeText(dep.inboundUrl).then(() => { copyBtn.textContent = 'Copied!'; setTimeout(() => { copyBtn.textContent = 'Copy'; }, 1500); }).catch(() => {}); });
+  urlRow.appendChild(urlCode);
+  urlRow.appendChild(copyBtn);
+  return urlRow;
 }
 
 function initDeploymentButtons() {
-  const addSchBtn = document.getElementById('dep-add-schedule-btn');
-  const addWhBtn = document.getElementById('dep-add-webhook-btn');
-  if (addSchBtn) addSchBtn.addEventListener('click', () => openDeploymentModal('schedule'));
-  if (addWhBtn) addWhBtn.addEventListener('click', () => openDeploymentModal('webhook'));
-
-  // Close buttons
-  const schClose = document.getElementById('dep-schedule-close');
-  const whClose = document.getElementById('dep-webhook-close');
-  if (schClose) schClose.addEventListener('click', () => { document.getElementById('dep-schedule-modal').hidden = true; });
-  if (whClose) whClose.addEventListener('click', () => { document.getElementById('dep-webhook-modal').hidden = true; });
-
-  // Cancel buttons
-  const schCancel = document.getElementById('dep-sch-cancel-btn');
-  const whCancel = document.getElementById('dep-wh-cancel-btn');
-  if (schCancel) schCancel.addEventListener('click', () => { document.getElementById('dep-schedule-modal').hidden = true; });
-  if (whCancel) whCancel.addEventListener('click', () => { document.getElementById('dep-webhook-modal').hidden = true; });
-
-  // Save buttons
-  const schSave = document.getElementById('dep-sch-save-btn');
-  if (schSave) schSave.addEventListener('click', saveScheduleDeployment);
-  const whSave = document.getElementById('dep-wh-save-btn');
-  if (whSave) whSave.addEventListener('click', saveWebhookDeployment);
-
-  // Preset chips
+  // #693 R2: one entry point opens the consolidated assignment modal.
+  const addBtn = document.getElementById('dep-add-btn');
+  if (addBtn) addBtn.addEventListener('click', () => openDeploymentModal());
+
+  const closeModal = () => { const m = document.getElementById('dep-assignment-modal'); if (m) m.hidden = true; };
+  const close = document.getElementById('dep-assign-close');
+  const cancel = document.getElementById('dep-cancel-btn');
+  if (close) close.addEventListener('click', closeModal);
+  if (cancel) cancel.addEventListener('click', closeModal);
+
+  const save = document.getElementById('dep-save-btn');
+  if (save) save.addEventListener('click', saveDeployment);
+
+  // Scheduled / Triggered segmented toggle.
+  document.querySelectorAll('#dep-type-seg .dep-type-btn').forEach((btn) => {
+    btn.addEventListener('click', () => setDepType(btn.dataset.depType));
+  });
+
+  // Preset chips (scheduled block).
   document.querySelectorAll('#dep-sch-presets .dep-preset-chip').forEach(chip => {
     chip.addEventListener('click', () => applySchPreset(chip.dataset.preset));
   });
@@ -7243,131 +7274,131 @@ function initDeploymentButtons() {
   });
 }
 
-function openDeploymentModal(type, dep) {
-  const jobs = state.bootstrap?.jobs ?? [];
+// #693 R2: current assignment type in the consolidated modal.
+let _depType = 'scheduled';
+function setDepType(type) {
+  _depType = (type === 'triggered') ? 'triggered' : 'scheduled';
+  document.querySelectorAll('#dep-type-seg .dep-type-btn').forEach((b) => {
+    b.classList.toggle('on', b.dataset.depType === _depType);
+  });
+  const sched = document.getElementById('dep-sched-block');
+  const trig = document.getElementById('dep-trig-block');
+  if (sched) sched.hidden = _depType !== 'scheduled';
+  if (trig) trig.hidden = _depType !== 'triggered';
+}
+
+// #693 R2/R5: populate the AI Agent select with only agents available on the
+// machine. Mirrors the existing employee-select behavior — unavailable agents are
+// shown disabled rather than as selectable options.
+function populateAgentSelect(sel, currentHostId) {
+  sel.innerHTML = '';
   const employees = state.bootstrap?.employees ?? [];
+  const list = employees.length ? employees : [{ id: 'claude', label: 'Claude', available: true }];
+  for (const e of list) {
+    const opt = document.createElement('option');
+    opt.value = e.id;
+    opt.textContent = e.label + (e.available === false ? ' (not installed)' : '');
+    if (e.available === false) opt.disabled = true;
+    sel.appendChild(opt);
+  }
+  const avail = list.filter((e) => e.available !== false);
+  const pick = (currentHostId && list.some((e) => e.id === currentHostId && e.available !== false))
+    ? currentHostId
+    : (avail[0]?.id || list[0]?.id);
+  if (pick) sel.value = pick;
+}
+
+// #693 R2: open the single consolidated assignment modal. `dep` present = edit;
+// its .type locks the segmented control. New assignments default to Scheduled.
+function openDeploymentModal(dep) {
+  const jobs = state.bootstrap?.jobs ?? [];
   const editing = dep != null;
   _editingDepId = editing ? dep.id : null;
 
-  function populateJobs(sel, currentJobId) {
-    sel.innerHTML = '';
-    for (const j of jobs) {
-      const opt = document.createElement('option');
-      opt.value = j.id;
-      opt.textContent = j.title;
-      sel.appendChild(opt);
-    }
-    if (currentJobId) sel.value = currentJobId;
+  const jobSel = document.getElementById('dep-job');
+  jobSel.innerHTML = '';
+  for (const j of jobs) {
+    const opt = document.createElement('option');
+    opt.value = j.id; opt.textContent = j.title;
+    jobSel.appendChild(opt);
+  }
+  if (dep?.jobId) jobSel.value = dep.jobId;
+
+  populateAgentSelect(document.getElementById('dep-agent'), dep?.hostId || 'claude');
+  document.getElementById('dep-label').value = dep?.label ?? '';
+  document.getElementById('dep-instructions').value = dep?.instructions ?? '';
+  const errEl = document.getElementById('dep-error');
+  if (errEl) errEl.hidden = true;
+  const inbound = document.getElementById('dep-wh-inbound-row');
+  if (inbound) inbound.hidden = true;
+
+  setDepType(editing ? (dep.type === 'scheduled' ? 'scheduled' : 'triggered') : 'scheduled');
+
+  // Scheduled fields: detect preset and pre-fill time/day.
+  const preset = dep?.cronExpr ? detectPreset(dep.cronExpr) : null;
+  if (preset && preset !== 'custom' && dep?.cronExpr) {
+    const parts = dep.cronExpr.trim().split(/\s+/);
+    const m = parseInt(parts[0], 10) || 0;
+    const h = parseInt(parts[1], 10) || 9;
+    document.getElementById('dep-sch-time').value = String(h).padStart(2, '0') + ':' + String(m).padStart(2, '0');
+    if (preset === 'weekly') document.getElementById('dep-sch-day').value = parts[4];
+    document.getElementById('dep-sch-cron-preset').value = dep.cronExpr;
+  } else if (preset === 'custom' && dep?.cronExpr) {
+    document.getElementById('dep-sch-cron').value = dep.cronExpr;
+    const cronPreview = document.getElementById('dep-sch-cron-preview');
+    if (cronPreview) cronPreview.textContent = cronToHuman(dep.cronExpr);
+  } else {
+    document.getElementById('dep-sch-cron').value = '';
+    document.getElementById('dep-sch-time').value = '09:00';
   }
+  applySchPreset(preset || 'daily');
 
-  function populateEmployees(sel, currentHostId) {
-    sel.innerHTML = '';
-    const fallback = [{ id: 'claude', label: 'Claude' }, { id: 'codex', label: 'Codex' }, { id: 'gemini', label: 'Gemini' }, { id: 'copilot', label: 'Copilot' }];
-    const list = employees.length ? employees : fallback;
-    for (const e of list) {
-      const opt = document.createElement('option');
-      opt.value = e.id;
-      opt.textContent = e.label;
-      sel.appendChild(opt);
-    }
-    if (currentHostId) sel.value = currentHostId;
-  }
-
-  if (type === 'schedule') {
-    const modal = document.getElementById('dep-schedule-modal');
-    document.getElementById('dep-sch-modal-title').textContent = editing ? 'Edit Scheduled Assignment' : 'New Scheduled Assignment';
-    document.getElementById('dep-sch-save-btn').textContent = editing ? 'Save changes' : 'Add assignment';
-    populateJobs(document.getElementById('dep-sch-job'), dep?.jobId);
-    populateEmployees(document.getElementById('dep-sch-host'), dep?.hostId || 'claude');
-    document.getElementById('dep-sch-error').hidden = true;
-    document.getElementById('dep-sch-label').value = dep?.label ?? '';
-    document.getElementById('dep-sch-instructions').value = dep?.instructions ?? '';
-    // Detect preset and pre-fill time/day
-    const preset = dep?.cronExpr ? detectPreset(dep.cronExpr) : null;
-    if (preset && preset !== 'custom' && dep?.cronExpr) {
-      const parts = dep.cronExpr.trim().split(/\s+/);
-      const m = parseInt(parts[0], 10) || 0;
-      const h = parseInt(parts[1], 10) || 9;
-      document.getElementById('dep-sch-time').value = String(h).padStart(2, '0') + ':' + String(m).padStart(2, '0');
-      if (preset === 'weekly') document.getElementById('dep-sch-day').value = parts[4];
-      document.getElementById('dep-sch-cron-preset').value = dep.cronExpr;
-    } else if (preset === 'custom' && dep?.cronExpr) {
-      document.getElementById('dep-sch-cron').value = dep.cronExpr;
-      const cronPreview = document.getElementById('dep-sch-cron-preview');
-      if (cronPreview) cronPreview.textContent = cronToHuman(dep.cronExpr);
-    } else {
-      document.getElementById('dep-sch-cron').value = '';
-      document.getElementById('dep-sch-time').value = '09:00';
-    }
-    applySchPreset(preset || 'daily');
-    modal.hidden = false;
-  } else {
-    const modal = document.getElementById('dep-webhook-modal');
-    document.getElementById('dep-wh-modal-title').textContent = editing ? 'Edit Triggered Assignment' : 'New Triggered Assignment';
-    document.getElementById('dep-wh-save-btn').textContent = editing ? 'Save changes' : 'Add assignment';
-    populateJobs(document.getElementById('dep-wh-job'), dep?.jobId);
-    populateEmployees(document.getElementById('dep-wh-host'), dep?.hostId || 'claude');
-    document.getElementById('dep-wh-error').hidden = true;
-    document.getElementById('dep-wh-inbound-row').hidden = true;
-    document.getElementById('dep-wh-label').value = dep?.label ?? '';
-    document.getElementById('dep-wh-instructions').value = dep?.instructions ?? '';
-    modal.hidden = false;
-  }
-}
-
-async function saveScheduleDeployment() {
-  const label = document.getElementById('dep-sch-label').value.trim();
-  const jobId = document.getElementById('dep-sch-job').value;
-  const hostId = document.getElementById('dep-sch-host').value;
-  const isCustom = _activeSchPreset === 'custom';
-  const cronExpr = isCustom
-    ? document.getElementById('dep-sch-cron').value.trim()
-    : (document.getElementById('dep-sch-cron-preset').value.trim() || '');
-  const instructions = document.getElementById('dep-sch-instructions').value.trim();
-  const errEl = document.getElementById('dep-sch-error');
-  if (!label || !cronExpr) { errEl.textContent = 'Label and schedule are required.'; errEl.hidden = false; return; }
-  const isEdit = _editingDepId !== null;
-  const url = isEdit ? '/api/ai-hub/schedules/' + _editingDepId : '/api/ai-hub/schedules';
-  const method = isEdit ? 'PUT' : 'POST';
-  try {
-    const resp = await fetch(url, {
-      method,
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ label, jobId, hostId, cronExpr, instructions: instructions || undefined }),
-    });
-    if (!resp.ok) { const e = await resp.json().catch(() => ({})); errEl.textContent = e.error || (isEdit ? 'Failed to update assignment.' : 'Failed to create assignment.'); errEl.hidden = false; return; }
-    _editingDepId = null;
-    document.getElementById('dep-schedule-modal').hidden = true;
-    await loadDeployments();
-  } catch { errEl.textContent = 'Network error — is the Hub running?'; errEl.hidden = false; }
+  document.getElementById('dep-assign-title').textContent = editing ? 'Edit assignment' : 'New assignment';
+  document.getElementById('dep-save-btn').textContent = editing ? 'Save changes' : 'Add assignment';
+  document.getElementById('dep-assignment-modal').hidden = false;
 }
 
-async function saveWebhookDeployment() {
-  const label = document.getElementById('dep-wh-label').value.trim();
-  const jobId = document.getElementById('dep-wh-job').value;
-  const hostId = document.getElementById('dep-wh-host').value;
-  const instructions = document.getElementById('dep-wh-instructions').value.trim();
-  const errEl = document.getElementById('dep-wh-error');
-  if (!label) { errEl.textContent = 'Label is required.'; errEl.hidden = false; return; }
+// #693 R2: one save path routes to the schedule or webhook endpoint by type.
+async function saveDeployment() {
+  const errEl = document.getElementById('dep-error');
+  const label = document.getElementById('dep-label').value.trim();
+  const jobId = document.getElementById('dep-job').value;
+  const hostId = document.getElementById('dep-agent').value;
+  const instructions = document.getElementById('dep-instructions').value.trim();
   const isEdit = _editingDepId !== null;
-  const url = isEdit ? '/api/ai-hub/webhooks/' + _editingDepId : '/api/ai-hub/webhooks';
-  const method = isEdit ? 'PUT' : 'POST';
-  try {
-    const resp = await fetch(url, {
-      method,
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ label, jobId, hostId, instructions: instructions || undefined }),
-    });
-    if (!resp.ok) { const e = await resp.json().catch(() => ({})); errEl.textContent = e.error || (isEdit ? 'Failed to update assignment.' : 'Failed to create assignment.'); errEl.hidden = false; return; }
-    if (!isEdit) {
-      const dep = await resp.json();
-      document.getElementById('dep-wh-inbound-url').textContent = dep.inboundUrl;
-      document.getElementById('dep-wh-inbound-row').hidden = false;
-    }
-    _editingDepId = null;
-    if (isEdit) document.getElementById('dep-webhook-modal').hidden = true;
-    await loadDeployments();
-  } catch { errEl.textContent = 'Network error — is the Hub running?'; errEl.hidden = false; }
+  if (!label) { errEl.textContent = 'Name is required.'; errEl.hidden = false; return; }
+
+  if (_depType === 'scheduled') {
+    const isCustom = _activeSchPreset === 'custom';
+    const cronExpr = isCustom
+      ? document.getElementById('dep-sch-cron').value.trim()
+      : (document.getElementById('dep-sch-cron-preset').value.trim() || '');
+    if (!cronExpr) { errEl.textContent = 'A schedule is required.'; errEl.hidden = false; return; }
+    const url = isEdit ? '/api/ai-hub/schedules/' + _editingDepId : '/api/ai-hub/schedules';
+    try {
+      // merge: keep master's projectPath association on the request body.
+      const resp = await fetch(url, { method: isEdit ? 'PUT' : 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ label, jobId, projectPath: state.projectPath || undefined, hostId, cronExpr, instructions: instructions || undefined }) });
+      if (!resp.ok) { const e = await resp.json().catch(() => ({})); errEl.textContent = e.error || 'Failed to save assignment.'; errEl.hidden = false; return; }
+      _editingDepId = null;
+      document.getElementById('dep-assignment-modal').hidden = true;
+      await loadDeployments();
+    } catch { errEl.textContent = 'Network error - is the Hub running?'; errEl.hidden = false; }
+  } else {
+    const url = isEdit ? '/api/ai-hub/webhooks/' + _editingDepId : '/api/ai-hub/webhooks';
+    try {
+      const resp = await fetch(url, { method: isEdit ? 'PUT' : 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ label, jobId, projectPath: state.projectPath || undefined, hostId, instructions: instructions || undefined }) });
+      if (!resp.ok) { const e = await resp.json().catch(() => ({})); errEl.textContent = e.error || 'Failed to save assignment.'; errEl.hidden = false; return; }
+      if (!isEdit) {
+        const dep = await resp.json();
+        document.getElementById('dep-wh-inbound-url').textContent = dep.inboundUrl;
+        document.getElementById('dep-wh-inbound-row').hidden = false;
+      } else {
+        document.getElementById('dep-assignment-modal').hidden = true;
+      }
+      _editingDepId = null;
+      await loadDeployments();
+    } catch { errEl.textContent = 'Network error - is the Hub running?'; errEl.hidden = false; }
+  }
 }
 
 // ---------------------------------------------------------------------------
@@ -7891,123 +7922,12 @@ function tfContextRow(key, label, placeholder, rerender) {
 
   return row;
 }
-// #521 R6/R6.5: a Company/Manager rail job is an accordion that nests its past
-// runs — the SAME paradigm as the project tree (employee → job runs). The summary
-// is the job (icon, name, run count, + to run again); the body lists prior runs,
-// each clicking through to that run's conversation.
-function tfAreaRailJob(ico, jobId, name, sub, onRun) {
-  const details = document.createElement('details');
-  details.className = 'emp-hero area-rail-acc';
-  details.open = true;
-  const summary = document.createElement('summary');
-  const av = document.createElement('div');
-  av.className = 'eh-av job-ico';
-  av.style.borderRadius = '9px';
-  av.style.background = 'var(--accent-soft)';
-  av.style.color = 'var(--accent)';
-  av.textContent = ico;
-  const id = document.createElement('div'); id.className = 'eh-id';
-  const nm = document.createElement('div'); nm.className = 'eh-name'; nm.style.fontSize = '14px'; nm.textContent = name;
-  const runs = tfConversationsForJob(jobId);
-  const role = document.createElement('div'); role.className = 'eh-role';
-  role.textContent = runs.length ? (runs.length + (runs.length === 1 ? ' past run' : ' past runs')) : sub;
-  id.appendChild(nm); id.appendChild(role);
-  const add = document.createElement('button');
-  add.type = 'button'; add.className = 'eh-add'; add.textContent = '+'; add.title = 'Run ' + name + ' again';
-  add.addEventListener('click', (e) => { e.preventDefault(); e.stopPropagation(); onRun(); });
-  const chev = document.createElement('span'); chev.className = 'eh-chev'; chev.textContent = '▸';
-  summary.appendChild(av); summary.appendChild(id); summary.appendChild(add); summary.appendChild(chev);
-  details.appendChild(summary);
-  const body = document.createElement('div'); body.className = 'eh-jobs';
-  if (!runs.length) {
-    const none = document.createElement('div'); none.className = 'eh-empty'; none.textContent = 'No runs yet — + to run it.';
-    body.appendChild(none);
-  } else {
-    for (const c of runs) {
-      const row = document.createElement('div'); row.className = 'tree-job';
-      const label = document.createElement('span'); label.className = 'tj-label'; label.textContent = c.title || c.jobTitle || name;
-      const dotCls = (typeof conversationStateDotClass === 'function') ? conversationStateDotClass(c) : 'grey';
-      const dot = document.createElement('span'); dot.className = 'tj-dot dot-' + dotCls; dot.style.background = 'var(--' + dotCls + ')';
-      row.appendChild(label); row.appendChild(dot);
-      tfAttachRunDelete(row, c, { tree: true }); // #533 R6: delete an area-rail job run
-      row.addEventListener('click', () => { if (typeof switchToConversation === 'function') switchToConversation(c.id); });
-      body.appendChild(row);
-    }
-  }
-  details.appendChild(body);
-  return details;
-}
+// #693 R1 (PR round 2): tfAreaRailJob removed with the Company/Manager job rails.
 
-// #521: "Project Updates" — one accordion grouping the project-lifecycle jobs
-// (project-onboarding + sleep-on-learnings) with their run history. The header
-// "+" opens a small menu to run either; the body lists each job and its past
-// runs (click a run to open it). Sits between Project Info and "+ New job".
-function tfProjectUpdatesSection() {
-  const JOBS = [
-    { id: 'project-onboarding', ico: '🚀', name: 'Project Onboarding', run: () => tfStartProjectOnboarding() },
-    { id: 'sleep-on-learnings', ico: '🧠', name: 'Sleep on learnings', run: () => tfRunShareLearnings('project') },
-  ];
-  const details = document.createElement('details');
-  // NB: deliberately NOT `.emp-hero` — that class is the employee-hero selector
-  // the tree's per-employee assign-job affordance keys off; Project Updates reuses
-  // the same visual chrome via `.proj-updates-acc` grouped CSS instead.
-  details.className = 'proj-updates-acc';
-  details.id = 'proj-updates-acc';
-  details.dataset.accKey = 'proj-updates'; // #533 R5: preserve open-state across status re-renders
-  details.open = true;
-
-  const summary = document.createElement('summary');
-  const av = document.createElement('div');
-  av.className = 'eh-av job-ico';
-  av.style.borderRadius = '9px';
-  av.style.background = 'var(--accent-soft)';
-  av.style.color = 'var(--accent)';
-  av.textContent = '🔄';
-  const id = document.createElement('div'); id.className = 'eh-id';
-  const nm = document.createElement('div'); nm.className = 'eh-name'; nm.style.fontSize = '14px'; nm.textContent = 'Project Updates';
-  const totalRuns = JOBS.reduce((n, j) => n + tfConversationsForJob(j.id, { projectPath: state.projectPath }).length, 0);
-  const role = document.createElement('div'); role.className = 'eh-role';
-  role.textContent = totalRuns ? (totalRuns + (totalRuns === 1 ? ' run' : ' runs')) : 'Onboarding & learnings';
-  id.appendChild(nm); id.appendChild(role);
-
-  const add = document.createElement('button');
-  add.type = 'button'; add.className = 'eh-add'; add.textContent = '+'; add.title = 'Run a project update';
-  add.addEventListener('click', (e) => {
-    e.preventDefault(); e.stopPropagation();
-    openPalette();
-  });
-
-  const chev = document.createElement('span'); chev.className = 'eh-chev'; chev.textContent = '▸';
-  summary.appendChild(av); summary.appendChild(id); summary.appendChild(add); summary.appendChild(chev);
-  details.appendChild(summary);
-
-  const body = document.createElement('div'); body.className = 'eh-jobs';
-  JOBS.forEach((j) => {
-    const group = document.createElement('div'); group.className = 'pu-job';
-    const head = document.createElement('div'); head.className = 'pu-job-name';
-    head.textContent = j.ico + '  ' + j.name;
-    group.appendChild(head);
-    const runs = tfConversationsForJob(j.id, { projectPath: state.projectPath });
-    if (!runs.length) {
-      const none = document.createElement('div'); none.className = 'eh-empty'; none.textContent = 'No runs yet.';
-      group.appendChild(none);
-    } else {
-      runs.forEach((c) => {
-        const row = document.createElement('div'); row.className = 'tree-job';
-        const rl = document.createElement('span'); rl.className = 'tj-label'; rl.textContent = c.title || c.jobTitle || j.name;
-        const dotCls = (typeof conversationStateDotClass === 'function') ? conversationStateDotClass(c) : 'grey';
-        const dot = document.createElement('span'); dot.className = 'tj-dot dot-' + dotCls; dot.style.background = 'var(--' + dotCls + ')';
-        row.appendChild(rl); row.appendChild(dot);
-        tfAttachRunDelete(row, c, { tree: true }); // #533 R6: delete a project-update run
-        row.addEventListener('click', () => { if (typeof switchToConversation === 'function') switchToConversation(c.id); });
-        group.appendChild(row);
-      });
-    }
-    body.appendChild(group);
-  });
-  details.appendChild(body);
-  return details;
-}
+// #693 R1: tfProjectUpdatesSection was removed. The "Project Updates" tree
+// accordion is retired; its Run Project Onboarding and Sleep on learnings actions
+// now live inside the Brief and Learnings sections (see tfEnsureAccAction, called
+// from tfRenderProjectContextTop).
 
 // #594 R2: render a conversation panel (topline + messages + coach input) into an
 // area-level container so org/manager jobs are viewable inside Company/Manager tabs.
@@ -8142,13 +8062,9 @@ function tfRenderCompany() {
     infoBtn.textContent = '📋 Company Info';
     infoBtn.addEventListener('click', () => tfToggleAreaView('company', 'info'));
     rail.appendChild(infoBtn);
-    const head = document.createElement('div'); head.className = 'area-rail-head'; head.textContent = 'Company jobs';
-    rail.appendChild(head);
-    rail.appendChild(tfAreaRailJob('🏢', 'organization-onboarding', 'Organization onboarding', 'Set up / update org context & rules', () => tfStartOrgOnboarding()));
-    rail.appendChild(tfAreaRailJob('🧠', 'organizational-learning-synthesis', 'organizational-learning-synthesis', 'Synthesize company learnings', () => tfStartOrgLearningSynthesis()));
-    const note = document.createElement('div'); note.className = 'area-rail-note';
-    note.textContent = "Company-wide work lives here — it applies across every project, so it's not in any project's job list. (sleep-on-learnings runs at the project level.)";
-    rail.appendChild(note);
+    // #693 R1 (PR round 2): the "Company jobs" launcher list is retired. Its jobs
+    // now run from the section they populate — Run Organization Onboarding in
+    // "Context & rules", Synthesize company learnings in "Company learnings".
   }
   const profile = document.getElementById('company-profile');
   const learn = document.getElementById('company-learnings');
@@ -8204,6 +8120,11 @@ function tfRenderCompany() {
   if (learn) {
     tfRenderLearningsList(learn, 'org', 'org', 'Nothing here yet — org-wide learnings that apply on every project. Run organizational-learning-synthesis (in Company jobs, left), or add one with + Add learning.');
   }
+  // #693 R1: lifecycle actions live in the sections they populate (mirrors the
+  // Projects tab): onboarding in Context & rules, learnings synthesis in Company learnings.
+  tfEnsureAccAction('company-ctx-acc', '🏢', 'Run Organization Onboarding', () => tfStartOrgOnboarding());
+  // #693 R1 (PR round 2): Company's learnings job is organizational-learning-synthesis, not sleep-on-learnings.
+  tfEnsureAccAction('company-learn-acc', '🧠', 'Synthesize company learnings', () => tfStartOrgLearningSynthesis());
   tfMaybeRenderOrgPushBanner();
   // Show the full coaching conversation panel when there is an active org conv;
   // otherwise show the info view (accordions). This uses the shared .page element
@@ -8293,12 +8214,8 @@ function tfRenderManager() {
     infoBtn.textContent = '📋 Manager Info';
     infoBtn.addEventListener('click', () => tfToggleAreaView('manager', 'info'));
     rail.appendChild(infoBtn);
-    const head = document.createElement('div'); head.className = 'area-rail-head'; head.textContent = 'Manager jobs';
-    rail.appendChild(head);
-    rail.appendChild(tfAreaRailJob('🤝', 'manager-agreements', 'manager-agreements', 'Set up / update how you work', () => tfStartManagerOnboarding()));
-    const note = document.createElement('div'); note.className = 'area-rail-note';
-    note.textContent = "manager-agreements is about you, not a single project — so it isn't in any project's job list. You coach in project conversations; what the team learns about you surfaces here.";
-    rail.appendChild(note);
+    // #693 R1 (PR round 2): the "Manager jobs" launcher list is retired.
+    // Manager agreements now runs from the "Context & rules" section it populates.
   }
   const profile = document.getElementById('manager-profile');
   const learn = document.getElementById('manager-learnings');
@@ -8361,6 +8278,12 @@ function tfRenderManager() {
     // the manager-coaching learnings the team has captured for you.
     tfRenderLearningsList(reverse, 'reverse', 'machine', 'Nothing here yet — as your team works with you, coaching on what you can improve on as a manager appears here. Add one with + Add learning.');
   }
+  // #693 R1: lifecycle actions live in the sections they populate (mirrors the
+  // Projects tab): manager agreements in Context & rules, learnings in Manager learnings.
+  tfEnsureAccAction('manager-ctx-acc', '🤝', 'Set up manager agreements', () => tfStartManagerOnboarding());
+  // #693 R1 (PR round 2): Manager has no learnings-synthesis job — its learnings
+  // surface here from project sleep-on-learnings promoted to manager scope — so no
+  // run-action button in the Manager learnings section.
   // Issue #540 R4-R7: render manager team pool on every manager-tab activation.
   renderManagerTeamPool();
   // Show the full coaching conversation panel when there is an active manager conv;
@@ -8869,6 +8792,47 @@ function tfCloseAccountMenu() {
   if (menu) menu.classList.remove('open');
 }
 
+// ---------------------------------------------------------------------------
+// Theme (#700): explicit light/dark with an in-app toggle. The <head> bootstrap
+// sets [data-theme] pre-paint (no flash) from localStorage['fraim-theme'] or the
+// OS preference; here we reflect it in the toggle control and persist changes.
+// Same-origin key sharing keeps /account and /analytics in sync on their next load.
+// ---------------------------------------------------------------------------
+function tfCurrentTheme() {
+  return document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light';
+}
+function tfSyncThemeToggle(theme) {
+  const btn = document.getElementById('am-theme-toggle');
+  if (!btn) return;
+  const on = theme === 'dark';
+  btn.setAttribute('aria-checked', on ? 'true' : 'false');
+  const sub = document.getElementById('am-theme-sub');
+  if (sub) sub.textContent = on ? 'On' : 'Off';
+  const ico = document.getElementById('am-theme-ico');
+  if (ico) ico.textContent = on ? '🌙' : '☀️';
+}
+function tfApplyTheme(theme, persist) {
+  const t = theme === 'dark' ? 'dark' : 'light';
+  document.documentElement.setAttribute('data-theme', t);
+  if (persist) { try { localStorage.setItem('fraim-theme', t); } catch (e) {} }
+  tfSyncThemeToggle(t);
+  // Keep any same-origin embedded surface (e.g. an analytics iframe) in sync live.
+  try {
+    document.querySelectorAll('iframe').forEach((f) => {
+      if (f.contentWindow) f.contentWindow.postMessage({ type: 'fraim-theme-change', theme: t }, location.origin);
+    });
+  } catch (e) {}
+}
+function tfToggleTheme(e) {
+  if (e) e.stopPropagation();
+  tfApplyTheme(tfCurrentTheme() === 'dark' ? 'light' : 'dark', true);
+}
+function tfWireThemeToggle() {
+  const btn = document.getElementById('am-theme-toggle');
+  if (btn) btn.addEventListener('click', tfToggleTheme);
+  tfSyncThemeToggle(tfCurrentTheme());
+}
+
 // Per-job config for the area onboarding pre-flight modal.
 const AREA_ONBOARD_CONFIG = {
   'organization-onboarding': {
@@ -9200,7 +9164,7 @@ async function tfCreateProject() {
     intent && `Project intent: ${intent}`,
     val('np-outcome') && `Success looks like: ${val('np-outcome')}`,
     val('np-rules') && `Rules & guardrails: ${val('np-rules')}`,
-    `Team: ${(project.team || []).join(', ') || 'no employees assigned yet'}`,
+    `Team: ${tfProjectTeamKeys().join(', ') || 'no employees assigned yet'}`,
   ].filter(Boolean).join('\n\n');
 
   if (onboardingContext) {
@@ -9386,10 +9350,9 @@ function tfAssignJobToEmployee(employeeKey, job) {
   if (!projectId) { tfCloseAssignJob(); return; }
   if (!tf.assignments[projectId]) tf.assignments[projectId] = [];
   tf.assignments[projectId].push({ id: 'a-' + Date.now(), employeeKey, jobName: job.title || job.id, jobId: job.id });
-  const proj = tf.projects.find((p) => p.id === projectId);
-  if (proj) { proj.team = proj.team || []; if (!proj.team.includes(employeeKey)) proj.team.push(employeeKey); }
+  // No longer mutate a stored project.team: the roster is derived from hired
+  // personas (tfProjectTeamKeys) and every employee is always available.
   tfPersistAssignments();
-  tfPersistProjects();
   tfCloseAssignJob();
   tfRenderTree();
   tfRenderProjectTabs();
@@ -9408,7 +9371,7 @@ function tfOpenAddEmp(preselectKey) {
   const sub = document.getElementById('ae-sub');
   if (!modal || !body) return;
   body.innerHTML = '';
-  const onProject = (tf.projects.find((p) => p.id === tf.activeProjectId) || {}).team || [];
+  const onProject = tfProjectTeamKeys();
   const onProjectPersonas = onProject.map(tfPersonaByKey).filter(Boolean);
   if (onProjectPersonas.length) {
     const label = document.createElement('div');
@@ -9578,6 +9541,7 @@ function tfWireShell() {
   }
   const avatar = document.getElementById('avatar-btn');
   if (avatar) avatar.addEventListener('click', tfToggleAccountMenu);
+  tfWireThemeToggle();
   const brainItem = document.getElementById('am-brain');
   if (brainItem) brainItem.addEventListener('click', () => { tfCloseAccountMenu(); tfShowArea('brain'); });
   const signout = document.getElementById('am-signout');