fraim-hub 2.0.286 → 2.0.287

package/dist/src/ai-hub/server.js

@@ -1916,6 +1916,24 @@ function buildManagedLoginCommand(command) {
 function getUserHubDir() {
     return path_1.default.join(os_1.default.homedir(), '.fraim');
 }
+// Issue #1345: recursively find first file matching name under dir.
+function findFileRecursive(dir, filename) {
+    try {
+        for (const entry of fs_1.default.readdirSync(dir, { withFileTypes: true })) {
+            const full = path_1.default.join(dir, entry.name);
+            if (entry.isDirectory()) {
+                const hit = findFileRecursive(full, filename);
+                if (hit)
+                    return hit;
+            }
+            else if (entry.isFile() && entry.name === filename) {
+                return full;
+            }
+        }
+    }
+    catch { /* ignore unreadable dirs */ }
+    return null;
+}
 function ensureDirectoryPath(projectPath) {
     const trimmed = (projectPath || '').trim();
     if (!trimmed) {
@@ -3242,6 +3260,7 @@ class AiHubServer {
             // so completed conversations render "What's next?" chips after reload.
             nextJobRecommendations: run.nextJobRecommendations || null,
             issueNumber: run.issueNumber ?? null,
+            executionMode: run.executionMode || null,
             managedByRunId: run.managedByRunId || null,
             managedByPersonaKey: run.managedByPersonaKey || null,
             humanCoachingDisabled: run.humanCoachingDisabled || false,
@@ -5686,6 +5705,25 @@ class AiHubServer {
                 return res.status(404).json({ error: 'Configured agent not found.' });
             return res.json((0, configured_agents_1.checkConfiguredAgentReadiness)(agent, employees));
         });
+        // Issue #1345: accept executionMode forwarded from get_fraim_job response by the local proxy.
+        // The proxy parses the Execution Mode Context block and POSTs here; Hub script reads from run poll.
+        this.app.post('/api/ai-hub/runs/by-session/:sessionId/execution-mode', (req, res) => {
+            if (!this.requireTrustedHubOrigin(req, res))
+                return;
+            const { sessionId } = req.params;
+            const { mode, completedRuns } = req.body;
+            if (!sessionId)
+                return res.status(400).json({ error: 'sessionId required' });
+            const normalizedMode = mode === 'trusted' ? 'trusted' : 'coached';
+            const normalizedRuns = typeof completedRuns === 'number' ? completedRuns : 0;
+            const run = this.runRegistry.all().find((r) => r.sessionId === sessionId);
+            if (!run)
+                return res.status(404).json({ error: 'Run not found for session.' });
+            this.runRegistry.update(run.id, (current) => {
+                current.executionMode = { mode: normalizedMode, completedRuns: normalizedRuns };
+            });
+            return res.json({ ok: true });
+        });
         this.app.post('/api/ai-hub/runs', (req, res) => {
             try {
                 // Issue #892: project-independent (manager/company) runs resolve a working dir
@@ -5726,6 +5764,26 @@ class AiHubServer {
                 if (!jobId) {
                     throw new Error('Choose a FRAIM job before starting a run.');
                 }
+                // #1394: Dedup guard — return an already-running identical run rather than spawning a second
+                // process. Key includes managerDisplay (messages[0].text) so runs for different issues are
+                // never blocked even when they share the same jobId + hostId + projectPath.
+                // Window of 300 ms: UI race duplicates arrive within ~100 ms (React render cycle);
+                // sequential test runs with the same params are separated by 600 ms+ (test body +
+                // beforeEach page.goto), so the window never fires across test boundaries.
+                const MANAGER_DEDUP_WINDOW_MS = 300;
+                if ((req.body.sourceTrigger ?? 'manager') === 'manager') {
+                    const now = Date.now();
+                    const activeRun = this.runRegistry.all().find((r) => r.status === 'running'
+                        && r.projectPath === projectPath
+                        && r.jobId === jobId
+                        && r.hostId === hostId
+                        && r.messages[0]?.text === managerDisplay
+                        && now - Date.parse(r.createdAt) < MANAGER_DEDUP_WINDOW_MS);
+                    if (activeRun) {
+                        console.warn('[ai-hub] hub.duplicate_run_blocked', { projectPath, jobId, hostId, existingRunId: activeRun.id });
+                        return res.json(this.enrichRunForResponse(activeRun));
+                    }
+                }
                 const startTimestamp = new Date().toISOString();
                 const jobMetadata = this.resolveHubJob(projectPath, jobId);
                 const fallbackJobTitle = typeof req.body.jobTitle === 'string' && req.body.jobTitle.trim()
@@ -5765,7 +5823,9 @@ class AiHubServer {
                     phaseVisits: [],
                     totals: emptyTotals(),
                     lastStatusChangeAt: startTimestamp,
-                    personaKey: jobMetadata?.personaKey ?? getHubPersonaForJob(jobId),
+                    // Issue #1357: fall back to custom persona resolution before the catalog lookup
+                    // so custom employee owners (e.g. SidCoder for feature-implementation) are used.
+                    personaKey: jobMetadata?.personaKey ?? getCustomPersonaForJob(projectPath, jobId) ?? getHubPersonaForJob(jobId),
                     // Issue #892: persist the invocation scope so the run is routed to the right
                     // conversation bucket (manager/company get a project-independent home) and so
                     // the resolved fallback working dir is never mistaken for the active project.
@@ -6230,7 +6290,8 @@ class AiHubServer {
                     totals: persistedRun?.totals || emptyTotals(),
                     lastStatusChangeAt: now,
                     runDiscriminant: persistedConversation?.status !== 'completed' ? (persistedRun?.runDiscriminant || undefined) : undefined,
-                    personaKey: getHubPersonaForJob(jobId),
+                    // Issue #1357: consult custom persona owner before falling back to catalog.
+                    personaKey: getCustomPersonaForJob(projectPath, jobId) ?? getHubPersonaForJob(jobId),
                     continuityDecision: conversationId ? 'same_continuity' : 'new_conversation',
                 };
                 host_session_state_1.hostSessionState.applySession(run, { configuredAgentId: configuredAgent.id, baseHostId: hostId }, sessionId, { sourceRunId: run.id, status: resolvedHostSession?.status || 'suspect' });
@@ -7025,7 +7086,8 @@ class AiHubServer {
                     phaseVisits: [],
                     totals: emptyTotals(),
                     lastStatusChangeAt: startTimestamp,
-                    personaKey: getHubPersonaForJob(jobName),
+                    // Issue #1357: consult custom persona owner before falling back to catalog.
+                    personaKey: getCustomPersonaForJob(projectPath, jobName) ?? getHubPersonaForJob(jobName),
                 };
                 // Register the run before spawning so onEvent/onExit callbacks can
                 // safely call update() even if they fire synchronously (FakeHostRuntime).
@@ -7178,7 +7240,8 @@ class AiHubServer {
             phaseVisits: [],
             totals: emptyTotals(),
             lastStatusChangeAt: startTimestamp,
-            personaKey: jobMetadata?.personaKey ?? getHubPersonaForJob(jobId),
+            // Issue #1357: fall back to custom persona resolution before the catalog lookup.
+            personaKey: jobMetadata?.personaKey ?? getCustomPersonaForJob(deployment.projectPath, jobId) ?? getHubPersonaForJob(jobId),
         };
         // Pre-register before startRun so synchronous onEvent calls (e.g. FakeHostRuntime)
         // can call runRegistry.update without "Run not found" throws.

package/dist/src/cli/setup/ide-invocation-surfaces.js

@@ -29,7 +29,10 @@ exports.FRAIM_MCP_UNAVAILABLE_MANAGER_GUIDANCE = [
     'If required FRAIM MCP tools remain unavailable after the deferred-tool preload/retry step, stop the FRAIM job.',
     'Do not continue from memory, local stubs, cached instructions, or prior context.',
     'In the blocker sentence, state only the work-focused blocker and what outcome is blocked; do not narrate ToolSearch/tool_search, individual tool names, server internals, or retry mechanics.',
-    'Always help troubleshoot the unavailable FRAIM MCP connection: tell the user to reconnect or enable the FRAIM MCP server in their IDE/agent, restart or refresh the agent session, retry the FRAIM job, and if it still fails run `fraim doctor --test-mcp` and share the failing check output.'
+    'Always help troubleshoot the unavailable FRAIM MCP connection: tell the user to reconnect or enable the FRAIM MCP server in their IDE/agent, restart or refresh the agent session, retry the FRAIM job, and if it still fails run `fraim doctor --test-mcp` and share the failing check output.',
+    'Exception — troubleshooting FRAIM itself: if the user\'s request is to diagnose or fix a FRAIM issue and FRAIM MCP is unavailable, do NOT stop.',
+    'Instead, read `~/.fraim/docs/TROUBLESHOOTING.md` directly from disk (it is always synced in full by `fraim sync` and is available without MCP) and follow its guidance to diagnose the issue.',
+    'After completing the local diagnosis, prompt the user to re-run `fraim sync` and restart their agent session, then offer to run the `troubleshoot-fraim` FRAIM job for a structured investigation once MCP is restored.'
 ].join(' ');
 function buildDeferredToolBootstrapSection(profile) {
     if (profile === 'none') {

package/dist/src/config/persona-capability-bundles.js

@@ -291,10 +291,20 @@ for (const bundle of Object.values(exports.PERSONA_CAPABILITY_BUNDLES)) {
 // named specialist persona. They resolve through ownership (never short-circuited
 // as "free") so the Hub attributes them to FRAIMworker, but they are never
 // hire-gated because FRAIMworker is not a purchasable persona.
+//
+// Issue #1398: manager-agreements / organization-onboarding / organizational-learning-
+// synthesis are Manager/Company area-level jobs, not tied to a named specialist — they
+// were falling through to DEFAULT_UNASSIGNED_PERSONA_KEY ('mandy'), which misattributed
+// them to an employee who never runs them and left them outside the Manager/Company
+// employee rail's FRAIMworker group.
 const GENERIC_WORKER_OWNED_JOBS = new Set([
     'contribute-to-fraim',
     'file-fraim-issue',
     'praise-fraim',
+    'troubleshoot-fraim',
+    'manager-agreements',
+    'organization-onboarding',
+    'organizational-learning-synthesis',
 ]);
 function getPersonaCapabilityBundle(personaKey) {
     return exports.PERSONA_CAPABILITY_BUNDLES[personaKey];

package/dist/src/fraim/db-service.js

@@ -170,6 +170,8 @@ class FraimDbService {
         // Issue #563 — shared organization context (FRAIM-cloud backend).
         this.orgArtifactsCollection = this.db.collection('fraim_org_artifacts');
         this.orgAuditCollection = this.db.collection('fraim_org_audit');
+        // Issue #1345 — job execution modes (Coached/Trusted).
+        this.jobExecutionModesCollection = this.db.collection('fraim_job_execution_modes');
     }
     async initializeIndexes() {
         if (!this.db)
@@ -199,6 +201,7 @@ class FraimDbService {
         // requirement — swallow failures like the other Cosmos-sensitive indexes above.
         await this.orgArtifactsCollection.createIndex({ orgId: 1, relativePath: 1 }, { unique: true }).catch(() => { });
         await this.orgAuditCollection.createIndex({ orgId: 1, at: -1 }).catch(() => { });
+        await this.jobExecutionModesCollection.createIndex({ userId: 1, jobName: 1 }, { unique: true }).catch(() => { });
         await this.pendingVerificationsCollection.createIndex({ email: 1 });
         // Compound index covers `findOne({email}, { sort: { createdAt: -1 } })` —
         // the request-access flow's lookup of the most-recent pending row per
@@ -286,6 +289,36 @@ class FraimDbService {
             throw new Error('DB not connected');
         return await this.orgAuditCollection.find({ orgId }).sort({ at: -1 }).toArray();
     }
+    async getJobExecutionMode(userId, jobName) {
+        if (!this.jobExecutionModesCollection)
+            return null;
+        return await this.jobExecutionModesCollection.findOne({ userId, jobName }) ?? null;
+    }
+    async upsertJobExecutionMode(userId, update) {
+        if (!this.jobExecutionModesCollection)
+            return;
+        const jobName = String(update['jobName'] ?? '');
+        if (!jobName)
+            return;
+        const existing = await this.jobExecutionModesCollection.findOne({ userId, jobName });
+        let completedRuns = typeof existing?.completedRuns === 'number' ? existing.completedRuns : 0;
+        if (update['incrementRun'] === true)
+            completedRuns += 1;
+        const record = {
+            userId,
+            jobName,
+            mode: (update['mode'] === 'trusted' || update['mode'] === 'coached')
+                ? update['mode']
+                : (existing?.mode ?? 'coached'),
+            completedRuns,
+            trustedSince: typeof update['trustedSince'] === 'string' ? update['trustedSince'] : existing?.trustedSince,
+            trustedAtRun: typeof update['trustedAtRun'] === 'number' ? update['trustedAtRun'] : existing?.trustedAtRun,
+            lastGraduationOfferRun: typeof update['lastGraduationOfferRun'] === 'number' ? update['lastGraduationOfferRun'] : existing?.lastGraduationOfferRun,
+            graduationSuppressedUntilRun: typeof update['graduationSuppressedUntilRun'] === 'number' ? update['graduationSuppressedUntilRun'] : existing?.graduationSuppressedUntilRun,
+            updatedAt: new Date(),
+        };
+        await this.jobExecutionModesCollection.replaceOne({ userId, jobName }, record, { upsert: true });
+    }
     async verifyApiKey(key) {
         if (!this.keysCollection)
             throw new Error('DB not connected');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.286",
+  "version": "2.0.287",
   "description": "FRAIM Hub local companion package.",
   "author": "Sid Mathur <sid.mathur@gmail.com>",
   "homepage": "https://github.com/mathursrus/FRAIM#readme",
@@ -210,7 +210,7 @@
     "electron-updater": "^6.8.9",
     "express": "^5.2.1",
     "extract-zip": "^2.0.1",
-    "fraim": "2.0.286",
+    "fraim": "2.0.287",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",

package/public/ai-hub/index.html

@@ -827,8 +827,10 @@
   </div>
 
   <!-- #1351: unified Add Agent dialog — add a configured profile directly, or delegate
-       setup to FRAIM. Replaces the separate "Add AI agent" button + "setup another tool"
-       disclosure both opening the same generic onboarding modal with no manual option. -->
+       setup to FRAIM. This is the single entry point for agent setup: the toolbar's
+       "Add AI agent" button and, on #1390, the per-tool quick-picks inside the Delegate
+       tab (which replaced the old standalone "setup another tool" disclosure) both open
+       this same dialog. -->
   <div id="add-agent-modal" class="modal-overlay" role="dialog" aria-modal="true" aria-labelledby="aam-title" hidden>
     <div class="modal-card">
       <div class="modal-hdr">
@@ -845,6 +847,11 @@
       <div class="modal-body">
         <div id="aam-manual-pane"></div>
         <div id="aam-delegate-pane" hidden>
+          <div id="aam-delegate-quickpicks" class="aam-delegate-quickpicks" data-testid="aam-delegate-quickpicks" hidden>
+            <p class="aam-delegate-quickpicks-label">Not set up yet on this machine:</p>
+            <div id="aam-delegate-quickpicks-list" class="aam-delegate-quickpicks-list"></div>
+            <p id="aam-delegate-quickpick-caption" class="aam-delegate-quickpick-caption" data-testid="aam-delegate-quickpick-caption" hidden></p>
+          </div>
           <div class="np-field">
             <label for="aam-delegate-context">Any specific direction for this run? <span class="np-optional">(optional, leave blank to start with defaults)</span></label>
             <textarea id="aam-delegate-context" rows="4" data-testid="add-agent-delegate-context" placeholder="e.g. Configure a CLI, a cloud-credit route, or a custom profile."></textarea>

package/public/ai-hub/script.js

@@ -3605,6 +3605,7 @@ function renderActive() {
   els['active-conv'].classList.toggle('has-manager-oversight', isManagerOversightConversation(conv));
   renderConversationIdentity(conv);
   renderRunStatePill(conv);
+  renderJobModeChip(conv);
   syncCoachEmployeeLabel(conv);
   syncThreadPanelKicker(conv);
   syncCoachPanelKicker(conv);
@@ -3621,6 +3622,7 @@ function renderActive() {
     els['micro-log'].textContent = '';
     if (els['resume-command']) els['resume-command'].hidden = true;
     renderedConvId = conv.id;
+    _modeChipLastKey = null;
     renderedMessageCount = 0;
     renderedMessageFingerprints = [];
     renderedEventCount = 0;
@@ -3866,6 +3868,65 @@ function renderConversationIdentity(conv) {
   host.appendChild(text);
 }
 
+// Issue #1345: "In Training" chip in .conv-topline for Coached-mode jobs (R10).
+// Shown when mode is coached (not trusted). Training instructions are now injected by the MCP.
+let _modeChipLastKey = null;
+function renderJobModeChip(conv) {
+  const topline = document.querySelector('#active-conv > .conv-topline');
+  const titleEl = els['active-title'];
+  if (!topline || !titleEl) return;
+
+  const removeChip = () => {
+    const old = topline.querySelector('.job-mode-chip');
+    if (old) old.remove();
+    _modeChipLastKey = null;
+  };
+
+  const jobName = conv && conv.jobId && conv.jobId !== '__freeform__' ? conv.jobId : null;
+  const personaKey = conv && conv.personaKey ? conv.personaKey : null;
+  if (!jobName || !personaKey) { removeChip(); return; }
+
+  // Issue #1345: read executionMode from run data folded in by foldRunIntoConversation.
+  // No fetch needed — the local proxy forwards it from the get_fraim_job response.
+  const data = conv.executionMode;
+  if (!data || data.mode === 'trusted') { removeChip(); return; }
+
+  const key = `${personaKey}:${jobName}`;
+  if (_modeChipLastKey === key && topline.querySelector('.job-mode-chip')) return;
+
+  _modeChipLastKey = key;
+  let chip = topline.querySelector('.job-mode-chip');
+  if (!chip) {
+    chip = document.createElement('span');
+    chip.className = 'job-mode-chip job-mode-chip--in-training';
+    chip.setAttribute('aria-label', 'In Training: training pauses active on this job');
+
+    const label = document.createElement('span');
+    label.textContent = 'In Training';
+    chip.appendChild(label);
+
+    const tooltip = document.createElement('div');
+    tooltip.className = 'chip-tooltip';
+
+    const runCount = typeof data.completedRuns === 'number' ? data.completedRuns : 0;
+    const personaDisplay = (() => {
+      const p = (state.bootstrap && state.bootstrap.personas || []).find((p) => p.key === personaKey);
+      return p ? p.displayName : personaKey;
+    })();
+    const personaDisplayEsc = tfEscape(personaDisplay);
+    const threshold = 3;
+
+    tooltip.innerHTML = [
+      `<div class="chip-tooltip-section"><div class="chip-tooltip-label">Why</div>${personaDisplayEsc} is still learning how you like this job to be structured. ${runCount === 0 ? "You haven't run it together yet." : `${runCount === 1 ? "You've done it once together" : `You've done it ${runCount} times together`} so far.`}</div>`,
+      `<div class="chip-tooltip-section"><div class="chip-tooltip-label">What this means</div>${personaDisplayEsc} will show you an outline of what they plan to build before drafting, so you can redirect the shape before any prose is written.</div>`,
+      `<div class="chip-tooltip-section"><div class="chip-tooltip-label">How to graduate</div>After ${threshold} completed runs, the retrospective recommends the <strong>graduate-job</strong>. Run it to promote this job to Trusted mode and skip the training pauses on future runs.</div>`,
+    ].join('');
+    chip.appendChild(tooltip);
+
+    titleEl.insertAdjacentElement('afterend', chip);
+  }
+}
+
 function renderRunStatePill(conv) {
   const pill = els['run-state-pill'];
   if (!pill) return;
@@ -8282,6 +8343,8 @@ function foldRunIntoConversation(conv, run) {
   }
   // Issue #848: fold next-job recommendations + the issue pointer from the run.
   conv.nextJobRecommendations = normalizeNextJobRecommendations(run.nextJobRecommendations);
+  // Issue #1345: execution mode forwarded from get_fraim_job response via local proxy.
+  conv.executionMode = run.executionMode || null;
   if (run.issueNumber !== undefined && run.issueNumber !== null) conv.issueNumber = run.issueNumber;
   if (Array.isArray(run.agentSwitches)) conv.agentSwitches = run.agentSwitches;
   if (run.handoffSummary !== undefined) conv.handoffSummary = run.handoffSummary;
@@ -8448,8 +8511,10 @@ function switchToConversation(id) {
     const info = document.getElementById(tf.area + '-info-view');
     if (host) host.hidden = false;
     if (info) info.hidden = true;
-    // #1351: deliberately opening a run overrides any earlier pin to the info view.
-    if (tf.viewPinned) tf.viewPinned[tf.area] = false;
+    // #1397: an area selection represents every explicit destination, not only
+    // the Info view. Poll-driven renders must preserve this conversation until
+    // the user chooses another destination or the conversation disappears.
+    if (tf.areaSelection) tf.areaSelection[tf.area] = id;
   }
   renderRail();
   renderActive();
@@ -8807,39 +8872,6 @@ function renderConfiguredAgentsPanel() {
     }
   }
 
-  const uninstalled = hubEmployees().filter((e) => !e.available);
-  if (uninstalled.length) {
-    const disclosure = document.createElement('details');
-    disclosure.className = 'configured-agents-setup-disclosure';
-    disclosure.dataset.testid = 'setup-another-tool';
-    const summary = document.createElement('summary');
-    summary.textContent = 'Set up another tool';
-    disclosure.appendChild(summary);
-    for (const emp of uninstalled) {
-      const row = document.createElement('div');
-      row.className = 'install-row';
-      const label = document.createElement('span');
-      label.className = 'install-label';
-      label.textContent = emp.label;
-      const empDetail = document.createElement('span');
-      empDetail.className = 'install-status';
-      empDetail.textContent = emp.detail || 'Not installed';
-      const btn = document.createElement('button');
-      btn.type = 'button';
-      btn.className = 'small';
-      btn.textContent = 'Set up';
-      btn.dataset.testid = `hub-agent-install-${emp.id}`;
-      btn.addEventListener('click', () => openAddAgentModal(
-        'delegate',
-        `Set up ${emp.label}: install the CLI, sign in, and configure it as a Hub agent.`
-      ));
-      row.appendChild(label);
-      row.appendChild(empDetail);
-      row.appendChild(btn);
-      disclosure.appendChild(row);
-    }
-    panel.appendChild(disclosure);
-  }
 }
 
 // #1351: unified Add Agent dialog. "Add Manually" hosts the existing structured
@@ -8851,16 +8883,59 @@ function renderConfiguredAgentsPanel() {
 // dialog's tab chrome would show an unrelated "Add Manually" tab next to those jobs.
 // Reusing tfStartOnboardingJob (the actual capability) rather than the modal markup
 // (incidental UI chrome) is the correct level of reuse here.
+//
+// #1390: this is the single setup entry point for AI agents. The panel's toolbar
+// "Add AI agent" button is the only affordance rendered inline on the AI Agents tab;
+// the per-tool shortcuts that used to live in a standalone "Set up another tool"
+// disclosure on that panel now live as quick-pick chips inside this dialog's Delegate
+// tab (renderAddAgentDelegateQuickpicks), so there is exactly one place to start setup.
 function openAddAgentModal(tab, delegateMessage) {
   state._addAgentDelegateMessage = delegateMessage
     || 'Set up a new Hub AI agent: configure a CLI, cloud-credit route, or custom profile.';
+  state._addAgentDelegateEmployeeId = null;
   const ctx = document.getElementById('aam-delegate-context');
   if (ctx) ctx.value = '';
+  renderAddAgentDelegateQuickpicks();
   const modal = document.getElementById('add-agent-modal');
   if (modal) modal.hidden = false;
   setAddAgentTab(tab === 'delegate' ? 'delegate' : 'manual');
 }
 
+// #1390: quick-pick chips for tools not yet installed on this machine, shown inside
+// the Delegate tab. Clicking one targets the delegate job at that specific tool —
+// the same outcome the old standalone "Set up another tool" disclosure gave, without
+// a second setup entry point on the AI Agents panel itself.
+function renderAddAgentDelegateQuickpicks() {
+  const wrap = document.getElementById('aam-delegate-quickpicks');
+  const list = document.getElementById('aam-delegate-quickpicks-list');
+  const caption = document.getElementById('aam-delegate-quickpick-caption');
+  if (!wrap || !list) return;
+  list.innerHTML = '';
+  const uninstalled = hubEmployees().filter((e) => !e.available);
+  wrap.hidden = !uninstalled.length;
+  for (const emp of uninstalled) {
+    const chip = document.createElement('button');
+    chip.type = 'button';
+    chip.className = 'jf-chip aam-delegate-quickpick';
+    chip.textContent = emp.label;
+    chip.dataset.testid = `hub-agent-install-${emp.id}`;
+    chip.classList.toggle('active', state._addAgentDelegateEmployeeId === emp.id);
+    chip.addEventListener('click', () => selectAddAgentDelegateQuickpick(emp));
+    list.appendChild(chip);
+  }
+  if (caption) {
+    const selected = uninstalled.find((e) => e.id === state._addAgentDelegateEmployeeId);
+    caption.textContent = selected ? state._addAgentDelegateMessage : '';
+    caption.hidden = !selected;
+  }
+}
+
+function selectAddAgentDelegateQuickpick(emp) {
+  state._addAgentDelegateEmployeeId = emp.id;
+  state._addAgentDelegateMessage = `Set up ${emp.label}: install the CLI, sign in, and configure it as a Hub agent.`;
+  renderAddAgentDelegateQuickpicks();
+}
+
 function closeAddAgentModal() {
   const modal = document.getElementById('add-agent-modal');
   if (modal) modal.hidden = true;
@@ -9998,12 +10073,11 @@ const tf = {
   // #769: hire-pending state for post-Stripe redirect polling
   hirePendingState: null,    // null | 'polling' | 'timeout'
   hirePendingBaseCount: 0,   // hired persona count at polling start
-  // #1351: a manual tfToggleAreaView(area, 'info') pins that area to the info view
-  // until the user (or a genuinely new run in that area) changes it. Without this,
-  // tfRenderManager()/tfRenderCompany() re-derive the visible sub-view from
-  // tfActiveMgrConv()/tfActiveOrgConv() on every ~1s poll tick, silently reverting a
-  // deliberate manual navigation choice while a running conversation still exists.
-  viewPinned: { manager: false, company: false },
+  // #1397: the explicit destination selected in each area. `null` means the area
+  // may auto-home to its most relevant conversation; `info` and conversation IDs
+  // are user choices that survive every poll-driven render. This replaces the
+  // former info-only viewPinned special case with one navigation-state contract.
+  areaSelection: { manager: null, company: null },
 };
 
 // ---------------------------------------------------------------------------
@@ -12950,6 +13024,52 @@ function tfActiveMgrConv() {
   );
 }
 
+// #1397: resolve one stable destination for an area. Polling may refresh the
+// conversations behind that destination, but it may not choose a different one.
+// A deleted or re-scoped conversation invalidates the selection and restores the
+// area's normal auto-home behavior.
+function tfResolveAreaView(area, fallbackConv) {
+  const selected = tf.areaSelection && tf.areaSelection[area];
+  if (selected === 'info') return { info: true, conversation: null };
+  if (selected) {
+    const conv = findConversation(selected);
+    if (conv && convScope(conv) === area) return { info: false, conversation: conv };
+    tf.areaSelection[area] = null;
+  }
+  return { info: !fallbackConv, conversation: fallbackConv || null };
+}
+
+function tfAreaScopedConversations(area) {
+  return Object.values(state.conversations || {}).flat()
+    .filter((conv) => conv && convScope(conv) === area)
+    .sort((a, b) => (b.lastUpdatedAt || 0) - (a.lastUpdatedAt || 0));
+}
+
+// Every area has FRAIMworker. Named employees join an area when that area is
+// their home (Ashley on Manager) or when they actually have a run there. This
+// keeps other hired project employees out of Manager/Company until relevant,
+// while ensuring every scoped run remains reachable under its owner.
+function tfAreaRailPersonas(area) {
+  const personas = new Map([[GENERIC_WORKER_PERSONA.key, GENERIC_WORKER_PERSONA]]);
+  const bootstrapPersonas = (state.bootstrap && state.bootstrap.personas) || [];
+  if (area === 'manager') {
+    const catalogJobs = (state.bootstrap && state.bootstrap.jobs) || [];
+    for (const persona of bootstrapPersonas) {
+      if (!MANAGER_PERSONA_KEYS.has(persona.key) || !tfIsPersonaHired(persona.key)) continue;
+      // Defensive: only give a home persona an employee group if the catalog actually has
+      // a job that requires them, mirroring the original Manager-tab-only guard.
+      if (!catalogJobs.some((j) => j && j.requiredPersonaKey === persona.key)) continue;
+      personas.set(persona.key, persona);
+    }
+  }
+  for (const conv of tfAreaScopedConversations(area)) {
+    if (!conv.personaKey || personas.has(conv.personaKey)) continue;
+    const persona = getConversationPersona(conv);
+    if (persona) personas.set(persona.key, persona);
+  }
+  return [...personas.values()];
+}
+
 // #702: is a persona hired (has a company seat) so its manager-tab jobs should show?
 // (MANAGER_ASHLEY_JOBS is defined once at the top of this file as the single source of truth.)
 function tfIsPersonaHired(personaKey) {
@@ -12970,7 +13090,7 @@ function tfStartManagerPersonaJob(jobId) {
 // identical on both tabs.
 function tfBuildManagerRunItem(conv) {
   const btn = document.createElement('button');
-  btn.className = 'conv-item';
+  btn.className = 'conv-item' + (state.activeId === conv.id ? ' active' : '');
   btn.type = 'button';
   btn.dataset.conv = conv.id;
   const body = document.createElement('span'); body.className = 'conv-body';
@@ -12995,11 +13115,9 @@ function tfBuildManagerRunItem(conv) {
 // visual as the Projects rail employee groups (avatar + name + role + count + "+" that
 // opens the job palette), with the persona's MANAGER-invoked runs listed under it.
 // Keeps a persona looking like an employee, consistent across tabs.
-function tfRenderManagerPersonaGroup(rail, persona) {
+function tfRenderAreaPersonaGroup(rail, persona, area) {
   const sample = { personaKey: persona.key };
-  const runs = Object.values(state.conversations || {}).flat()
-    .filter((c) => c && c.personaKey === persona.key && convScope(c) === 'manager')
-    .sort((a, b) => (b.lastUpdatedAt || 0) - (a.lastUpdatedAt || 0));
+  const runs = tfAreaScopedConversations(area).filter((c) => c.personaKey === persona.key);
   const details = document.createElement('details');
   details.className = 'conv-employee-group';
   details.open = true;
@@ -13018,8 +13136,8 @@ function tfRenderManagerPersonaGroup(rail, persona) {
   addBtn.setAttribute('aria-label', 'Launch a job for ' + (persona.displayName || persona.key));
   addBtn.addEventListener('click', (e) => {
     e.preventDefault(); e.stopPropagation();
-    // Launch from the Manager tab: palette prefiltered to this persona. Runs started
-    // while the manager tab is active default to invokedArea='manager'.
+    // Launch from this area: palette prefiltered to the employee. startRun stamps
+    // the active area on the conversation so it returns to the same rail.
     openPalette({ employeeId: (state.bootstrap && state.bootstrap.preferences && state.bootstrap.preferences.employeeId) || 'claude', prefixSearch: '/' + persona.key });
   });
   const count = document.createElement('span'); count.className = 'conv-employee-tab-count';
@@ -13038,6 +13156,39 @@ function tfRenderManagerPersonaGroup(rail, persona) {
   rail.appendChild(details);
 }
 
+// #1397/#1398: shared employee rail for the Manager and Company tabs. FRAIMworker is
+// always present (issue #1398 — every area has a generic owner to fall back to); named
+// employees join when the area is their home (Ashley on Manager) or they actually have
+// a run there (e.g. Aida's manager-scoped runs), via tfAreaRailPersonas. `ownerlessConv`
+// is the area's own top-level job run (manager-agreements / org onboarding) or any other
+// run with no persona group to live under; it gets its own rail entry unless a group
+// below will already list it.
+function tfRenderAreaEmployeeRail(rail, area, ownerlessConv) {
+  const areaPersonas = tfAreaRailPersonas(area);
+  // A group only actually lists conversations tfAreaScopedConversations(area) returns
+  // (i.e. correctly scope/invokedArea-tagged). A legacy conv that predates that tagging
+  // (see #1351) can share a persona key with a rail group yet not appear inside it — it
+  // still needs its own top-level entry, or it becomes unreachable.
+  const scopedIds = new Set(tfAreaScopedConversations(area).map((c) => c.id));
+  const ownedByGroup = !!(ownerlessConv && ownerlessConv.personaKey && scopedIds.has(ownerlessConv.id)
+    && areaPersonas.some((p) => p.key === ownerlessConv.personaKey));
+  if (ownerlessConv && !ownedByGroup) rail.appendChild(tfBuildManagerRunItem(ownerlessConv));
+  let any = false;
+  for (const persona of areaPersonas) {
+    if (!any) {
+      const head = document.createElement('div'); head.className = 'area-rail-head'; head.textContent = 'Your employees';
+      rail.appendChild(head);
+      any = true;
+    }
+    tfRenderAreaPersonaGroup(rail, persona, area);
+  }
+  if (any) {
+    const pNote = document.createElement('div'); pNote.className = 'area-rail-note';
+    pNote.textContent = "These employees work across every project you manage. Launch a job here (＋) for cross-project work. Its run stays on this tab; the same employee's job launched inside a project stays there. Coach and verify like any employee.";
+    rail.appendChild(pNote);
+  }
+}
+
 // Move the shared .page conversation panel into the specified area's workspace-conv host.
 // All .workspace-conv CSS rules (header/rail hidden, conv fills space) apply automatically
 // because the area-conv-host elements carry the workspace-conv class.
@@ -13062,12 +13213,13 @@ function tfToggleAreaView(area, view) {
     tfEnsurePageInArea('projects');
     state.activeId = null;
     renderActive();
-    // #1351: a manual switch to the info view is a deliberate navigation choice —
-    // pin it so the next poll-driven tfRenderManager()/tfRenderCompany() doesn't
-    // silently flip back to the run view just because a conversation is still
-    // running. Cleared by tfStartOnboardingJob() when a genuinely new run starts
-    // in this area, or by the user opening a run directly (switchToConversation).
-    if (tf.viewPinned && (area === 'manager' || area === 'company')) tf.viewPinned[area] = true;
+    // #1397: a manual switch to the info view is a deliberate navigation choice, exactly
+    // like picking a specific conversation — record it as this area's explicit selection so
+    // the next poll-driven tfRenderManager()/tfRenderCompany() doesn't silently flip back to
+    // the run view just because a conversation is still running. Overwritten by
+    // tfStartOnboardingJob() when a genuinely new run starts in this area, or by the user
+    // opening a run directly (switchToConversation).
+    if (tf.areaSelection && (area === 'manager' || area === 'company')) tf.areaSelection[area] = 'info';
   }
 }
 
@@ -13095,10 +13247,14 @@ function tfRenderCompany() {
     // Issue #1124: when a company-scoped org conv exists, add a visible rail entry so
     // the user can see and navigate to it. Previously the rail had only the static info
     // button and the conversation was unreachable from the left nav.
-    if (orgConv) rail.appendChild(tfBuildManagerRunItem(orgConv));
     // #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".
+    // #1398: FRAIMworker (and any hired employee with a company-scoped run, e.g. Aida)
+    // get the same employee-group presentation as the Manager rail — not just an orphan
+    // entry for the single "most active" org conv.
+    tfRenderAreaEmployeeRail(rail, 'company', orgConv);
+    tfReopenPendingRunDelete(rail);
   }
   const profile = document.getElementById('company-profile');
   const learn = document.getElementById('company-learnings');
@@ -13166,10 +13322,12 @@ function tfRenderCompany() {
   const orgConv = tfActiveOrgConv();
   const host = document.getElementById('company-conv-host');
   const info = document.getElementById('company-info-view');
-  // #1351: a manual "Company Info" pin overrides an otherwise-active org conv until
-  // the user (or a genuinely new run) changes it — see tf.viewPinned.
-  if (orgConv && tf.area === 'company' && !(tf.viewPinned && tf.viewPinned.company)) {
-    state.activeId = orgConv.id;
+  // #1397: resolve the area's one stable destination — an explicit conversation choice,
+  // an explicit "Company Info" choice, or (absent either) the org conv auto-home. Replaces
+  // the former Info-only tf.viewPinned special case with one navigation-state contract.
+  const companyView = tfResolveAreaView('company', orgConv);
+  if (tf.area === 'company' && !companyView.info && companyView.conversation) {
+    state.activeId = companyView.conversation.id;
     tfEnsurePageInArea('company');
     if (host) host.hidden = false;
     if (info) info.hidden = true;
@@ -13251,46 +13409,14 @@ function tfRenderManager() {
     infoBtn.textContent = '📋 Manager Info';
     infoBtn.addEventListener('click', () => tfToggleAreaView('manager', 'info'));
     rail.appendChild(infoBtn);
-    // #1351: mirror tfRenderCompany's "if (orgConv) rail.appendChild(tfBuildManagerRunItem(orgConv))"
-    // pattern. Without this, a manager-scope run with no persona owner (create-hub-configured-agent,
-    // manager-agreements) has NO rail entry at all — the persona-group loop below only lists runs
-    // tagged with a hired persona's own key. That leaves the run reachable only while its poll tick
-    // forces the run view open; the moment the user pins to "Manager Info" (or the pin survives a
-    // tab switch), there is no way back to it. Guarded so a persona-owned active conv is not listed
-    // twice (once here, once in its own employee group below).
-    const mgrConvOwnedByGroup = !!(mgrConv && mgrConv.personaKey
-      && MANAGER_PERSONA_KEYS.has(mgrConv.personaKey) && tfIsPersonaHired(mgrConv.personaKey));
-    if (mgrConv && !mgrConvOwnedByGroup) rail.appendChild(tfBuildManagerRunItem(mgrConv));
     // #693 R1 (PR round 2): the "Manager jobs" launcher list is retired.
     // Manager agreements now runs from the "Context & rules" section it populates.
-    // Issue #702: for each hired persona with catalog jobs, render an EMPLOYEE GROUP on
-    // the Manager rail — the same avatar + name + runs + "+" presentation as the Projects
-    // rail (tfRenderManagerPersonaGroup reuses conv-employee-group), so a persona looks
-    // identical on both tabs. Data-driven from bootstrap job metadata (job.requiredPersonaKey),
-    // not a hardcoded list. Runs launched here are tagged invokedArea='manager'; the same
-    // employee's job launched inside a project stays in that project.
-    const mgrPersonas = (state.bootstrap && state.bootstrap.personas) || [];
-    const catalogJobs = (state.bootstrap && state.bootstrap.jobs) || [];
-    let anyMgrEmployee = false;
-    for (const persona of mgrPersonas) {
-      // Only manager-scoped personas (Ashley) live on the Manager tab; project employees
-      // are shown on Projects, not here (#702 R1b). Without this, an all-hired legacy
-      // workspace surfaced every employee on the Manager rail.
-      if (!MANAGER_PERSONA_KEYS.has(persona.key)) continue;
-      if (!tfIsPersonaHired(persona.key)) continue;
-      if (!catalogJobs.some((j) => j && j.requiredPersonaKey === persona.key)) continue;
-      if (!anyMgrEmployee) {
-        const head = document.createElement('div'); head.className = 'area-rail-head'; head.textContent = 'Your employees';
-        rail.appendChild(head);
-        anyMgrEmployee = true;
-      }
-      tfRenderManagerPersonaGroup(rail, persona);
-    }
-    if (anyMgrEmployee) {
-      const pNote = document.createElement('div'); pNote.className = 'area-rail-note';
-      pNote.textContent = "These employees work across every project you manage. Launch a job here (＋) for cross-project work. Its run stays on this tab; the same employee's job launched inside a project stays there. Coach and verify like any employee.";
-      rail.appendChild(pNote);
-    }
+    // Issue #702/#1398: render an EMPLOYEE GROUP for FRAIMworker plus every hired persona
+    // that is either home to this area (Ashley on Manager) or has an actual run here (e.g.
+    // Aida's manager-scoped runs) — the same avatar + name + runs + "+" presentation as the
+    // Projects rail. `mgrConv` (the area's own top-level run, e.g. manager-agreements) gets
+    // its own rail entry unless a group above already lists it.
+    tfRenderAreaEmployeeRail(rail, 'manager', mgrConv);
     // #824: the manager rail also attaches run-delete controls; re-attach an open
     // confirm this innerHTML='' rebuild would otherwise drop.
     tfReopenPendingRunDelete(rail);
@@ -13391,10 +13517,11 @@ function tfRenderManager() {
   const mgrConv = tfActiveMgrConv();
   const mgrHost = document.getElementById('manager-conv-host');
   const mgrInfo = document.getElementById('manager-info-view');
-  // #1351: a manual "Manager Info" pin overrides an otherwise-active manager conv
-  // until the user (or a genuinely new run) changes it — see tf.viewPinned.
-  if (mgrConv && tf.area === 'manager' && !(tf.viewPinned && tf.viewPinned.manager)) {
-    state.activeId = mgrConv.id;
+  // #1397: resolve the area's one stable destination — see tfRenderCompany's companyView
+  // for the full rationale. Replaces the former Info-only tf.viewPinned special case.
+  const managerView = tfResolveAreaView('manager', mgrConv);
+  if (tf.area === 'manager' && !managerView.info && managerView.conversation) {
+    state.activeId = managerView.conversation.id;
     tfEnsurePageInArea('manager');
     if (mgrHost) mgrHost.hidden = false;
     if (mgrInfo) mgrInfo.hidden = true;
@@ -14938,11 +15065,14 @@ async function tfStartOnboardingJob(jobId, message, targetArea, userContext) {
   const finalMessage = (userContext && userContext.trim()) ? userContext.trim() : jobMessage;
   if (job && typeof startRun === 'function') {
     if (targetArea) tfShowArea(targetArea);
-    // #1351: a genuinely new run in this area always wins over an earlier pin to
-    // the info view — otherwise the just-started run (e.g. create-hub-configured-agent)
-    // would stay invisible behind a stale manual "Manager Info" choice.
-    if (tf.viewPinned && (targetArea === 'manager' || targetArea === 'company')) tf.viewPinned[targetArea] = false;
     await startRun(job, finalMessage, employeeId, undefined, targetArea);
+    // #1397: a genuinely new run in this area is itself an explicit destination — it must
+    // win over an earlier selection (Info view or a different conversation), otherwise the
+    // just-started run (e.g. create-hub-configured-agent) would stay invisible behind a
+    // stale manual choice. startRun() already set state.activeId to the new conversation.
+    if (tf.areaSelection && (targetArea === 'manager' || targetArea === 'company') && state.activeId) {
+      tf.areaSelection[targetArea] = state.activeId;
+    }
     // After run creation refresh the area panel so the conversation becomes visible.
     if (targetArea === 'company') tfRenderCompany();
     else if (targetArea === 'manager') tfRenderManager();

package/public/ai-hub/styles.css

@@ -1033,6 +1033,66 @@ img.conv-employee-avatar {
   color: #2e7d32;
   font-weight: 800;
 }
+/* Issue #1345: job execution mode chip — shown in .conv-topline for Coached-mode jobs. */
+.job-mode-chip {
+  font-size: 10px;
+  font-weight: 600;
+  letter-spacing: .03em;
+  padding: 2px 8px;
+  border-radius: 999px;
+  flex-shrink: 0;
+  cursor: default;
+  position: relative;
+}
+.job-mode-chip--in-training {
+  background: rgba(0, 88, 176, 0.10);
+  color: #0058b0;
+  border: 1px solid rgba(0, 88, 176, 0.18);
+}
+[data-theme="dark"] .job-mode-chip--in-training {
+  background: rgba(96, 160, 224, 0.14);
+  color: #60a0e0;
+  border-color: rgba(96, 160, 224, 0.22);
+}
+.job-mode-chip--in-training .chip-tooltip {
+  display: none;
+  position: absolute;
+  top: calc(100% + 8px);
+  left: 0;
+  width: 260px;
+  background: #fff;
+  border: 1px solid #d0d0d5;
+  border-radius: 10px;
+  box-shadow: 0 4px 16px rgba(0,0,0,.12);
+  padding: 12px 14px;
+  font-size: 12px;
+  color: #1d1d1f;
+  line-height: 1.6;
+  z-index: var(--z-dropdown-menu);
+  pointer-events: none;
+  white-space: normal;
+  text-transform: none;
+  letter-spacing: normal;
+  font-weight: 400;
+}
+[data-theme="dark"] .job-mode-chip--in-training .chip-tooltip {
+  background: #2a2a2e;
+  border-color: #3a3a3f;
+  color: #e8e8ea;
+}
+.job-mode-chip--in-training:hover .chip-tooltip { display: block; }
+.chip-tooltip-section { margin-bottom: 8px; }
+.chip-tooltip-section:last-child { margin-bottom: 0; }
+.chip-tooltip-label {
+  font-size: 10px;
+  font-weight: 700;
+  letter-spacing: .04em;
+  text-transform: uppercase;
+  color: #0058b0;
+  margin-bottom: 2px;
+}
+[data-theme="dark"] .chip-tooltip-label { color: #60a0e0; }
+
 .conv-header {
   display: flex;
   flex-wrap: wrap;
@@ -2361,21 +2421,21 @@ img.coach-employee-avatar { object-fit: cover; border-radius: 4px; }
 .install-label { font-weight: 500; min-width: 90px; }
 .install-status { color: var(--muted); flex: 1; font-size: 12px; }
 button.small { padding: 4px 10px; font-size: 12px; }
-.configured-agents-setup-disclosure {
-  margin-top: 12px;
-  border-top: 1px solid var(--line);
-  padding-top: 8px;
-}
-.configured-agents-setup-disclosure > summary {
+/* #1390: quick-pick chips for uninstalled tools inside the Add Agent dialog's
+   Delegate tab — the single setup entry point (see aam-* rules above). */
+.aam-delegate-quickpicks { margin-bottom: 14px; }
+.aam-delegate-quickpicks-label {
   font-size: 12px;
   font-weight: 600;
   color: var(--muted);
-  cursor: pointer;
-  list-style: none;
-  user-select: none;
+  margin: 0 0 6px;
+}
+.aam-delegate-quickpicks-list { display: flex; flex-wrap: wrap; gap: 6px; }
+.aam-delegate-quickpick-caption {
+  font-size: 12px;
+  color: var(--muted);
+  margin: 8px 0 0;
 }
-.configured-agents-setup-disclosure > summary::before { content: '▸ '; }
-.configured-agents-setup-disclosure[open] > summary::before { content: '▾ '; }
 
 @media (max-width: 820px) {
   /* Single-column reflow — the rigid 100vh layout doesn't make sense at