fraim-hub 2.0.321 → 2.0.322

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

@@ -16,7 +16,6 @@ const defaultPreferences = (projectPath) => ({
     employeeId: DEFAULT_EMPLOYEE,
     categoryId: DEFAULT_CATEGORY,
     recentJobIds: [],
-    recentJobInstructions: {},
     personaKey: null,
     projects: normalizeAiHubProjectList([], projectPath),
     removedProjectPaths: [],
@@ -179,9 +178,6 @@ class AiHubPreferencesStore {
                 employeeId: (raw.employeeId === 'claude' || raw.employeeId === 'codex' || raw.employeeId === 'gemini' || raw.employeeId === 'copilot' || raw.employeeId === 'antigravity') ? raw.employeeId : DEFAULT_EMPLOYEE,
                 categoryId: typeof raw.categoryId === 'string' && raw.categoryId.length > 0 ? raw.categoryId : DEFAULT_CATEGORY,
                 recentJobIds: Array.isArray(raw.recentJobIds) ? raw.recentJobIds.filter((value) => typeof value === 'string') : [],
-                recentJobInstructions: (typeof raw.recentJobInstructions === 'object' && raw.recentJobInstructions !== null && !Array.isArray(raw.recentJobInstructions))
-                    ? raw.recentJobInstructions
-                    : {},
                 personaKey: typeof raw.personaKey === 'string' ? raw.personaKey : null,
                 // Issue #750: apiKey is no longer a persisted field here at all — any
                 // legacy apiKey left over from a pre-#750 ai-hub-state.json is silently
@@ -232,18 +228,13 @@ class AiHubPreferencesStore {
         this.save({ ...preferences, projectPath: normalizedProjectPath, projects: nextProjects, removedProjectPaths });
         return nextProjects;
     }
-    remember(preferences, jobId, instructions) {
+    remember(preferences, jobId) {
         const recentJobIds = jobId
             ? [jobId, ...preferences.recentJobIds.filter((value) => value !== jobId)].slice(0, 8)
             : preferences.recentJobIds.slice(0, 8);
-        const recentJobInstructions = { ...preferences.recentJobInstructions };
-        if (jobId && instructions) {
-            recentJobInstructions[jobId] = instructions.slice(0, 500);
-        }
         const next = {
             ...preferences,
             recentJobIds,
-            recentJobInstructions,
         };
         this.save(next);
         return next;

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

@@ -7020,7 +7020,7 @@ class AiHubServer {
                     projectPath: isProjectIndependentRun ? existingPreferences.projectPath : projectPath,
                     employeeId: hostId,
                     recentJobIds: existingPreferences.recentJobIds,
-                }, jobId, typeof instructions === 'string' ? instructions : undefined);
+                }, jobId);
                 const fraimRunEnriched = this.enrichRunForResponse(this.runRegistry.get(run.id) ?? run);
                 const responsePayload = directRun
                     ? { ...fraimRunEnriched, compareRun: this.enrichRunForResponse(directRun) }

package/package.json

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

package/public/ai-hub/index.html

@@ -425,7 +425,6 @@
           <div class="conv-topline">
             <div class="employee-identity" id="active-identity"></div>
             <span id="active-title" class="conv-job-title"></span>
-            <button class="run-stop-btn" id="run-stop-btn" type="button" hidden title="Ask the employee to stop and wait for you">⏹ Stop</button>
             <div class="run-state-pill" id="run-state-pill"></div>
           </div>
 
@@ -477,112 +476,9 @@
             </details>
             <!-- Issue #1292: when this conversation's own agent stops being available,
                  say so. The selector keeps holding that agent; it is never quietly
-                 swapped for another one. Lives outside #coach-panel so a collapsed
-                 coaching panel cannot hide it. -->
+                 swapped for another one. Lives outside the composer controls so
+                 active coaching actions cannot hide it. -->
             <div class="agent-unavailable-note" id="active-agent-unavailable-note" data-testid="active-agent-unavailable-note" role="status" hidden></div>
-            <details class="panel-details panel-details--coach" id="coach-panel" open>
-              <summary>
-                <span class="panel-summary-copy">
-                  <span class="panel-kicker" id="coach-panel-kicker">Your coaching</span>
-                  <span class="panel-summary-text" id="coach-summary">Open when you want to steer the next step</span>
-                </span>
-                <span class="active-employee-row" onclick="event.stopPropagation()">
-                  <span class="active-employee-label">Maestro</span>
-                  <select id="active-employee-select" class="employee-select inline" aria-label="Agent Tool"></select>
-                </span>
-              </summary>
-              <div class="panel-body">
-                  <!-- Issue #512 R7.7: review actions live in the SAME bar as the
-                       coaching chips. Hidden until a deliverable is awaiting review;
-                       the coaching chips below never disappear. -->
-                  <div class="review-actions" id="review-actions" hidden>
-                    <button class="rb-approve" type="button" id="review-approve">✓ Approve</button>
-                    <button class="rb-secondary" type="button" id="review-request-changes">↩ Request changes</button>
-                    <span class="rb-handoff" id="review-handoff">Comment on the doc to leave inline notes, or type below to coach.</span>
-                  </div>
-                  <div class="quick-coach-row" id="quick-coach-btns" hidden>
-                    <button class="ghost quick-coach-btn mark-complete-btn" type="button" id="mark-complete-btn" aria-label="Mark the job complete">✓ Mark complete</button>
-                    <!-- R4: Positive Reinforcement dropdown -->
-                    <div class="coach-dropdown" id="positive-reinforcement-wrap">
-                      <button class="ghost quick-coach-btn" type="button" id="positive-reinforcement-btn" data-testid="positive-reinforcement-btn" aria-haspopup="menu" aria-expanded="false" aria-controls="positive-reinforcement-dropdown">Positive Reinforcement ▾</button>
-                      <div class="coach-dropdown-menu" id="positive-reinforcement-dropdown" data-testid="positive-reinforcement-dropdown" hidden role="menu">
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="recognize-good-work"
-                          title="Capture what went well so the employee repeats it">Well done</button>
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="praise-fraim"
-                          title="Record praise for the employee in the FRAIM registry">Praise publicly</button>
-                      </div>
-                    </div>
-                    <!-- R5: Negative Reinforcement dropdown -->
-                    <div class="coach-dropdown" id="negative-reinforcement-wrap">
-                      <button class="ghost quick-coach-btn" type="button" id="negative-reinforcement-btn" data-testid="negative-reinforcement-btn" aria-haspopup="menu" aria-expanded="false" aria-controls="negative-reinforcement-dropdown">Negative Reinforcement ▾</button>
-                      <div class="coach-dropdown-menu" id="negative-reinforcement-dropdown" data-testid="negative-reinforcement-dropdown" hidden role="menu">
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="analyze-why-you-messed-up"
-                          title="Ask the employee to diagnose the root cause and what to change next time">Analyze your mistake</button>
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="follow-your-mentor"
-                          title="Ask the employee to re-read the workflow instructions and continue from the correct next step">Follow due process</button>
-                      </div>
-                    </div>
-                    <!-- R6: Conviction dropdown (label is dynamic, set by syncConvictionDropdownLabel) -->
-                    <div class="coach-dropdown" id="conviction-wrap">
-                      <button class="ghost quick-coach-btn" type="button" id="conviction-btn" data-testid="conviction-btn" aria-haspopup="menu" aria-expanded="false" aria-controls="conviction-dropdown">Your conviction ▾</button>
-                      <div class="coach-dropdown-menu" id="conviction-dropdown" data-testid="conviction-dropdown" hidden role="menu">
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="strong-pov"
-                          title="Ask the employee to defend a strong, well-reasoned position">Strong pov</button>
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="weak-pov"
-                          title="Ask the employee to acknowledge uncertainty and present a hedged view">Weak pov</button>
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="need-pov"
-                          title="Ask the employee to develop a point of view where they currently have none">Need pov</button>
-                      </div>
-                    </div>
-                    <!-- Issue #1069: Explain it dropdown -->
-                    <div class="coach-dropdown" id="explain-wrap">
-                      <button class="ghost quick-coach-btn" type="button" id="explain-btn" data-testid="explain-btn" aria-haspopup="menu" aria-expanded="false" aria-controls="explain-dropdown">Explain it &#9662;</button>
-                      <div class="coach-dropdown-menu" id="explain-dropdown" data-testid="explain-dropdown" hidden role="menu">
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="explain-it"
-                          data-explain-mode="simpler"
-                          data-prompt="Explain this more simply."
-                          title="Ask for a shorter explanation with less jargon">Simpler</button>
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="explain-it"
-                          data-explain-mode="business"
-                          data-prompt="Explain this in business terms."
-                          title="Ask for impact, tradeoffs, and decision context">Business terms</button>
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="explain-it"
-                          data-explain-mode="technical"
-                          data-prompt="Explain this in technical terms."
-                          title="Ask for implementation details and technical caveats">Technical terms</button>
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="explain-it"
-                          data-explain-mode="five-year-old"
-                          data-prompt="Explain this like I am 5."
-                          title="Ask for a very simple explanation">Like a 5 year old</button>
-                        <button class="ghost quick-coach-btn" type="button" role="menuitem"
-                          data-job="explain-it"
-                          data-explain-mode="preferred"
-                          data-prompt="Explain this the way I like it."
-                          title="Ask the employee to use your learned explanation preferences">The way I like it</button>
-                      </div>
-                    </div>
-                  </div>
-                  <!-- Issue #1176: visible only while the run is actively WORKING (R34/R42).
-                       Two-option toggle, not a native radiogroup, matching the approved UI
-                       mock (docs/feature-specs/mocks/1176-continue-run-guidance.html). -->
-                  <div class="delivery-control" id="delivery-control" role="group" aria-label="When should this message run?" hidden>
-                    <button class="delivery-option" type="button" id="delivery-after" aria-pressed="true">After current</button>
-                    <button class="delivery-option delivery-option--redirect" type="button" id="delivery-redirect" aria-pressed="false">Redirect now</button>
-                  </div>
-                  <p class="delivery-help" id="delivery-help" hidden></p>
-              </div>
-            </details>
 
             <details class="micro panel-details" id="micro-manage">
               <summary>
@@ -658,7 +554,7 @@
              the A/B compare panel); the composer itself never opens, closes,
              or relocates - except into #conversation-focus-panels during
              "expand conversation", handled by openConversationFocus/
-             closeConversationFocus alongside #thread-panel/#coach-panel. -->
+             closeConversationFocus alongside #thread-panel. -->
         <div id="persistent-composer">
           <div class="composer-suggestions" id="composer-suggestions" hidden>
             <div id="cp-results" class="cp-results-scroll">
@@ -690,10 +586,89 @@
               <button type="button" id="cp-armed-job-clear" aria-label="Change job">&times;</button>
             </div>
             <div class="staged-attachments" id="staged-attachments"></div>
+            <div class="review-actions" id="review-actions" hidden>
+              <button class="rb-approve" type="button" id="review-approve">&#10003; Approve</button>
+              <button class="rb-secondary" type="button" id="review-request-changes">&#8617; Request changes</button>
+              <span class="rb-handoff" id="review-handoff">Comment on the doc to leave inline notes, or type below to coach.</span>
+            </div>
             <div class="coach-input">
               <button class="attach-btn" type="button" id="attach-btn" aria-label="Attach a file or screenshot" title="Attach a file or screenshot">&#128206;</button>
               <input type="file" id="attach-file-input" multiple accept="image/png,image/jpeg,image/gif,.pdf,.txt,.log" hidden>
-              <textarea id="coach-text" aria-label="Type an instruction" placeholder="Type a job name, /handle, or describe what you need…" data-placeholder-idle="Type a job name, /handle, or describe what you need…" data-placeholder-armed="Now type what you want done…"></textarea>
+              <div class="quick-coach-row composer-coach-actions" id="quick-coach-btns" hidden>
+                <button class="ghost quick-coach-btn mark-complete-btn composer-icon-btn" type="button" id="mark-complete-btn" aria-label="Mark the job complete" title="Mark complete">&#10003;</button>
+                <button class="run-stop-btn composer-stop-btn" id="run-stop-btn" type="button" hidden aria-label="Stop the employee" title="Stop the employee">&#9209;</button>
+                <div class="coach-dropdown" id="positive-reinforcement-wrap">
+                  <button class="ghost quick-coach-btn composer-icon-btn" type="button" id="positive-reinforcement-btn" data-testid="positive-reinforcement-btn" aria-label="Positive reinforcement" title="Positive reinforcement" aria-haspopup="menu" aria-expanded="false" aria-controls="positive-reinforcement-dropdown">&#128077;</button>
+                  <div class="coach-dropdown-menu" id="positive-reinforcement-dropdown" data-testid="positive-reinforcement-dropdown" hidden role="menu">
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="recognize-good-work"
+                      title="Capture what went well so the employee repeats it">Well done</button>
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="praise-fraim"
+                      title="Record praise for the employee in the FRAIM registry">Praise publicly</button>
+                  </div>
+                </div>
+                <div class="coach-dropdown" id="negative-reinforcement-wrap">
+                  <button class="ghost quick-coach-btn composer-icon-btn" type="button" id="negative-reinforcement-btn" data-testid="negative-reinforcement-btn" aria-label="Negative reinforcement" title="Negative reinforcement" aria-haspopup="menu" aria-expanded="false" aria-controls="negative-reinforcement-dropdown">&#128078;</button>
+                  <div class="coach-dropdown-menu" id="negative-reinforcement-dropdown" data-testid="negative-reinforcement-dropdown" hidden role="menu">
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="analyze-why-you-messed-up"
+                      title="Ask the employee to diagnose the root cause and what to change next time">Analyze your mistake</button>
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="follow-your-mentor"
+                      title="Ask the employee to re-read the workflow instructions and continue from the correct next step">Follow due process</button>
+                  </div>
+                </div>
+                <div class="coach-dropdown" id="conviction-wrap">
+                  <button class="ghost quick-coach-btn composer-icon-btn" type="button" id="conviction-btn" data-testid="conviction-btn" aria-label="Your conviction" title="Your conviction" aria-haspopup="menu" aria-expanded="false" aria-controls="conviction-dropdown">&#129517;</button>
+                  <div class="coach-dropdown-menu" id="conviction-dropdown" data-testid="conviction-dropdown" hidden role="menu">
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="strong-pov"
+                      title="Ask the employee to defend a strong, well-reasoned position">Strong pov</button>
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="weak-pov"
+                      title="Ask the employee to acknowledge uncertainty and present a hedged view">Weak pov</button>
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="need-pov"
+                      title="Ask the employee to develop a point of view where they currently have none">Need pov</button>
+                  </div>
+                </div>
+                <div class="coach-dropdown" id="explain-wrap">
+                  <button class="ghost quick-coach-btn composer-icon-btn" type="button" id="explain-btn" data-testid="explain-btn" aria-label="Explain it" title="Explain it" aria-haspopup="menu" aria-expanded="false" aria-controls="explain-dropdown">?</button>
+                  <div class="coach-dropdown-menu" id="explain-dropdown" data-testid="explain-dropdown" hidden role="menu">
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="explain-it"
+                      data-explain-mode="simpler"
+                      data-prompt="Explain this more simply."
+                      title="Ask for a shorter explanation with less jargon">Simpler</button>
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="explain-it"
+                      data-explain-mode="business"
+                      data-prompt="Explain this in business terms."
+                      title="Ask for impact, tradeoffs, and decision context">Business terms</button>
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="explain-it"
+                      data-explain-mode="technical"
+                      data-prompt="Explain this in technical terms."
+                      title="Ask for implementation details and technical caveats">Technical terms</button>
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="explain-it"
+                      data-explain-mode="five-year-old"
+                      data-prompt="Explain this like I am 5."
+                      title="Ask for a very simple explanation">Like a 5 year old</button>
+                    <button class="ghost quick-coach-btn" type="button" role="menuitem"
+                      data-job="explain-it"
+                      data-explain-mode="preferred"
+                      data-prompt="Explain this the way I like it."
+                      title="Ask the employee to use your learned explanation preferences">The way I like it</button>
+                  </div>
+                </div>
+              </div>
+              <textarea id="coach-text" aria-label="Type an instruction" placeholder="Type a job name, /handle, or describe what you need..." data-placeholder-idle="Type a job name, /handle, or describe what you need..." data-placeholder-active="Coach this run, or type new instructions..." data-placeholder-armed="Now type what you want done..."></textarea>
+              <span class="active-employee-row composer-agent-row" hidden>
+                <span class="active-employee-label">Maestro</span>
+                <select id="active-employee-select" class="employee-select inline" aria-label="Agent Tool"></select>
+              </span>
               <button class="send-button" type="button" id="send" aria-label="Send" title="Send" disabled>↑</button>
             </div>
             <div class="composer-hint" id="composer-hint">Attach or paste a screenshot, log, or PDF, up to 10&nbsp;MB each.</div>

package/public/ai-hub/review.css

@@ -39,8 +39,7 @@
 }
 .rc-art-btn--teach:hover { background: #ece3ff; }
 
-/* ── R7.7: unified action bar — review actions sit beside the always-on
-      coaching chips inside the coach panel. The chips/input never disappear. ── */
+/* R7.7: review actions stay next to the always-on composer controls. */
 .review-actions {
   display: flex;
   flex-wrap: wrap;

package/public/ai-hub/script.js

@@ -134,10 +134,7 @@ function gatherElements() {
     'status-line', 'coach-note',
     // Issue #1651: composer attachments.
     'coach', 'composer-dropzone', 'staged-attachments', 'attach-btn', 'attach-file-input',
-    // Issue #1176: continue-run delivery control.
-    'delivery-control', 'delivery-after', 'delivery-redirect', 'delivery-help',
-    'coach-panel', 'coach-summary',
-    'thread-panel', 'thread-panel-kicker', 'coach-panel-kicker',
+    'thread-panel', 'thread-panel-kicker',
     'quick-coach-btns',
     'positive-reinforcement-btn', 'positive-reinforcement-dropdown',
     'negative-reinforcement-btn', 'negative-reinforcement-dropdown',
@@ -2068,11 +2065,8 @@ function panelStateFor(convId) {
 }
 
 function defaultCoachOpen(conv) {
-  // Issue #1021 (R11): an oversight run collapses the coach panel by default so the
-  // delegation boards get the vertical space. But the review actions live inside that
-  // panel, so once Mandy submits, the human had to expand a collapsed panel to find
-  // Approve while every other employee shows it immediately. Parity is the whole point
-  // of this issue: when the run is actually awaiting a decision, the decision is visible.
+  // Preserve the historic per-conversation default for review visibility, even though
+  // the coaching controls now live in the persistent composer.
   if (isManagerOversightConversation(conv)) {
     return typeof convAwaitingReview === 'function' ? convAwaitingReview(conv) : false;
   }
@@ -2109,16 +2103,6 @@ function syncThreadPanelKicker(conv) {
   el.textContent = name ? `${name} updates` : 'Updates';
 }
 
-// R3: update the coach panel kicker with "[User]'s coaching to [Employee]".
-function syncCoachPanelKicker(conv) {
-  const el = els['coach-panel-kicker'] || document.getElementById('coach-panel-kicker');
-  if (!el) return;
-  if (!conv) { el.textContent = 'Your coaching'; return; }
-  const manager = managerLabel();
-  const employee = coachEmployeeLabel(conv);
-  el.textContent = `${manager}'s coaching to ${employee}`;
-}
-
 // Returns the FRAIM invocation prefix for the currently active employee:
 // $fraim for Codex, /fraim for all others (mirrors manager-turns.ts).
 function fraimPrefix() {
@@ -2132,7 +2116,8 @@ function syncConvictionDropdownLabel() {
   const btn = els['conviction-btn'] || document.getElementById('conviction-btn');
   if (!btn) return;
   const manager = managerLabel();
-  btn.textContent = `${manager}'s conviction ▾`;
+  btn.title = `${manager}'s conviction`;
+  btn.setAttribute('aria-label', `${manager}'s conviction`);
 }
 
 // R4: update coach label with employee name + initial badge.
@@ -2166,13 +2151,57 @@ function syncCoachEmployeeLabel(conv) {
 // R5: show/hide quick-access coaching buttons based on managerTemplates.
 function syncQuickCoachButtons(conv) {
   const row = els['quick-coach-btns'];
-  if (!row) return;
-  row.hidden = !conv;
+  if (row) row.hidden = !conv;
+  const agentRow = document.querySelector('.composer-agent-row');
+  if (agentRow) agentRow.hidden = !conv;
   if (els['mark-complete-btn']) {
     els['mark-complete-btn'].hidden = !conv;
   }
 }
 
+function composerIsArmed() {
+  return !!(
+    (els['coach-text'] && els['coach-text'].value.trim().length > 0) ||
+    state.pendingCoachingJobId ||
+    hasValidStagedAttachment()
+  );
+}
+
+function syncComposerPlaceholder(conv = activeConversation()) {
+  const textarea = els['coach-text'];
+  if (!textarea || textarea.disabled) return;
+  if (state.cpSelectedJob) {
+    textarea.placeholder = textarea.dataset.placeholderArmed || 'Now type what you want done...';
+  } else if (conv) {
+    textarea.placeholder = textarea.dataset.placeholderActive || 'Coach this run, or type new instructions...';
+  } else {
+    textarea.placeholder = textarea.dataset.placeholderIdle || 'Type a job name, /handle, or describe what you need...';
+  }
+}
+
+function syncComposerStopButton(conv = activeConversation()) {
+  const stopBtn = els['run-stop-btn'];
+  if (!stopBtn) return;
+  stopBtn.hidden = !conv;
+  if (!conv) return;
+  const canStop = conv.status === 'running' && !!conv.runId && !conv._stopping;
+  stopBtn.disabled = !canStop;
+  stopBtn.classList.toggle('composer-stop-btn--armed', canStop && composerIsArmed());
+  if (conv._stopping) {
+    stopBtn.textContent = '⏹ Stopping...';
+    stopBtn.setAttribute('aria-label', 'Stopping the employee, please wait');
+    stopBtn.title = 'Stopping the employee, please wait';
+  } else if (canStop && composerIsArmed()) {
+    stopBtn.textContent = '⏹ Stop & send';
+    stopBtn.setAttribute('aria-label', 'Stop the employee and send the armed coaching now');
+    stopBtn.title = 'Stop the employee and send the armed coaching now';
+  } else {
+    stopBtn.textContent = '⏹';
+    stopBtn.setAttribute('aria-label', canStop ? 'Stop the employee' : 'Nothing is running to stop');
+    stopBtn.title = canStop ? 'Stop the employee' : 'Nothing is running to stop';
+  }
+}
+
 function stripReviewHandoffBlocks(text) {
   return String(text || '')
     .replace(/<review_handoff>\s*[\s\S]*?\s*<\/review_handoff>/gi, '')
@@ -2274,19 +2303,13 @@ function formatEmployeeText(text) {
 }
 
 function syncConversationPanels(conv, switchedConv) {
-  const coach = els['coach-panel'];
-  if (!conv || !coach) return;
+  if (!conv) return;
   const panelState = panelStateFor(conv.id);
   if (switchedConv) {
-    coach.open = panelState.coach ?? defaultCoachOpen(conv);
     if (els['thread-panel']) {
       els['thread-panel'].open = panelState.thread ?? true;
     }
   }
-  // R3.3: hide the summary hint when the coach panel is open.
-  if (els['coach-summary']) {
-    els['coach-summary'].hidden = coach.open;
-  }
 }
 
 function upsertConversation(conv, options) {
@@ -3633,12 +3656,9 @@ const conversationFocusState = {
   previousFocus: null,
   threadParent: null,
   threadNext: null,
-  coachParent: null,
-  coachNext: null,
-  // Issue #1657 Treatment 3: the composer moved out of #coach-panel to be
-  // permanently docked (persistent-composer.md pattern); "expand
-  // conversation" must move it into the overlay alongside thread/coach-panel
-  // too, or the manager loses the ability to type while expanded.
+  // Issue #1657 Treatment 3: the composer is permanently docked; "expand
+  // conversation" moves it into the overlay alongside the thread so the
+  // manager can still type while expanded.
   composerParent: null,
   composerNext: null,
   messageScrollTop: 0,
@@ -3731,7 +3751,6 @@ function syncConversationFocusTitle(conv) {
 
 function restoreFocusedConversationNodes() {
   const thread = els['thread-panel'];
-  const coach = els['coach-panel'];
   const composer = document.getElementById('persistent-composer');
   if (thread && conversationFocusState.threadParent) {
     const next = conversationFocusState.threadNext;
@@ -3741,14 +3760,6 @@ function restoreFocusedConversationNodes() {
       conversationFocusState.threadParent.appendChild(thread);
     }
   }
-  if (coach && conversationFocusState.coachParent) {
-    const next = conversationFocusState.coachNext;
-    if (next && next.parentNode === conversationFocusState.coachParent) {
-      conversationFocusState.coachParent.insertBefore(coach, next);
-    } else {
-      conversationFocusState.coachParent.appendChild(coach);
-    }
-  }
   if (composer && conversationFocusState.composerParent) {
     const next = conversationFocusState.composerNext;
     if (next && next.parentNode === conversationFocusState.composerParent) {
@@ -3784,17 +3795,14 @@ function openConversationFocus() {
   const overlay = els['conversation-focus-overlay'];
   const panels = els['conversation-focus-panels'];
   const thread = els['thread-panel'];
-  const coach = els['coach-panel'];
   const composer = document.getElementById('persistent-composer');
-  if (!conv || !overlay || !panels || !thread || !coach) return;
+  if (!conv || !overlay || !panels || !thread) return;
   if (conversationFocusState.open) return;
 
   conversationFocusState.open = true;
   conversationFocusState.previousFocus = document.activeElement;
   conversationFocusState.threadParent = thread.parentNode;
   conversationFocusState.threadNext = thread.nextSibling;
-  conversationFocusState.coachParent = coach.parentNode;
-  conversationFocusState.coachNext = coach.nextSibling;
   if (composer) {
     conversationFocusState.composerParent = composer.parentNode;
     conversationFocusState.composerNext = composer.nextSibling;
@@ -3803,7 +3811,6 @@ function openConversationFocus() {
 
   syncConversationFocusTitle(conv);
   panels.appendChild(thread);
-  panels.appendChild(coach);
   if (composer) panels.appendChild(composer);
   overlay.hidden = false;
   overlay.classList.add('open');
@@ -3840,6 +3847,9 @@ function renderActive() {
     if (els['ab-direct-panel']) els['ab-direct-panel'].hidden = true;
     // Issue #512 R7: clear any lingering review UI when no conversation is active.
     if (els['review-actions']) els['review-actions'].hidden = true;
+    syncQuickCoachButtons(null);
+    syncComposerPlaceholder(null);
+    syncComposerStopButton(null);
     // #770: hide the Deliverables panel when there is no active conversation.
     if (els['deliverables-panel']) { els['deliverables-panel'].hidden = true; els['deliverables-body'].innerHTML = ''; }
     syncThreadUiState(null);
@@ -3867,9 +3877,9 @@ function renderActive() {
   renderJobModeChip(conv);
   syncCoachEmployeeLabel(conv);
   syncThreadPanelKicker(conv);
-  syncCoachPanelKicker(conv);
   syncConvictionDropdownLabel();
   syncCoachNote(conv);
+  syncComposerPlaceholder(conv);
   if (conversationFocusState.open) syncConversationFocusTitle(conv);
 
   // If we switched conversations (or this is the first render), wipe and
@@ -3913,6 +3923,11 @@ function renderActive() {
   syncThreadUiState(conv);
   syncConversationPanels(conv, switchedConv);
   syncQuickCoachButtons(conv);
+  // Issue #1723: renderActive() runs on every poll cycle for the active
+  // conversation but previously never re-synced the Stop button here, so a
+  // newly-started conversation showed a stale "Stop & send" (armed) label
+  // until whichever other call site happened to run next.
+  syncComposerStopButton(conv);
   syncManagedDelegationAccess(conv);
   syncDeliveryControl(conv);
   ensureThreadMessageViewportObserver();
@@ -3988,18 +4003,11 @@ function renderActive() {
   // genuinely new messages, not every row a messagesMutated full rebuild just
   // re-appended (e.g. an existing message's badge disappearing).
   const priorRenderedMessageCount = renderedMessageCount;
-  const hadPendingRowsBeforeRebuild = !!els['messages'].querySelector('.message[data-pending="true"]');
   // Issue #1665: capture the manager's reading position before this render touches the thread.
   const threadHost = els['messages'];
   const threadScrollBefore = threadHost.scrollTop;
   const threadWasNearBottom = threadHost.scrollHeight - threadScrollBefore - threadHost.clientHeight < 80;
-  if (
-    hadPendingRowsBeforeRebuild
-    && els['messages'].scrollTop <= 20
-    && els['messages'].scrollHeight - els['messages'].clientHeight > 80
-  ) {
-    userScrolledAwayDuringPendingAnchor = true;
-  }
+  const hadPendingRowsBeforeRebuild = !!threadHost.querySelector('.message[data-pending="true"]');
   const rebuildThread = messages.length < renderedMessageCount || messagesMutated;
   if (rebuildThread) {
     els['messages'].innerHTML = '';
@@ -4025,10 +4033,10 @@ function renderActive() {
   // scrolling, even if they had scrolled up to review earlier history.
   const hasNewPendingDeliveryMessage = messages.slice(priorRenderedMessageCount).some((message) => !!message.deliveryStatus);
   const hasPendingDeliveryMessage = messages.some((message) => !!message.deliveryStatus);
+  const clearedPendingDeliveryMessages = hadPendingRowsBeforeRebuild && !hasPendingDeliveryMessage;
   // Issue #1309/#1570: when a poll clears the queued/redirecting backlog, the
   // thread should reconcile to the live bottom with the delivered turn rather
   // than staying parked at the old pending-anchor position.
-  const clearedPendingDeliveryMessages = hadPendingRowsBeforeRebuild && !hasPendingDeliveryMessage;
   syncWorkingIndicator(conv);
   // Direct raw event log — append-only like the FRAIM micro-log, shows all
   // stdout/stderr/system events from the B run so the user sees everything.
@@ -4072,18 +4080,18 @@ function renderActive() {
   if (typeof convFindRefresh === 'function') convFindRefresh();
   const shouldScrollForUpdate = switchedConv || statusChanged || appendedMessages > 0 || messagesMutated;
   const reviewFollow = switchedConv || statusChanged || threadWasNearBottom;
-  scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, hasNewPendingDeliveryMessage || clearedPendingDeliveryMessages, reviewFollow);
+  scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, hasNewPendingDeliveryMessage, reviewFollow, clearedPendingDeliveryMessages);
   requestAnimationFrame(() => {
     syncThreadMessageViewport();
-    scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, hasNewPendingDeliveryMessage || clearedPendingDeliveryMessages, reviewFollow);
+    scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, hasNewPendingDeliveryMessage, reviewFollow, clearedPendingDeliveryMessages);
   });
   setTimeout(() => {
     syncThreadMessageViewport();
-    scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, hasNewPendingDeliveryMessage || clearedPendingDeliveryMessages, reviewFollow);
+    scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, hasNewPendingDeliveryMessage, reviewFollow, clearedPendingDeliveryMessages);
   });
   setTimeout(() => {
     syncThreadMessageViewport();
-    scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, hasNewPendingDeliveryMessage || clearedPendingDeliveryMessages, reviewFollow);
+    scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, hasNewPendingDeliveryMessage, reviewFollow, clearedPendingDeliveryMessages);
   }, 50);
 
   // Issue #347 — tracker, totals, picker. The data lives on conv.run
@@ -4242,23 +4250,7 @@ function renderRunStatePill(conv) {
   // conversationStateLabel returns 'Stopped' for that state; toUpperCase() => 'STOPPED'.
   pill.textContent = conversationStateLabel(conv).toUpperCase();
   pill.className = `run-state-pill ${conversationUiState(conv)}`;
-  // #521: Stop is offered only while the employee is actively working.
-  const stopBtn = els['run-stop-btn'];
-  if (stopBtn) {
-    const canStop = conv.status === 'running' && !!conv.runId && !conv._stopping;
-    // #549 R1/AC1.3: While in-flight (_stopping===true), keep the button VISIBLE but disabled
-    // so the manager retains the affordance showing "Stopping…". Hide only when the run is
-    // not active at all (canStop===false AND not in-flight).
-    stopBtn.hidden = !canStop && !conv._stopping;
-    stopBtn.disabled = !!conv._stopping;
-    if (conv._stopping) {
-      stopBtn.textContent = '⏹ Stopping…';
-      stopBtn.setAttribute('aria-label', 'Stopping the employee, please wait');
-    } else {
-      stopBtn.textContent = '⏹ Stop';
-      stopBtn.setAttribute('aria-label', 'Ask the employee to stop and wait for you');
-    }
-  }
+  syncComposerStopButton(conv);
 }
 
 function renderResumeCommand(conv) {
@@ -5373,9 +5365,32 @@ function positionCoachDropdown(dropdown, btn) {
   const opensBelow = availableBelow >= Math.min(menuHeight, 160) || availableBelow >= availableAbove;
   const availableSpace = opensBelow ? availableBelow : availableAbove;
   const renderedHeight = Math.min(menuHeight, availableSpace || menuHeight);
-  const top = opensBelow
-    ? Math.min(rect.bottom + margin, window.innerHeight - renderedHeight - viewportPad)
-    : Math.max(viewportPad, rect.top - renderedHeight - margin);
+  let top;
+  if (opensBelow) {
+    top = Math.min(rect.bottom + margin, window.innerHeight - renderedHeight - viewportPad);
+  } else {
+    top = Math.max(viewportPad, rect.top - renderedHeight - margin);
+  }
+  // Issue #1723: the composer textarea (#coach-text) shares the same
+  // toolbar box as every coach-dropdown trigger, and is taller than the
+  // trigger row - it extends both above and below the trigger's own edges.
+  // A placement chosen purely from the trigger's own rect (either branch
+  // above) can still land on top of the textarea. If it does, push the
+  // menu to whichever side of the textarea actually clears it and has
+  // room; otherwise leave the original placement (no collision-free
+  // option fits in the viewport).
+  const composerTextarea = document.getElementById('coach-text');
+  const textareaRect = composerTextarea ? composerTextarea.getBoundingClientRect() : null;
+  const overlapsTextarea = textareaRect && top < textareaRect.bottom && top + renderedHeight > textareaRect.top;
+  if (overlapsTextarea) {
+    const spaceBelowTextarea = window.innerHeight - textareaRect.bottom - margin - viewportPad;
+    const spaceAboveTextarea = textareaRect.top - margin - viewportPad;
+    if (spaceBelowTextarea >= renderedHeight) {
+      top = textareaRect.bottom + margin;
+    } else if (spaceAboveTextarea >= renderedHeight) {
+      top = Math.max(viewportPad, textareaRect.top - renderedHeight - margin);
+    }
+  }
   dropdown.style.left = Math.round(left) + 'px';
   dropdown.style.top = Math.round(top) + 'px';
   dropdown.style.maxHeight = Math.max(80, Math.floor(availableSpace || (window.innerHeight - viewportPad * 2))) + 'px';
@@ -5710,13 +5725,6 @@ function ensurePendingAnchorScrollListener(host) {
   window.addEventListener('wheel', markUserScroll, { passive: true, capture: true });
   window.addEventListener('touchmove', markUserScroll, { passive: true, capture: true });
   host.addEventListener('mousedown', (event) => { if (event.target === host) markUserScroll(); });
-  host.addEventListener('scroll', () => {
-    if (pendingAnchorShownAt === null) return;
-    if (Date.now() <= pendingAnchorProgrammaticScrollUntil) return;
-    const pendingRow = host.querySelector('.message[data-pending="true"]');
-    if (!pendingRow) return;
-    if (host.scrollTop <= 20 && host.scrollHeight - host.clientHeight > 80) markUserScroll();
-  }, { passive: true });
 }
 
 function setThreadScrollTop(host, top) {
@@ -5728,7 +5736,7 @@ function pendingAnchorUserScrolled(host) {
   return userScrolledAwayDuringPendingAnchor || host.dataset.pendingAnchorUserScroll === 'true' || window.__fraimPendingAnchorUserScroll === true;
 }
 
-function scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, forceBottom, reviewFollow = true) {
+function scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, forceBottom, reviewFollow = true, releaseBottom = false) {
   const latest = activeConversation();
   if (!latest || latest.id !== conv.id) return;
   const host = els['messages'];
@@ -5772,36 +5780,19 @@ function scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, forceBottom,
     }
     const anchorGraceActive = !!pendingRow && pendingAnchorShownAt !== null &&
       (Date.now() - pendingAnchorShownAt) < PENDING_ANCHOR_GRACE_MS;
-    if (
-      pendingRow
-      && pendingAnchorShownAt !== null
-      && !forceBottom
-      && Date.now() > pendingAnchorProgrammaticScrollUntil
-      && host.scrollTop <= 20
-      && host.scrollHeight - host.clientHeight > 80
-    ) {
-      userScrolledAwayDuringPendingAnchor = true;
-      host.dataset.pendingAnchorUserScroll = 'true';
-      window.__fraimPendingAnchorUserScroll = true;
-    }
     // Fires exactly once, on the tick where the anchor stops being active —
     // either the pending badge just cleared, or the grace window for a
     // still-unresolved pending row (e.g. Defect 1's kill still in flight)
     // just elapsed. Either way the manager has "seen" the anchor; resume
     // following live content on this tick instead of staying wherever the
     // anchor last parked the view.
-    const catchUpToBottom = pendingAnchorGraceActiveLastTick && !anchorGraceActive;
+    const catchUpToBottom = releaseBottom || (pendingAnchorGraceActiveLastTick && !anchorGraceActive);
     pendingAnchorGraceActiveLastTick = anchorGraceActive;
 
     if (!shouldScrollForUpdate && !forceBottom && !catchUpToBottom) return;
     // #936: re-evaluate nearBottom at call time so deferred invocations respect
     // any scroll the user made between the render tick and this callback.
     const nearBottom = host.scrollHeight - host.scrollTop - host.clientHeight < 80;
-    if (catchUpToBottom && host.scrollTop <= 20 && host.scrollHeight - host.clientHeight > 80) {
-      userScrolledAwayDuringPendingAnchor = true;
-      host.dataset.pendingAnchorUserScroll = 'true';
-      window.__fraimPendingAnchorUserScroll = true;
-    }
     if (catchUpToBottom && pendingAnchorUserScrolled(host)) return;
     if (forceBottom && pendingAnchorUserScrolled(host)) return;
     if (anchorGraceActive && !pendingAnchorUserScrolled(host)) {
@@ -5812,7 +5803,13 @@ function scrollThreadAfterViewportSync(conv, shouldScrollForUpdate, forceBottom,
     // mid-turn (queued or redirecting) must be visible without the manager
     // having to scroll, even if they had scrolled up to review history.
     if (nearBottom || forceBottom || catchUpToBottom) {
-      setThreadScrollTop(host, anchorGraceActive ? pendingBacklogScrollTop(host) : host.scrollHeight);
+      const toPendingAnchor = anchorGraceActive;
+      setThreadScrollTop(host, toPendingAnchor ? pendingBacklogScrollTop(host) : host.scrollHeight);
+      if (!toPendingAnchor) {
+        setTimeout(() => {
+          if (!pendingAnchorUserScrolled(host)) setThreadScrollTop(host, host.scrollHeight);
+        }, 320);
+      }
     }
     return;
   } else if (shouldScrollForUpdate && reviewFollow) {
@@ -6092,6 +6089,7 @@ function syncSendButton() {
   const hasText = els['coach-text'].value.trim().length > 0;
   if (isManagedDelegationChild(conv)) {
     els['send'].disabled = true;
+    syncComposerStopButton(conv);
     return;
   }
   // Issue #1651 R6: a valid staged attachment is enough to enable Send even
@@ -6102,6 +6100,7 @@ function syncSendButton() {
   // resume, it just needs something to send; startRun creates the session.
   if (!conv) {
     els['send'].disabled = !(hasText || hasAttachment);
+    syncComposerStopButton(conv);
     return;
   }
   // Send is enabled as soon as the host session exists. We deliberately
@@ -6117,6 +6116,7 @@ function syncSendButton() {
   // wants to fire that coaching directive, optionally with added context.
   const hasPendingJob = !!state.pendingCoachingJobId;
   els['send'].disabled = !((hasText || hasPendingJob || hasAttachment) && (resumable || canRestartWithCoaching));
+  syncComposerStopButton(conv);
 }
 
 function defaultCoachNote(conv) {
@@ -6161,27 +6161,8 @@ function syncCoachNote(conv = activeConversation()) {
   els['coach-note'].textContent = defaultCoachNote(conv);
 }
 
-// Issue #1176 R34/R35/R36/R42: show/hide and label the "After current" /
-// "Redirect now" delivery control. Visible only while the run is actively
-// WORKING (conversationUiState reuses the same classification the pill and
-// working-indicator already trust), independent of textarea focus/typing.
-const DELIVERY_HELP_TEXT = {
-  after: 'Adds this message to the session queue.',
-  stop: 'Stops the current turn, then sends this correction in the same session.',
-};
 function syncDeliveryControl(conv = activeConversation()) {
-  const control = els['delivery-control'];
-  const help = els['delivery-help'];
-  if (!control || !help) return;
-  const visible = !!conv && conversationUiState(conv) === 'working' && !isManagedDelegationChild(conv);
-  control.hidden = !visible;
-  help.hidden = !visible;
-  if (!visible) return;
-  const isRedirect = state.deliveryIntent === 'stop';
-  if (els['delivery-after']) els['delivery-after'].setAttribute('aria-pressed', String(!isRedirect));
-  if (els['delivery-redirect']) els['delivery-redirect'].setAttribute('aria-pressed', String(isRedirect));
-  help.textContent = isRedirect ? DELIVERY_HELP_TEXT.stop : DELIVERY_HELP_TEXT.after;
-  help.classList.toggle('redirect', isRedirect);
+  syncComposerStopButton(conv);
 }
 
 function selectDeliveryIntent(intent) {
@@ -6199,7 +6180,6 @@ function syncManagedDelegationAccess(conv = activeConversation()) {
       : 'Tell the employee what to do next...';
   }
   if (els['send']) els['send'].disabled = managed || els['send'].disabled;
-  if (els['coach-panel']) els['coach-panel'].classList.toggle('coach-panel--managed-readonly', managed);
   for (const selector of ['#quick-coach-btns button', '#mark-complete-btn', '#positive-reinforcement-btn', '#negative-reinforcement-btn', '#conviction-btn', '#explain-btn', '#review-actions button']) {
     for (const button of document.querySelectorAll(selector)) {
       if (managed) {
@@ -6215,6 +6195,8 @@ function syncManagedDelegationAccess(conv = activeConversation()) {
     }
   }
   if (managed) closeAllCoachDropdowns();
+  syncComposerPlaceholder(conv);
+  syncComposerStopButton(conv);
 }
 
 function appendEditableCoachingPrompt(promptText) {
@@ -6294,7 +6276,7 @@ function convAwaitingReview(conv) {
   // via an explicit review_handoff — Mandy's delegation artifacts are orchestration working
   // output, not deliverables submitted to the human manager. Other manager jobs (e.g.,
   // operational-reporting) may legitimately surface artifacts for human review.
-  if (delegationLedgerForConversation(conv)) return false;
+  if (isManagerOversightConversation(conv) || delegationLedgerForConversation(conv)) return false;
   const runArtifacts = Array.isArray(conv.artifacts) ? conv.artifacts : [];
   if (conv.status === 'completed' && runArtifacts.some((artifact) => artifactLocalPath(artifact) || artifactExternalUrl(artifact))) {
     return true;
@@ -8010,15 +7992,23 @@ async function sendCoachingMessage() {
   }
 }
 
+async function stopFromComposer() {
+  const conv = activeConversation();
+  if (!conv || conv.status !== 'running' || !conv.runId || conv._stopping) return;
+  if (composerIsArmed()) {
+    state.deliveryIntent = 'stop';
+    await sendCoachingMessage();
+  } else {
+    await tfStopRun(conv);
+  }
+}
+
 function renderCpRows(searchText) {
   const { handle, query } = parseCpSearch(searchText);
   const jobs = (state.bootstrap && state.bootstrap.jobs) ? state.bootstrap.jobs : [];
   const recentIds = (state.bootstrap && state.bootstrap.preferences && Array.isArray(state.bootstrap.preferences.recentJobIds))
     ? state.bootstrap.preferences.recentJobIds
     : [];
-  const recentInstructions = (state.bootstrap && state.bootstrap.preferences && state.bootstrap.preferences.recentJobInstructions)
-    ? state.bootstrap.preferences.recentJobInstructions
-    : {};
   // Resolve persona filter from slash handle
   let personaFilter = null;
   if (handle !== null && handle !== '') {
@@ -8064,7 +8054,7 @@ function renderCpRows(searchText) {
     for (const jobId of recentIds) {
       const job = jobs.find((j) => j.id === jobId);
       if (job) {
-        recentRows.push({ type: 'recent', job, instructions: recentInstructions[jobId] || '' });
+        recentRows.push({ type: 'recent', job, instructions: '' });
         if (recentRows.length >= 3) break;
       }
     }
@@ -8203,12 +8193,7 @@ function buildCpRow(row, flatIndex) {
   title.textContent = row.job.title || row.job.id;
   body.appendChild(title);
 
-  if (row.type === 'recent' && row.instructions) {
-    const sub = document.createElement('span');
-    sub.className = 'cp-row-sub';
-    sub.textContent = row.instructions.slice(0, 80);
-    body.appendChild(sub);
-  } else if (row.job.intent) {
+  if (row.job.intent) {
     const sub = document.createElement('span');
     sub.className = 'cp-row-sub';
     sub.textContent = row.job.intent;
@@ -8262,13 +8247,11 @@ function renderCpHighlight() {
 // for a real catalog job, since a full instruction is essentially never a
 // substring of a job's own brief title/intent. In practice the ONLY way to
 // reach a catalog row is to type something short and job-name-like, which is
-// exactly what broke. Picking a fresh catalog job now arms it
+// exactly what broke. Picking a catalog or recent job now arms it
 // (armSelectedJob) and clears the box for the manager to type real
-// instructions, instead of sending immediately. Recent rows (a "run it
-// again" shortcut with already-known-good instructions) and ad-hoc (no
-// separate name/instructions split - the typed text already IS the
-// instructions) are unaffected and still fire immediately. Teach is out of
-// this catalog entirely (see #teach-btn/#teach-job-modal).
+// instructions, instead of sending immediately. Ad-hoc remains immediate-fire:
+// there is no separate name/instructions split - the typed text already IS the
+// instructions. Teach is out of this catalog entirely (see #teach-btn/#teach-job-modal).
 function selectCpRow(index) {
   const row = state.cpRows[index];
   if (!row) return;
@@ -8278,12 +8261,6 @@ function selectCpRow(index) {
     submitComposerDelegate({ id: '__freeform__', title: 'Ad-hoc task', intent: '' }, searchText);
     return;
   }
-  if (row.type === 'recent') {
-    // A recent row is a "run it again" shortcut with already-known-good
-    // instructions - immediate-fire, unlike a fresh catalog pick below.
-    submitComposerDelegate(row.job, row.instructions || searchText);
-    return;
-  }
   armSelectedJob(row.job);
 }
 
@@ -8326,10 +8303,10 @@ function renderArmedJobChip() {
     chip.hidden = false;
     const label = chip.querySelector('.cp-armed-job-label');
     if (label) label.textContent = state.cpSelectedJob.title || state.cpSelectedJob.id;
-    if (textEl) textEl.placeholder = textEl.dataset.placeholderArmed || 'Now type what you want done…';
+    syncComposerPlaceholder();
   } else {
     chip.hidden = true;
-    if (textEl) textEl.placeholder = textEl.dataset.placeholderIdle || textEl.placeholder;
+    syncComposerPlaceholder();
   }
 }
 
@@ -8858,9 +8835,7 @@ async function startRun(job, instructions, employeeId, preassignedConvId, invoke
     if (state.bootstrap && state.bootstrap.preferences) {
       const prefs = state.bootstrap.preferences;
       const nextIds = [job.id, ...(prefs.recentJobIds || []).filter((id) => id !== job.id)].slice(0, 8);
-      const nextInstr = { ...(prefs.recentJobInstructions || {}) };
-      if (instructions) nextInstr[job.id] = instructions.slice(0, 500);
-      state.bootstrap.preferences = { ...prefs, recentJobIds: nextIds, recentJobInstructions: nextInstr };
+      state.bootstrap.preferences = { ...prefs, recentJobIds: nextIds };
     }
     return { ok: true, conversation: conv, run };
   } catch (error) {
@@ -9339,7 +9314,7 @@ function switchToConversation(id) {
   // query immediately after this call, which is what lands the manager on the passage (R45).
   if (typeof convFindClose === 'function') convFindClose();
   // For Company/Manager: move the shared .page into this area's conv-host and
-  // switch from the info view to the full coaching panel.
+  // switch from the info view to the full conversation surface.
   if (targetArea === 'company' || targetArea === 'manager') {
     tfEnsurePageInArea(targetArea);
     const host = document.getElementById(targetArea + '-conv-host');
@@ -10172,21 +10147,7 @@ function wireEvents() {
   });
   if (els['run-stop-btn']) {
     els['run-stop-btn'].addEventListener('click', () => {
-      const conv = activeConversation();
-      if (conv) tfStopRun(conv);
-    });
-  }
-  // Issue #1176 R41: the two delivery options are plain buttons (Tab reaches
-  // both natively); ArrowLeft/ArrowRight/Up/Down also cycles between them.
-  if (els['delivery-after']) els['delivery-after'].addEventListener('click', () => selectDeliveryIntent('after'));
-  if (els['delivery-redirect']) els['delivery-redirect'].addEventListener('click', () => selectDeliveryIntent('stop'));
-  if (els['delivery-control']) {
-    els['delivery-control'].addEventListener('keydown', (e) => {
-      if (!['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(e.key)) return;
-      e.preventDefault();
-      const next = state.deliveryIntent === 'stop' ? 'after' : 'stop';
-      selectDeliveryIntent(next);
-      (next === 'stop' ? els['delivery-redirect'] : els['delivery-after'])?.focus();
+      stopFromComposer();
     });
   }
   els['send'].addEventListener('click', () => sendFromComposer());
@@ -10313,16 +10274,6 @@ function wireEvents() {
     });
   }
 
-  if (els['coach-panel']) {
-    els['coach-panel'].addEventListener('toggle', () => {
-      const conv = activeConversation();
-      if (!conv) return;
-      panelStateFor(conv.id).coach = els['coach-panel'].open;
-      // R3.3: keep coach-summary visibility in sync when toggled directly.
-      if (els['coach-summary']) els['coach-summary'].hidden = els['coach-panel'].open;
-    });
-  }
-
   // R6: thread panel toggle — persist open/close state per conversation.
   if (els['thread-panel']) {
     els['thread-panel'].addEventListener('toggle', () => {

package/public/ai-hub/styles.css

@@ -1469,12 +1469,10 @@ img.conv-employee-avatar {
   border-color: var(--accent);
   color: var(--accent-strong);
 }
-.coach-panel--managed-readonly {
-  border-color: var(--line);
-}
-.coach-panel--managed-readonly textarea {
+.coach textarea:disabled {
   background: var(--soft);
   color: var(--muted);
+  cursor: not-allowed;
 }
 .managed-disabled {
   opacity: 0.55;
@@ -1586,13 +1584,12 @@ img.conv-employee-avatar {
   margin-bottom: 8px;
 }
 
-/* Employee row now lives in the coach summary (inline with kicker).
-   .coach-title-row no longer exists in HTML — kept only for browser cache safety. */
+/* Agent picker sits in the composer control row; .coach-title-row no longer
+   exists in HTML - kept only for browser cache safety. */
 .active-employee-row {
   display: flex;
   align-items: center;
   gap: 6px;
-  margin-left: auto;
   flex-shrink: 0;
 }
 .active-employee-label {
@@ -1604,7 +1601,7 @@ img.conv-employee-avatar {
   color: var(--text);
   cursor: default;
 }
-/* Hide the name text span — only badge + dropdown shown in the summary */
+/* Hide the name text span - only badge + dropdown shown in compact controls. */
 .coach-label-name { display: none; }
 .coach-employee-badge {
   display: inline-flex;
@@ -1619,14 +1616,11 @@ img.conv-employee-avatar {
   flex-shrink: 0;
 }
 img.coach-employee-avatar { object-fit: cover; border-radius: 4px; }
-/* R3.3: hide coach-summary hint when the panel is open. */
-#coach-panel[open] #coach-summary { display: none; }
-/* R5: quick-access coaching buttons row. */
+/* Quick-access coaching buttons row. */
 .quick-coach-row {
   display: flex;
   flex-wrap: wrap;
   gap: 6px;
-  margin-bottom: 8px;
 }
 .quick-coach-btn {
   font-size: 12px;
@@ -2011,12 +2005,12 @@ img.coach-employee-avatar { object-fit: cover; border-radius: 4px; }
 }
 .coach-input textarea {
   width: 100%;
-  min-height: 52px;
+  min-height: 92px;
   max-height: 22vh;
   resize: vertical;
   border: 1px solid var(--line);
   border-radius: 8px;
-  padding: 12px 52px 12px 44px;
+  padding: 12px 170px 48px 44px;
   font: inherit;
   color: var(--text);
   background: var(--surface);
@@ -2063,6 +2057,75 @@ img.coach-employee-avatar { object-fit: cover; border-radius: 4px; }
 .attach-btn:hover { background: var(--soft); color: var(--text); }
 .attach-btn:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
 
+.composer-coach-actions {
+  position: absolute;
+  left: 46px;
+  right: 170px;
+  bottom: 7px;
+  align-items: center;
+  flex-wrap: nowrap;
+  overflow-x: auto;
+  overflow-y: visible;
+  scrollbar-width: thin;
+  z-index: 2;
+}
+.composer-icon-btn,
+.composer-stop-btn {
+  width: 32px;
+  height: 32px;
+  min-width: 32px;
+  padding: 0;
+  border-radius: 6px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  line-height: 1;
+  font-size: 14px;
+}
+.composer-icon-btn {
+  border: 1px solid var(--line);
+  background: var(--surface);
+  color: var(--muted);
+}
+.composer-icon-btn:hover {
+  background: var(--soft);
+  color: var(--text);
+}
+.composer-icon-btn:focus-visible,
+.composer-stop-btn:focus-visible,
+.employee-select.inline:focus-visible {
+  outline: 2px solid var(--accent);
+  outline-offset: 2px;
+}
+.composer-stop-btn {
+  border-color: #fda29b;
+  background: #fef3f2;
+  color: #b42318;
+  white-space: nowrap;
+}
+.composer-stop-btn.composer-stop-btn--armed {
+  width: auto;
+  min-width: 112px;
+  padding: 0 10px;
+}
+.composer-stop-btn:disabled {
+  border-color: var(--line);
+  background: var(--soft);
+  color: var(--muted);
+  opacity: 1;
+}
+.composer-agent-row {
+  position: absolute;
+  right: 47px;
+  bottom: 7px;
+  z-index: 2;
+}
+.composer-agent-row .employee-select.inline {
+  height: 32px;
+  max-width: 116px;
+  background: var(--surface);
+}
+
 /* Issue #1657 (Treatment 1): the task-pane launcher reuses .coach-input/
    .attach-btn for visual consistency (R1) but keeps its own existing Next
    button outside the textarea wrapper (unlike the coaching composer's
@@ -2206,57 +2269,6 @@ img.coach-employee-avatar { object-fit: cover; border-radius: 4px; }
   color: var(--text);
   font-weight: 600;
 }
-/* Issue #1176: continue-run delivery control (After current / Redirect now). */
-.delivery-control {
-  display: inline-grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 2px;
-  padding: 3px;
-  margin-bottom: 8px;
-  border: 1px solid var(--line);
-  border-radius: 7px;
-  background: var(--bg);
-  width: fit-content;
-}
-.delivery-option {
-  min-height: 28px;
-  padding: 5px 12px;
-  border: 0;
-  border-radius: 5px;
-  background: transparent;
-  color: var(--muted);
-  font-size: 11px;
-  font-weight: 700;
-  cursor: pointer;
-  white-space: nowrap;
-}
-.delivery-option:focus-visible {
-  outline: 2px solid var(--accent);
-  outline-offset: 2px;
-}
-.delivery-option[aria-pressed="true"] {
-  background: var(--surface);
-  color: var(--text);
-  box-shadow: var(--shadow);
-}
-/* Matches the existing .run-stop-btn danger-action colors exactly (not the
-   softer --danger token used for passive badges/pills below) — measured
-   contrast ~6:1, where --danger text on a 12% color-mix background measured
-   only ~3.5:1 in light mode, failing WCAG AA for this button's 11px text. */
-.delivery-option--redirect[aria-pressed="true"] {
-  color: #b42318;
-  background: #fef3f2;
-}
-.delivery-help {
-  min-height: 15px;
-  margin: 0 1px 7px;
-  color: var(--muted);
-  font-size: 11px;
-}
-.delivery-help.redirect {
-  color: var(--danger);
-  font-weight: 600;
-}
 /* Per-message queued/redirecting badge shown next to a manager bubble's meta row. */
 .message-delivery-badge {
   display: inline-flex;
@@ -2272,7 +2284,23 @@ img.coach-employee-avatar { object-fit: cover; border-radius: 4px; }
   color: var(--danger);
 }
 @media (max-width: 760px) {
-  .delivery-control { width: 100%; }
+  .coach-input textarea {
+    min-height: 126px;
+    padding-right: 52px;
+    padding-bottom: 82px;
+  }
+  .composer-coach-actions {
+    right: 7px;
+    bottom: 45px;
+  }
+  .composer-agent-row {
+    left: 46px;
+    right: 47px;
+  }
+  .composer-agent-row .employee-select.inline {
+    width: 100%;
+    max-width: none;
+  }
 }
 .send-button {
   background: var(--accent);
@@ -4292,20 +4320,34 @@ body.hub-shell { display: flex; flex-direction: column; height: 100vh; overflow:
   min-height: 0;
   flex: 0 1 auto;
 }
-.workspace-conv .support-stack > .panel-details--coach { flex: 0 0 auto; }
-.workspace-conv .support-stack > .panel-details--coach[open] > .panel-body {
-  max-height: clamp(140px, 24vh, 260px);
-  overflow-y: auto;
-}
-.workspace-conv .panel-details--coach .panel-body { padding-bottom: 8px; }
 .workspace-conv .coach-input textarea {
-  min-height: 44px;
+  min-height: 92px;
   padding-top: 9px;
-  padding-bottom: 9px;
+  padding-right: 170px;
+  padding-bottom: 48px;
 }
 .workspace-conv .coach-note { display: none; }
-.workspace-conv .quick-coach-row { gap: 5px; margin-bottom: 8px; }
+.workspace-conv .quick-coach-row { gap: 5px; }
 .workspace-conv .quick-coach-btn { padding: 4px 9px; }
+.workspace-conv .composer-icon-btn,
+.workspace-conv .composer-stop-btn {
+  width: 32px;
+  height: 32px;
+  min-width: 32px;
+  padding: 0;
+}
+.workspace-conv .composer-stop-btn.composer-stop-btn--armed {
+  width: auto;
+  min-width: 112px;
+  padding: 0 10px;
+}
+@media (max-width: 760px) {
+  .workspace-conv .coach-input textarea {
+    min-height: 126px;
+    padding-right: 52px;
+    padding-bottom: 82px;
+  }
+}
 
 .workspace-conv .support-stack > .micro { flex: 0 0 auto; min-height: 0; }
 .workspace-conv .support-stack > .micro[open] > .micro-log {
@@ -4333,11 +4375,6 @@ body.hub-shell { display: flex; flex-direction: column; height: 100vh; overflow:
   max-height: 68px;
   overflow: hidden;
 }
-.workspace-conv #active-conv.has-delegation-board #coach-panel[open] .panel-body,
-.workspace-conv #active-conv.has-manager-oversight #coach-panel[open] .panel-body {
-  max-height: clamp(120px, 18vh, 240px);
-  overflow-y: auto;
-}
 .workspace-conv #active-conv.has-delegation-board .support-stack,
 .workspace-conv #active-conv.has-manager-oversight .support-stack {
   flex: 0 0 auto;
@@ -4427,8 +4464,7 @@ body.hub-shell { display: flex; flex-direction: column; height: 100vh; overflow:
   gap: 8px;
   overflow: hidden;
 }
-.conversation-focus-panels #thread-panel,
-.conversation-focus-panels #coach-panel {
+.conversation-focus-panels #thread-panel {
   margin: 0;
   min-height: 0;
 }
@@ -4450,67 +4486,12 @@ body.hub-shell { display: flex; flex-direction: column; height: 100vh; overflow:
   max-height: none;
   overflow-y: auto;
 }
-.conversation-focus-panels #coach-panel {
-  flex: 0 0 auto;
-}
-.conversation-focus-panels #coach-panel[open] {
-  display: flex;
-  flex-direction: column;
-}
-.conversation-focus-panels #coach-panel[open]::details-content {
-  min-height: 0;
-  display: flex;
-  flex-direction: column;
-}
-.conversation-focus-panels #coach-panel[open] > .panel-body {
-  max-height: clamp(170px, 25vh, 300px);
-  min-height: 0;
-  overflow-y: auto;
-}
-.conversation-focus-panels #coach-panel .coach {
-  min-height: 0;
-}
-.conversation-focus-panels #coach-panel .coach-input textarea {
-  min-height: 68px;
-}
-/* Issue #1657 Treatment 3: #coach-panel's own textarea was extracted into the
-   shared #persistent-composer, which openConversationFocus() appends as a
-   third sibling of #thread-panel/#coach-panel inside .conversation-focus-panels
-   (not nested inside #coach-panel anymore). The #coach-panel-scoped rules
-   above/below predate that move and now match nothing real - mirror each one
-   for #persistent-composer .coach/.coach-input so collapsing #thread-panel
-   still grows the actual textarea, not a since-vacated #coach-panel descendant. */
 .conversation-focus-panels #persistent-composer .coach {
   min-height: 0;
 }
 .conversation-focus-panels #persistent-composer .coach-input textarea {
   min-height: 68px;
 }
-.conversation-focus-panels:has(#coach-panel:not([open])) #thread-panel[open] {
-  flex: 1 1 0;
-}
-.conversation-focus-panels:has(#thread-panel:not([open])) #coach-panel[open] {
-  flex: 1 1 0;
-}
-.conversation-focus-panels:has(#thread-panel:not([open])) #coach-panel[open]::details-content,
-.conversation-focus-panels:has(#thread-panel:not([open])) #coach-panel[open] > .panel-body,
-.conversation-focus-panels:has(#thread-panel:not([open])) #coach-panel .coach,
-.conversation-focus-panels:has(#thread-panel:not([open])) #coach-panel .coach-input {
-  flex: 1 1 0;
-}
-.conversation-focus-panels:has(#thread-panel:not([open])) #coach-panel[open] > .panel-body {
-  max-height: none;
-  display: flex;
-  flex-direction: column;
-}
-.conversation-focus-panels:has(#thread-panel:not([open])) #coach-panel .coach {
-  display: flex;
-  flex-direction: column;
-}
-.conversation-focus-panels:has(#thread-panel:not([open])) #coach-panel .coach-input textarea {
-  flex: 1 1 0;
-  min-height: 160px;
-}
 .conversation-focus-panels:has(#thread-panel:not([open])) #persistent-composer,
 .conversation-focus-panels:has(#thread-panel:not([open])) #persistent-composer .coach,
 .conversation-focus-panels:has(#thread-panel:not([open])) #persistent-composer .coach-input {