fraim-hub 2.0.264 → 2.0.266

package/dist/src/ai-hub/conversation-store-lock.js

@@ -51,9 +51,11 @@ function withBucketLock(lockPath, fn, opts = {}) {
             fd = fs_1.default.openSync(lockPath, 'wx'); // O_CREAT | O_EXCL: fails if the lock already exists
         }
         catch (error) {
-            if (error.code !== 'EEXIST')
+            const code = error.code;
+            const retryableContention = code === 'EEXIST' || code === 'EPERM' || code === 'EACCES';
+            if (!retryableContention)
                 throw error;
-            if (isLockStale(lockPath, staleMs)) {
+            if (fs_1.default.existsSync(lockPath) && isLockStale(lockPath, staleMs)) {
                 try {
                     fs_1.default.unlinkSync(lockPath);
                 }

package/dist/src/ai-hub/host-session-state.js

@@ -89,6 +89,7 @@ class HostSessionState {
         if (conversation.sessionId === normalizedSessionId) {
             const replacement = this.resolve({ ...conversation, sessionId: null }, owner);
             conversation.sessionId = replacement?.sessionId || null;
+            conversation.resumeCommand = null;
         }
     }
     markInvalidRun(run, owner, sessionId, reason, at = new Date().toISOString()) {
@@ -110,6 +111,7 @@ class HostSessionState {
         };
         if (run.sessionId === normalizedSessionId) {
             run.sessionId = undefined;
+            run.resumeCommand = null;
         }
     }
     hasInvalidSession(conversation, owner, sessionId) {

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

@@ -10,6 +10,7 @@ exports.parseUsageSignal = parseUsageSignal;
 exports.parseAgentIdentitySignal = parseAgentIdentitySignal;
 exports.__setAgentAvailabilityPathForTests = __setAgentAvailabilityPathForTests;
 exports.invalidateEmployeeDetectionCache = invalidateEmployeeDetectionCache;
+exports.__clearEmployeeDetectionMemoryCacheForTests = __clearEmployeeDetectionMemoryCacheForTests;
 exports.__setEmployeeDetectionTtlForTests = __setEmployeeDetectionTtlForTests;
 exports.__getEmployeeProbeRoundsForTests = __getEmployeeProbeRoundsForTests;
 exports.__resetEmployeeProbeRoundsForTests = __resetEmployeeProbeRoundsForTests;
@@ -940,6 +941,13 @@ function invalidateEmployeeDetectionCache() {
     }
     catch { /* best effort */ }
 }
+/** Test seam only. Simulates a process restart while preserving persisted last-known data. */
+function __clearEmployeeDetectionMemoryCacheForTests() {
+    cachedEmployees = null;
+    cachedEmployeesAtMs = 0;
+    cachedEmployeesContext = null;
+    inFlightDetection = null;
+}
 /** Test seam only. Mirrors __resetLatestVersionCache in hub-latest-version.ts. */
 function __setEmployeeDetectionTtlForTests(ttlMs) {
     employeeDetectionTtlMs = ttlMs ?? EMPLOYEE_DETECTION_TTL_MS;
@@ -1493,6 +1501,9 @@ function parseHostLine(hostId, line) {
     if (hostId === 'codex') {
         try {
             const parsed = JSON.parse(trimmed);
+            if (parsed.type === 'system' && parsed.subtype === 'status' && parsed.status === 'compacting') {
+                return withSignal({ raw: trimmed, hostLifecycle: { status: 'compacting', source: hostId } });
+            }
             if (parsed.type === 'thread.started' && parsed.thread_id) {
                 return withSignal({ sessionId: parsed.thread_id, raw: trimmed });
             }

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

@@ -74,6 +74,7 @@ const hub_latest_version_1 = require("./hub-latest-version");
 const ui_runtime_1 = require("./ui-runtime");
 const ui_cache_1 = require("./ui-cache");
 const semver = __importStar(require("semver"));
+const tree_kill_1 = __importDefault(require("tree-kill"));
 const BOOTSTRAP_PERSONA_FIRST_PAINT_BUDGET_MS = 250;
 let personaHiringModule;
 let managerHiringModule;
@@ -118,6 +119,14 @@ function buildReviewApprovalSystemEventText(instructions) {
         return 'review_approved send_delivery merge_pr_work_completion';
     if (/^Approved and send, then clean up branch\.$/i.test(text))
         return 'review_approved send_delivery cleanup_branch';
+    // Generic fallback: any "Approved and <something>." or "Approved, <something>." produced
+    // by a job-owned domain action not covered by a specific pattern above. These arrive when
+    // approvalCommandFromLabel builds a label-derived command for a non-send-campaign domain
+    // action (e.g. "Approved and dispatch.", "Approved and send outreach.", "Approved and stage drafts.").
+    // Return review_approved so prepareContinueMessage sends the raw command to the agent instead
+    // of wrapping it in "Continue the active FRAIM job..." prose.
+    if (/^Approved(?:\sand\s|\s*,\s*)\S/i.test(text))
+        return 'review_approved send_delivery';
     return null;
 }
 function extractMissingHostSessionId(text) {
@@ -317,15 +326,17 @@ class AiHubRunRegistry {
     dispose(runId) {
         this.children.delete(runId);
     }
-    // #521: terminate the agent process for a run (manager clicked Stop). Returns
-    // true if a live child was signalled. The child's onExit handler then fires and
-    // parks the run in its waiting state.
+    // #521/#1082: terminate the agent process and its entire process tree for a run
+    // (manager clicked Stop). Returns true if a live child was signalled. The
+    // child's onExit handler then fires and parks the run in its waiting state.
+    // tree-kill is used so that supervised long-running children (which are
+    // grandchildren of the cmd.exe wrapper) are also killed, not just the wrapper.
     stop(runId) {
         const child = this.children.get(runId);
-        if (!child || typeof child.kill !== 'function')
+        if (!child || child.pid == null)
             return false;
         try {
-            child.kill();
+            (0, tree_kill_1.default)(child.pid, 'SIGTERM');
             return true;
         }
         catch {
@@ -1139,6 +1150,12 @@ function applySeekMentoringSignal(run, signal) {
         run.artifacts = normalizedReviewHandoff?.reviewTarget?.type === 'artifact_set'
             ? normalizedReviewHandoff.artifacts
             : [];
+        if (run.reviewHandoff?.reviewRequired === true) {
+            run.pauseReason = 'awaiting_review';
+        }
+        else if (run.reviewHandoff?.reviewRequired === false && run.pauseReason === 'awaiting_review') {
+            run.pauseReason = 'working';
+        }
     }
     if (signal.delegationLedger &&
         run.jobId === 'fully-delegate' &&
@@ -1579,6 +1596,21 @@ function buildHubRecoveryContinueMessage(run, exitCode, attempt) {
 function createHubRecoveryEvent(run, exitCode, attempt) {
     return (0, hosts_1.createHubEvent)('system', `Hub auto-recovery attempt ${attempt}/${MAX_RECOVERY_ATTEMPTS} for run ${run.id} session ${run.sessionId || 'unknown'} after exit ${exitCode ?? 'unknown'}.`);
 }
+function buildHubCompactionRecoveryContinueMessage(run, exitCode, attempt) {
+    return [
+        '[FRAIM Hub system recovery]',
+        'The host compacted context or restarted its internal runtime while this run was still active.',
+        'This is not a manager-authored instruction. Do not say the manager asked you to continue.',
+        `Run id: ${run.id}`,
+        `Session id: ${run.sessionId || 'unknown'}`,
+        `Compaction recovery attempt: ${attempt}/${MAX_RECOVERY_ATTEMPTS}`,
+        `Prior exit code: ${exitCode ?? 'unknown'}`,
+        'Resume only if the tracked FRAIM phase is non-terminal and not waiting for human review or approval.',
+    ].join('\n');
+}
+function createHubCompactionRecoveryEvent(run, exitCode, attempt) {
+    return (0, hosts_1.createHubEvent)('system', `Hub compaction recovery attempt ${attempt}/${MAX_RECOVERY_ATTEMPTS} for run ${run.id} session ${run.sessionId || 'unknown'} after exit ${exitCode ?? 'unknown'}.`);
+}
 function isHumanActionGate(run) {
     if (run.stoppedByUser)
         return true;
@@ -1612,6 +1644,7 @@ function classifyExit(run, exitCode) {
     const lastEntry = phaseHistory.length > 0 ? phaseHistory[phaseHistory.length - 1] : null;
     const lastStatus = lastEntry?.latestStatus;
     const currentPhase = run.currentPhase;
+    const compactingActive = run.hostLifecycle?.compacting?.active === true;
     if (currentPhase && currentPhase !== '__discriminant__' && currentPhase !== 'starting') {
         if (lastStatus === 'incomplete' || lastStatus === 'failure') {
             return { action: 'park', pauseReason: 'awaiting_user' };
@@ -1622,14 +1655,66 @@ function classifyExit(run, exitCode) {
             if (lastDeclared && lastDeclared.id === currentPhase) {
                 return { action: 'done', pauseReason: 'done' };
             }
+            if (compactingActive) {
+                return { action: 'resume', pauseReason: 'working', recoveryKind: 'compaction' };
+            }
             return { action: 'park', pauseReason: 'awaiting_user' };
         }
+        if (compactingActive) {
+            return { action: 'resume', pauseReason: 'working', recoveryKind: 'compaction' };
+        }
         // Phase mid-flight (started but not completed/incomplete): conservative park.
         return { action: 'park', pauseReason: 'awaiting_user' };
     }
+    if (compactingActive) {
+        return { action: 'resume', pauseReason: 'working', recoveryKind: 'compaction' };
+    }
     // Signal-less non-FRAIM run: conservative park.
     return { action: 'park', pauseReason: 'awaiting_user' };
 }
+function applyHostLifecycleSignal(run, signal) {
+    if (!signal)
+        return;
+    const now = new Date().toISOString();
+    if (signal.status === 'compacting') {
+        const existing = run.hostLifecycle?.compacting;
+        run.hostLifecycle = {
+            ...(run.hostLifecycle || {}),
+            compacting: {
+                active: true,
+                startedAt: existing?.startedAt || now,
+                lastEventAt: now,
+                source: signal.source,
+            },
+        };
+        if (!isHumanActionGate(run)) {
+            run.status = 'running';
+            run.pauseReason = 'working';
+        }
+    }
+    else if (signal.status === 'resumed' && run.hostLifecycle?.compacting) {
+        run.hostLifecycle = {
+            ...run.hostLifecycle,
+            compacting: {
+                ...run.hostLifecycle.compacting,
+                active: false,
+                lastEventAt: now,
+            },
+        };
+    }
+}
+function clearCompactionLifecycle(run) {
+    if (!run.hostLifecycle?.compacting?.active)
+        return;
+    run.hostLifecycle = {
+        ...run.hostLifecycle,
+        compacting: {
+            ...run.hostLifecycle.compacting,
+            active: false,
+            lastEventAt: new Date().toISOString(),
+        },
+    };
+}
 class AiHubServer {
     get hubBase() {
         return process.env.FRAIM_HUB_BASE_URL || `http://127.0.0.1:${this.httpPort}`;
@@ -2273,6 +2358,44 @@ class AiHubServer {
         res.status(403).json({ error: 'Configured agent management is only allowed from the local Hub origin.' });
         return false;
     }
+    applyRunHostSessionSignal(run, sessionId, hostIdForCommand = run.hostId) {
+        const owner = {
+            configuredAgentId: run.configuredAgentId || null,
+            baseHostId: (run.baseHostId || run.hostId),
+        };
+        host_session_state_1.hostSessionState.applySession(run, owner, sessionId, { sourceRunId: run.id });
+        run.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(hostIdForCommand, sessionId);
+    }
+    repairConversationHostSessionFromEvents(conversation, owner) {
+        if (!conversation || !Array.isArray(conversation.events))
+            return false;
+        let repaired = false;
+        for (const event of conversation.events) {
+            const text = typeof event?.text === 'string' ? event.text.trim() : '';
+            if (!text)
+                continue;
+            try {
+                const parsed = (0, hosts_1.parseHostLine)(owner.baseHostId, text);
+                if (!parsed.sessionId)
+                    continue;
+                const projectedRun = {
+                    id: conversation.runId || conversation.id,
+                    hostSessions: conversation.hostSessions,
+                    sessionId: conversation.sessionId || undefined,
+                };
+                host_session_state_1.hostSessionState.applySession(projectedRun, owner, parsed.sessionId, { sourceRunId: conversation.runId || conversation.id });
+                conversation.hostSessions = projectedRun.hostSessions;
+                conversation.sessionId = projectedRun.sessionId || null;
+                conversation.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(owner.baseHostId, parsed.sessionId);
+                repaired = true;
+            }
+            catch {
+                // Persisted event logs include plain text, diagnostics, and historical host output.
+                // Non-parseable lines are not session signals.
+            }
+        }
+        return repaired;
+    }
     conversationRecordFromRun(run) {
         const lastUpdatedAt = run.updatedAt || new Date().toISOString();
         const stages = deriveStages(run, run.projectPath);
@@ -2289,6 +2412,7 @@ class AiHubServer {
             personaKey: run.personaKey ?? null,
             runId: run.id,
             sessionId: run.sessionId || null,
+            resumeCommand: run.resumeCommand || (run.sessionId ? (0, hosts_1.buildInteractiveResumeCommand)(run.hostId, run.sessionId) : null),
             status: run.status,
             // Issue #904: carry auxiliary exit classification to the persisted record.
             ...(run.pauseReason !== undefined && { pauseReason: run.pauseReason }),
@@ -2329,6 +2453,7 @@ class AiHubServer {
             hostSessions: { ...(run.hostSessions || {}) },
             restartRecovery: run.restartRecovery || null,
             restartRecoverySkippedReason: run.restartRecoverySkippedReason || null,
+            hostLifecycle: run.hostLifecycle || null,
             // Issue #578: preserve trigger source so the UI can render the chip.
             sourceTrigger: run.sourceTrigger,
             // Issue #708: carry the invocation scope so the record lands in (and is keyed to)
@@ -2345,6 +2470,13 @@ class AiHubServer {
             },
         };
         host_session_state_1.hostSessionState.mergeFromRun(record, run);
+        const activeHostSession = host_session_state_1.hostSessionState.resolve(record, {
+            configuredAgentId: run.configuredAgentId || record.configuredAgentId || null,
+            baseHostId: (run.baseHostId || run.hostId || record.baseHostId || record.agentName),
+        });
+        record.resumeCommand = activeHostSession
+            ? (0, hosts_1.buildInteractiveResumeCommand)(record.baseHostId || record.agentName, activeHostSession.sessionId)
+            : null;
         return record;
     }
     persistRunConversationNow(run, activeId) {
@@ -2394,9 +2526,10 @@ class AiHubServer {
             onEvent: (event, channel) => {
                 this.runRegistry.update(run.id, (current) => {
                     if (event.sessionId) {
-                        host_session_state_1.hostSessionState.applySession(current, { configuredAgentId: current.configuredAgentId || null, baseHostId: current.baseHostId || current.hostId }, event.sessionId, { sourceRunId: current.id });
-                        current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(run.hostId, event.sessionId);
+                        this.applyRunHostSessionSignal(current, event.sessionId, run.hostId);
+                        clearCompactionLifecycle(current);
                     }
+                    applyHostLifecycleSignal(current, event.hostLifecycle);
                     appendHostMessage(current, run.hostId, event, channel);
                     if (event.raw) {
                         current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -2572,6 +2705,10 @@ class AiHubServer {
         const projectPath = conversation.projectPath
             ? path_1.default.resolve(conversation.projectPath)
             : (MACHINE_LEVEL_JOB_IDS.has(conversation.jobId) ? os_1.default.homedir() : this.defaultProjectPath());
+        const hostSessionOwner = { configuredAgentId: configuredAgent.id, baseHostId: hostId };
+        this.repairConversationHostSessionFromEvents(conversation, hostSessionOwner);
+        const recoveredHostSession = host_session_state_1.hostSessionState.resolve(conversation, hostSessionOwner);
+        const recoveredSessionId = recoveredHostSession?.sessionId || undefined;
         return {
             id: (0, crypto_1.randomUUID)(),
             conversationId: conversation.id,
@@ -2585,8 +2722,9 @@ class AiHubServer {
             projectPath,
             scope: conversation.scope || 'project',
             status: 'running',
-            sessionId: conversation.sessionId || undefined,
-            resumeCommand: conversation.sessionId ? (0, hosts_1.buildInteractiveResumeCommand)(hostId, conversation.sessionId) : null,
+            sessionId: recoveredSessionId,
+            hostSessions: conversation.hostSessions ? { ...conversation.hostSessions } : undefined,
+            resumeCommand: recoveredSessionId ? (0, hosts_1.buildInteractiveResumeCommand)(hostId, recoveredSessionId) : null,
             createdAt: typeof conversation.createdAt === 'string' ? conversation.createdAt : now,
             updatedAt: now,
             messages: persistedMessagesForRun(conversation),
@@ -2615,6 +2753,7 @@ class AiHubServer {
                 reason,
             },
             restartRecoverySkippedReason: null,
+            hostLifecycle: conversation.hostLifecycle || undefined,
             nextJobRecommendations: conversation.nextJobRecommendations || null,
             issueNumber: conversation.issueNumber ?? null,
             agentSwitches: conversation.agentSwitches || [],
@@ -2646,9 +2785,10 @@ class AiHubServer {
             onEvent: (event, channel) => {
                 this.runRegistry.update(currentRun.id, (current) => {
                     if (event.sessionId) {
-                        current.sessionId = event.sessionId;
-                        current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(current.hostId, event.sessionId);
+                        this.applyRunHostSessionSignal(current, event.sessionId, current.hostId);
+                        clearCompactionLifecycle(current);
                     }
+                    applyHostLifecycleSignal(current, event.hostLifecycle);
                     appendHostMessage(current, current.hostId, event, channel);
                     if (event.raw) {
                         current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -2970,9 +3110,10 @@ class AiHubServer {
             onEvent: (event, channel) => {
                 this.runRegistry.update(childRun.id, (current) => {
                     if (event.sessionId) {
-                        current.sessionId = event.sessionId;
-                        current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(managerRun.hostId, event.sessionId);
+                        this.applyRunHostSessionSignal(current, event.sessionId, managerRun.hostId);
+                        clearCompactionLifecycle(current);
                     }
+                    applyHostLifecycleSignal(current, event.hostLifecycle);
                     appendHostMessage(current, managerRun.hostId, event, channel);
                     if (event.raw) {
                         current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -3122,9 +3263,10 @@ class AiHubServer {
             onEvent: (event, channel) => {
                 this.runRegistry.update(managerRun.id, (current) => {
                     if (event.sessionId) {
-                        current.sessionId = event.sessionId;
-                        current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(managerRun.hostId, event.sessionId);
+                        this.applyRunHostSessionSignal(current, event.sessionId, managerRun.hostId);
+                        clearCompactionLifecycle(current);
                     }
+                    applyHostLifecycleSignal(current, event.hostLifecycle);
                     appendHostMessage(current, managerRun.hostId, event, channel);
                     if (event.raw) {
                         current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -3793,7 +3935,19 @@ class AiHubServer {
                     .filter((incoming) => belongsInBucket(incoming))
                     .map((incoming) => {
                     const existing = incoming && incoming.id ? priorById.get(incoming.id) : undefined;
-                    return existing ? { ...existing, ...incoming } : incoming;
+                    const merged = existing ? { ...existing, ...incoming } : incoming;
+                    const activeRun = merged?.runId ? this.runRegistry.get(merged.runId) : undefined;
+                    const incomingErrorState = merged.status === 'failed'
+                        || (merged.status === 'running' && merged.pauseReason === 'error');
+                    const activeRunAwaitingReview = activeRun?.pauseReason === 'awaiting_review';
+                    if (activeRun?.status === 'running' && (incomingErrorState || activeRunAwaitingReview)) {
+                        return {
+                            ...merged,
+                            status: 'running',
+                            pauseReason: activeRun.pauseReason === 'awaiting_review' ? 'awaiting_review' : 'working',
+                        };
+                    }
+                    return merged;
                 });
                 const saved = this.conversationStore.replaceProject(key, {
                     activeId: body.activeId ?? null,
@@ -3960,9 +4114,10 @@ class AiHubServer {
                         onEvent: (event, channel) => {
                             this.runRegistry.update(run.id, (current) => {
                                 if (event.sessionId) {
-                                    host_session_state_1.hostSessionState.applySession(current, { configuredAgentId: current.configuredAgentId || null, baseHostId: current.baseHostId || current.hostId }, event.sessionId, { sourceRunId: current.id });
-                                    current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(run.hostId, event.sessionId);
+                                    this.applyRunHostSessionSignal(current, event.sessionId, run.hostId);
+                                    clearCompactionLifecycle(current);
                                 }
+                                applyHostLifecycleSignal(current, event.hostLifecycle);
                                 appendHostMessage(current, run.hostId, event, channel);
                                 if (event.raw) {
                                     current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -4650,7 +4805,7 @@ class AiHubServer {
                     continuityDecision: continuity.continuityDecision,
                 };
                 this.runRegistry.create(run, {});
-                this.scheduleRunConversationPersistence(run, run.conversationId || run.id);
+                this.persistRunConversation(run, run.conversationId || run.id);
                 // Issue #442: create the Direct (B) run before spawning either process
                 // so we can cross-link both runs via compareRunId before any events arrive.
                 // directMsg is the plain user instructions — no FRAIM invocation prefix.
@@ -4692,9 +4847,10 @@ class AiHubServer {
                     onEvent: (event, channel) => {
                         this.runRegistry.update(run.id, (current) => {
                             if (event.sessionId) {
-                                current.sessionId = event.sessionId;
-                                current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(hostId, event.sessionId);
+                                this.applyRunHostSessionSignal(current, event.sessionId, hostId);
+                                clearCompactionLifecycle(current);
                             }
+                            applyHostLifecycleSignal(current, event.hostLifecycle);
                             appendHostMessage(current, hostId, event, channel);
                             if (event.raw) {
                                 current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -4733,9 +4889,10 @@ class AiHubServer {
                         onEvent: (event, channel) => {
                             this.runRegistry.update(directId, (current) => {
                                 if (event.sessionId) {
-                                    current.sessionId = event.sessionId;
-                                    current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(hostId, event.sessionId);
+                                    this.applyRunHostSessionSignal(current, event.sessionId, hostId);
+                                    clearCompactionLifecycle(current);
                                 }
+                                applyHostLifecycleSignal(current, event.hostLifecycle);
                                 appendHostMessage(current, hostId, event, channel);
                                 if (event.raw)
                                     current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -4884,6 +5041,7 @@ class AiHubServer {
                         : this.prepareStartPayload(run.projectPath, run.hostId, run.jobId, prepared.display || message);
                     this.runRegistry.update(run.id, (current) => {
                         current.status = 'running';
+                        current.pauseReason = 'working';
                         current.sessionId = undefined;
                         current.messages.push((0, hosts_1.createHubMessage)('manager', prepared.display || message));
                         if (reviewApprovalSystemEventText)
@@ -4899,9 +5057,10 @@ class AiHubServer {
                         onEvent: (event, channel) => {
                             this.runRegistry.update(run.id, (current) => {
                                 if (event.sessionId) {
-                                    current.sessionId = event.sessionId;
-                                    current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(run.hostId, event.sessionId);
+                                    this.applyRunHostSessionSignal(current, event.sessionId, run.hostId);
+                                    clearCompactionLifecycle(current);
                                 }
+                                applyHostLifecycleSignal(current, event.hostLifecycle);
                                 appendHostMessage(current, run.hostId, event, channel);
                                 if (event.raw) {
                                     current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -4934,6 +5093,7 @@ class AiHubServer {
                 }
                 this.runRegistry.update(run.id, (current) => {
                     current.status = 'running';
+                    current.pauseReason = 'working';
                     // #521: bubble shows the manager's words; the agent gets the full message.
                     current.messages.push((0, hosts_1.createHubMessage)('manager', prepared.display || message));
                     if (reviewApprovalSystemEventText)
@@ -4948,9 +5108,10 @@ class AiHubServer {
                     onEvent: (event, channel) => {
                         this.runRegistry.update(run.id, (current) => {
                             if (event.sessionId) {
-                                current.sessionId = event.sessionId;
-                                current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(run.hostId, event.sessionId);
+                                this.applyRunHostSessionSignal(current, event.sessionId, run.hostId);
+                                clearCompactionLifecycle(current);
                             }
+                            applyHostLifecycleSignal(current, event.hostLifecycle);
                             appendHostMessage(current, run.hostId, event, channel);
                             if (event.raw) {
                                 current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -5026,11 +5187,16 @@ class AiHubServer {
                     ? this.conversationStore.loadProject(conversationBucketKey).conversations.find((entry) => entry.id === requestedConversationId)
                     : inferredConversation ?? undefined;
                 const persistedRun = readPersistedRunProjection(persistedConversation);
-                const resolvedHostSession = host_session_state_1.hostSessionState.resolve(persistedConversation, {
+                const hostSessionOwner = {
                     configuredAgentId: configuredAgent.id,
                     baseHostId: hostId,
-                });
-                if (!resolvedHostSession && host_session_state_1.hostSessionState.hasInvalidSession(persistedConversation, { configuredAgentId: configuredAgent.id, baseHostId: hostId }, requestedSessionId)) {
+                };
+                const repairedHostSessionFromEvents = this.repairConversationHostSessionFromEvents(persistedConversation, hostSessionOwner);
+                if (repairedHostSessionFromEvents && persistedConversation) {
+                    this.conversationStore.upsertConversation(conversationBucketKey, persistedConversation, conversationId || undefined);
+                }
+                const resolvedHostSession = host_session_state_1.hostSessionState.resolve(persistedConversation, hostSessionOwner);
+                if (!resolvedHostSession && host_session_state_1.hostSessionState.hasInvalidSession(persistedConversation, hostSessionOwner, requestedSessionId)) {
                     return res.status(409).json({
                         error: 'The saved host session was already marked invalid. Start a fresh handoff-backed run instead of retrying the same session.',
                         hostSessionStatus: 'invalid',
@@ -5044,6 +5210,7 @@ class AiHubServer {
                     conversationTitle: typeof body.conversationTitle === 'string' && body.conversationTitle.trim() ? body.conversationTitle.trim() : undefined,
                     jobTitle: typeof body.jobTitle === 'string' && body.jobTitle.trim() ? body.jobTitle.trim() : jobId,
                     jobId, hostId, configuredAgentId: configuredAgent.id, configuredAgentLabel: configuredAgent.label, baseHostId: configuredAgent.baseHostId, projectPath, status: 'running', sessionId,
+                    resumeCommand: (0, hosts_1.buildInteractiveResumeCommand)(hostId, sessionId),
                     hostSessions: persistedConversation?.hostSessions ? { ...persistedConversation.hostSessions } : undefined,
                     // Issue #892: keep the invocation scope so a resumed manager/company run stays
                     // in its project-independent conversation bucket.
@@ -5078,16 +5245,19 @@ class AiHubServer {
                 this.scheduleRunConversationPersistence(run, run.conversationId || run.id);
                 const child = this.hostRuntime.continueRun(hostId, projectPath, sessionId, message, {
                     onEvent: (event, channel) => {
+                        let invalidatedMissingHostSession = false;
                         this.runRegistry.update(run.id, (current) => {
                             if (event.sessionId) {
-                                host_session_state_1.hostSessionState.applySession(current, { configuredAgentId: current.configuredAgentId || null, baseHostId: current.baseHostId || current.hostId }, event.sessionId, { sourceRunId: current.id });
-                                current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(hostId, event.sessionId);
+                                this.applyRunHostSessionSignal(current, event.sessionId, hostId);
+                                clearCompactionLifecycle(current);
                             }
+                            applyHostLifecycleSignal(current, event.hostLifecycle);
                             appendHostMessage(current, hostId, event, channel);
                             if (event.raw) {
                                 const missingSessionId = extractMissingHostSessionId(event.raw);
                                 if (missingSessionId) {
                                     host_session_state_1.hostSessionState.markInvalidRun(current, { configuredAgentId: current.configuredAgentId || null, baseHostId: current.baseHostId || current.hostId }, missingSessionId, 'host-reported-missing-session');
+                                    invalidatedMissingHostSession = true;
                                 }
                                 current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
                                 applyReviewProjection(current, event.raw);
@@ -5102,8 +5272,14 @@ class AiHubServer {
                                 applyUsageSignal(current, event.usage);
                         });
                         const updated = this.runRegistry.get(run.id);
-                        if (updated)
-                            this.scheduleRunConversationPersistence(updated, updated.conversationId || updated.id);
+                        if (updated) {
+                            if (invalidatedMissingHostSession) {
+                                this.persistRunConversationNow(updated, updated.conversationId || updated.id);
+                            }
+                            else {
+                                this.scheduleRunConversationPersistence(updated, updated.conversationId || updated.id);
+                            }
+                        }
                     },
                     onExit: (exitCode) => {
                         this.handleRunExit(run.id, exitCode);
@@ -5139,9 +5315,10 @@ class AiHubServer {
                     onEvent: (event, channel) => {
                         this.runRegistry.update(run.id, (current) => {
                             if (event.sessionId) {
-                                current.sessionId = event.sessionId;
-                                current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(run.hostId, event.sessionId);
+                                this.applyRunHostSessionSignal(current, event.sessionId, run.hostId);
+                                clearCompactionLifecycle(current);
                             }
+                            applyHostLifecycleSignal(current, event.hostLifecycle);
                             appendHostMessage(current, run.hostId, event, channel);
                             if (event.raw)
                                 current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -5733,9 +5910,10 @@ class AiHubServer {
                     onEvent: (event, channel) => {
                         this.runRegistry.update(run.id, (current) => {
                             if (event.sessionId) {
-                                current.sessionId = event.sessionId;
-                                current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(hostId, event.sessionId);
+                                this.applyRunHostSessionSignal(current, event.sessionId, hostId);
+                                clearCompactionLifecycle(current);
                             }
+                            applyHostLifecycleSignal(current, event.hostLifecycle);
                             appendHostMessage(current, hostId, event, channel);
                             if (event.raw)
                                 current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -5883,9 +6061,10 @@ class AiHubServer {
             onEvent: (event, channel) => {
                 this.runRegistry.update(run.id, (current) => {
                     if (event.sessionId) {
-                        current.sessionId = event.sessionId;
-                        current.resumeCommand = (0, hosts_1.buildInteractiveResumeCommand)(hostId, event.sessionId);
+                        this.applyRunHostSessionSignal(current, event.sessionId, hostId);
+                        clearCompactionLifecycle(current);
                     }
+                    applyHostLifecycleSignal(current, event.hostLifecycle);
                     appendHostMessage(current, hostId, event, channel);
                     if (event.raw) {
                         current.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -5937,7 +6116,9 @@ class AiHubServer {
                 current.recoveryAttempts = (current.recoveryAttempts ?? 0) + 1;
                 current.lastRecoveryAt = new Date().toISOString();
                 current.pauseReason = 'working';
-                current.events.push(createHubRecoveryEvent(current, exitCode, current.recoveryAttempts));
+                current.events.push(classification.recoveryKind === 'compaction'
+                    ? createHubCompactionRecoveryEvent(current, exitCode, current.recoveryAttempts)
+                    : createHubRecoveryEvent(current, exitCode, current.recoveryAttempts));
             });
             const refreshed = this.runRegistry.get(runId);
             if (!refreshed?.sessionId) {
@@ -5958,12 +6139,17 @@ class AiHubServer {
                 const current = this.runRegistry.get(runId);
                 if (!current || current.status !== 'running')
                     return;
-                const message = buildHubRecoveryContinueMessage(current, exitCode, attempt);
+                const message = classification.recoveryKind === 'compaction'
+                    ? buildHubCompactionRecoveryContinueMessage(current, exitCode, attempt)
+                    : buildHubRecoveryContinueMessage(current, exitCode, attempt);
                 const child = this.hostRuntime.continueRun(current.hostId, current.projectPath, current.sessionId, message, {
                     onEvent: (event, channel) => {
                         this.runRegistry.update(runId, (r) => {
-                            if (event.sessionId)
-                                r.sessionId = event.sessionId;
+                            if (event.sessionId) {
+                                this.applyRunHostSessionSignal(r, event.sessionId, current.hostId);
+                                clearCompactionLifecycle(r);
+                            }
+                            applyHostLifecycleSignal(r, event.hostLifecycle);
                             appendHostMessage(r, current.hostId, event, channel);
                             if (event.raw) {
                                 r.events.push((0, hosts_1.createHubEvent)(channel, event.raw));
@@ -6002,6 +6188,7 @@ class AiHubServer {
                     : (exitCode === 0 ? 'completed' : 'failed');
             }
             current.pauseReason = classification.pauseReason;
+            clearCompactionLifecycle(current);
             if (!current.stoppedByUser) {
                 current.events.push((0, hosts_1.createHubEvent)('system', `Run exited with code ${exitCode ?? 'unknown'}.`));
             }

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

@@ -53,8 +53,8 @@ exports.PERSONA_CAPABILITY_BUNDLES = {
     pam: {
         personaKey: 'pam',
         bundleId: 'persona-pam-core',
-        catalogMetadata: buildCatalogMetadata('pam', ['feature-specification', 'technical-design', 'project-plan-creation']),
-        protectedJobs: ['feature-specification', 'technical-design', 'experiment-tracking', 'project-plan-creation', 'implementation-feature-review', 'scrum-sprint-planning', 'mvp-validation-plan', 'sprint-planning', 'customer-prospect-discovery', 'interview-preparation', 'participant-recruitment', 'process-interview-notes', 'review-customer-development', 'triage-customer-needs'],
+        catalogMetadata: buildCatalogMetadata('pam', ['feature-specification', 'project-plan-creation', 'implementation-feature-review']),
+        protectedJobs: ['feature-specification', 'send-newsletter', 'send-thank-you-notes', 'experiment-tracking', 'project-plan-creation', 'implementation-feature-review', 'scrum-sprint-planning', 'mvp-validation-plan', 'sprint-planning', 'customer-prospect-discovery', 'interview-preparation', 'participant-recruitment', 'process-interview-notes', 'review-customer-development', 'triage-customer-needs'],
         protectedAliases: ['product-management', 'product-spec'],
         defaultHireMode: 'job',
         lockCopy: 'Hire PaM to unlock product-management work for this request.'
@@ -63,7 +63,7 @@ exports.PERSONA_CAPABILITY_BUNDLES = {
         personaKey: 'swen',
         bundleId: 'persona-swen-core',
         catalogMetadata: buildCatalogMetadata('swen', ['feature-implementation', 'technical-design', 'code-refactoring']),
-        protectedJobs: ['feature-implementation', 'implementation-design-review', 'code-refactoring', 'pr-iteration', 'mobile-app-development', 'mcp-server-creation', 'cloud-application-deployment', 'cloud-cost-optimization', 'cloud-performance-diagnosis', 'route-llm-spend-to-cloud-credits', 'set-up-cloud-cost-alerts', 'gitlabs-to-github', 'system-migration', 'cross-cloud-migration', 'data-pipeline-design', 'data-quality-monitoring', 'data-platform-architecture', 'write-dev-docs', 'database-schema-design', 'create-architecture', 'project-scaffolding', 'codebase-analysis-and-ideation', 'github-org-setup', 'google-workspace-setup', 'mobile-app-rejection-response', 'mobile-app-submission', 'publish-mcp-app', 'application-replication-workflow'],
+        protectedJobs: ['feature-implementation', 'technical-design', 'implementation-design-review', 'code-refactoring', 'pr-iteration', 'mobile-app-development', 'mcp-server-creation', 'cloud-application-deployment', 'cloud-cost-optimization', 'cloud-performance-diagnosis', 'route-llm-spend-to-cloud-credits', 'set-up-cloud-cost-alerts', 'gitlabs-to-github', 'system-migration', 'cross-cloud-migration', 'data-pipeline-design', 'data-quality-monitoring', 'data-platform-architecture', 'write-dev-docs', 'database-schema-design', 'create-architecture', 'project-scaffolding', 'codebase-analysis-and-ideation', 'github-org-setup', 'google-workspace-setup', 'mobile-app-rejection-response', 'mobile-app-submission', 'publish-mcp-app', 'application-replication-workflow'],
         protectedAliases: ['software-engineering', 'implementation'],
         defaultHireMode: 'job',
         lockCopy: 'Hire SWEn to unlock software-engineering delivery for this request.'
@@ -117,7 +117,7 @@ exports.PERSONA_CAPABILITY_BUNDLES = {
         personaKey: 'ashley',
         bundleId: 'persona-ashley-core',
         catalogMetadata: buildCatalogMetadata('ashley', ['chief-of-staff-briefing', 'executive-assistant', 'analyze-transcript']),
-        protectedJobs: ['chief-of-staff-briefing', 'calendar-triage', 'meeting-preparation', 'executive-assistant', 'send-newsletter', 'send-thank-you-notes', 'analyze-transcript', 'travel-planning', 'travel-disruption-rebooking'],
+        protectedJobs: ['chief-of-staff-briefing', 'calendar-triage', 'meeting-preparation', 'executive-assistant', 'analyze-transcript', 'travel-planning', 'travel-disruption-rebooking'],
         protectedAliases: ['executive-assistant', 'operations-assistant'],
         defaultHireMode: 'job',
         lockCopy: 'Hire AshLey to unlock executive-assistant work for this request.'
@@ -273,6 +273,7 @@ for (const bundle of Object.values(exports.PERSONA_CAPABILITY_BUNDLES)) {
 // as "free") so the Hub attributes them to FRAIMworker, but they are never
 // hire-gated because FRAIMworker is not a purchasable persona.
 const GENERIC_WORKER_OWNED_JOBS = new Set([
+    'create-hub-configured-agent',
     'contribute-to-fraim',
     'file-fraim-issue',
     'praise-fraim',

package/dist/src/local-mcp-server/learning-context-builder.js

@@ -90,6 +90,13 @@ function getLearningRoots(workspaceRoot) {
         repoLearningsBase: (0, project_fraim_paths_1.getWorkspaceLearningsDir)(workspaceRoot)
     };
 }
+function sameResolvedPath(a, b) {
+    return (0, path_1.resolve)(a) === (0, path_1.resolve)(b);
+}
+function portablePersonalBaseIsLive(globalBase) {
+    return sameResolvedPath((0, path_1.join)((0, pack_home_1.resolvePackHome)('manager').contentRoot, 'learnings'), globalBase)
+        || !sameResolvedPath(globalBase, (0, project_fraim_paths_1.getUserFraimLearningsDir)());
+}
 function resolvePersonalLearningFile(repoBase, managerCacheBase, managerCacheDisplayBase, globalBase, globalDisplayBase, fileName) {
     const repoPath = (0, path_1.join)(repoBase, fileName);
     if ((0, fs_1.existsSync)(repoPath)) {
@@ -100,14 +107,14 @@ function resolvePersonalLearningFile(repoBase, managerCacheBase, managerCacheDis
         };
     }
     const globalPath = (0, path_1.join)(globalBase, fileName);
-    if ((0, fs_1.existsSync)(globalPath)) {
+    const managerCachePath = (0, path_1.join)(managerCacheBase, fileName);
+    if (portablePersonalBaseIsLive(globalBase) && (0, fs_1.existsSync)(globalPath)) {
         return {
             present: true,
             path: globalPath,
             displayPath: `${globalDisplayBase.replace(/\/$/, '')}/${fileName}`
         };
     }
-    const managerCachePath = (0, path_1.join)(managerCacheBase, fileName);
     if ((0, fs_1.existsSync)(managerCachePath)) {
         return {
             present: true,
@@ -140,7 +147,9 @@ function resolvePersonalLearningFileTiers(repoBase, managerCacheBase, managerCac
         });
     }
     const globalPath = (0, path_1.join)(globalBase, fileName);
-    if ((0, fs_1.existsSync)(globalPath)) {
+    if (portablePersonalBaseIsLive(globalBase) &&
+        (0, fs_1.existsSync)(globalPath) &&
+        !tiers.some((tier) => sameResolvedPath(tier.path, globalPath))) {
         tiers.push({
             level: 'manager',
             path: globalPath,
@@ -405,10 +414,25 @@ function collectPendingL0SourceFiles(workspaceRoot, resolvedUserId, roots) {
     }
     return sources.sort((a, b) => b.sortKey.localeCompare(a.sortKey) || a.displayPath.localeCompare(b.displayPath));
 }
+/**
+ * Issue #1078 fix: derive the org display path from contentRoot rather than
+ * hardcoding the pre-migration flat layout. After migrateOrgFlatContent runs,
+ * contentRoot is ~/.fraim/org/personalized-employee/ — not ~/.fraim/org/.
+ * The relative portion after the ~/.fraim/ prefix is computed dynamically so
+ * it cannot drift from the read path again.
+ */
+function orgCacheDisplayPath(fileName) {
+    const fraimDir = (0, project_fraim_paths_1.getUserFraimDirPath)();
+    const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, 'learnings', fileName);
+    const rel = cachePath.startsWith(fraimDir)
+        ? cachePath.slice(fraimDir.length).replace(/\\/g, '/').replace(/^\//, '')
+        : cachePath.replace(/\\/g, '/');
+    return (0, project_fraim_paths_1.getUserFraimDisplayPath)(rel);
+}
 /**
  * Resolve an L2 org-scope learning file (issue #563): a repo-local override
  * (`fraim/personalized-employee/learnings/`) wins, then the synced org cache
- * (`~/.fraim/org/learnings/`). Org learnings are part of the shared org pack,
+ * (contentRoot/learnings/). Org learnings are part of the shared org pack,
  * so a synced copy must be readable by the agent even with no repo-local copy.
  * Mirrors the org context/rules resolution order. Returns `present:false` with
  * the repo path/display when neither tier has the file.
@@ -420,7 +444,7 @@ function resolveOrgLearningFile(repoLearningsBase, fileName) {
     }
     const cachePath = (0, path_1.join)((0, pack_home_1.resolvePackHome)('org').contentRoot, 'learnings', fileName);
     if ((0, fs_1.existsSync)(cachePath)) {
-        return { present: true, path: cachePath, displayPath: (0, project_fraim_paths_1.getUserFraimDisplayPath)(`org/learnings/${fileName}`) };
+        return { present: true, path: cachePath, displayPath: orgCacheDisplayPath(fileName) };
     }
     return { present: false, path: repoPath, displayPath: `${REPO_LEARNINGS_REL}/${fileName}` };
 }
@@ -436,7 +460,7 @@ function resolveOrgLearningFileTiers(repoLearningsBase, fileName) {
         tiers.push({
             level: 'org',
             path: cachePath,
-            displayPath: (0, project_fraim_paths_1.getUserFraimDisplayPath)(`org/learnings/${fileName}`)
+            displayPath: orgCacheDisplayPath(fileName)
         });
     }
     const repoPath = (0, path_1.join)(repoLearningsBase, fileName);
@@ -1158,11 +1182,20 @@ function collectBrainLearningDots(workspaceRoot, userId) {
         if (coldEntries.length) {
             processed.push({ type: fileType, typeLabel, region, scope: 'cold', displayPath: coldResolved.displayPath, entries: coldEntries });
         }
-        // L2 org
-        const org = resolveOrgLearningFile(roots.repoLearningsBase, `org-${fileType}.md`);
-        const orgEntries = parseBrainLearningEntries(org.path, fileType);
-        if (orgEntries.length) {
-            processed.push({ type: fileType, typeLabel, region, scope: 'org', displayPath: org.displayPath, entries: orgEntries });
+        // L2 org — issue #1078 fix: use tiered resolver + merge so synced org home
+        // and repo-local org-*.md are both included, same as buildLearningContextSection.
+        const orgTiers = resolveOrgLearningFileTiers(roots.repoLearningsBase, `org-${fileType}.md`);
+        if (orgTiers.length > 0) {
+            // Merge entries across tiers; deduplicate by title (last tier wins = repo-local wins).
+            const allOrgEntries = orgTiers.flatMap(t => parseBrainLearningEntries(t.path, fileType));
+            const byTitle = new Map();
+            for (const e of allOrgEntries)
+                byTitle.set(e.title.trim().toLowerCase(), e);
+            const mergedOrgEntries = [...byTitle.values()];
+            if (mergedOrgEntries.length) {
+                // Use the first (highest-precedence = synced org home) tier's displayPath.
+                processed.push({ type: fileType, typeLabel, region, scope: 'org', displayPath: orgTiers[0].displayPath, entries: mergedOrgEntries });
+            }
         }
     }
     return { pending: { count: pendingSignals.length, signals: pendingSignals }, processed };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.264",
+  "version": "2.0.266",
   "description": "FRAIM Hub local companion package.",
   "bin": {
     "fraim-hub": "bin/fraim-hub.js",
@@ -163,7 +163,7 @@
     "electron": "^41.2.2",
     "electron-updater": "^6.8.9",
     "express": "^5.2.1",
-    "fraim": "2.0.264",
+    "fraim": "2.0.266",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",

package/public/ai-hub/index.html

@@ -204,19 +204,6 @@
     </div>
   </section>
 
-  <!-- Issue #512: Brain area (reached from the account menu) -->
-  <section class="hub-area" id="area-brain" hidden>
-    <div class="hub-area-page">
-      <div class="eyebrow">FRAIM · Brain</div>
-      <div class="area-h1">Brain</div>
-      <p class="area-lede">The full picture of what your team knows: every preserved learning across scopes, plus the skills and rules they draw on.</p>
-      <div class="sec-label" style="margin-top:22px;">Preserved learnings</div>
-      <div class="stat-grid" id="brain-learnings"></div>
-      <div class="sec-label" style="margin-top:22px;">What your team draws on</div>
-      <div class="stat-grid" id="brain-catalog"></div>
-    </div>
-  </section>
-
   <section class="hub-area" id="area-connected" hidden>
     <div class="connected-shell">
       <div class="connected-toolbar">

package/public/ai-hub/script.js

@@ -343,7 +343,6 @@ function tfRefreshPersonaDependentSurfaces() {
   renderManagerTeamPool();
   if (tf.area === 'company') tfRenderCompany();
   else if (tf.area === 'manager') tfRenderManager();
-  else if (tf.area === 'brain') tfRenderBrain();
   if (tf.area === 'projects') {
     if (tf.projectView === 'overview') tfRenderOverview();
     else {
@@ -2532,13 +2531,15 @@ function statusLabel(s) {
 function conversationUiState(conv) {
   if (!conv) return 'idle';
   if (conv.blocked) return 'blocked';
+  // Issue #1081: a submit-phase review handoff is a manager gate even if the
+  // employee process is still alive for post-submit bookkeeping.
+  if (conv.pauseReason === 'awaiting_review') return 'waiting';
   if (conv.status === 'running') return 'working';
   // Issue #904: read pauseReason first for non-running records so the pill
   // reflects the exit classification rather than mapping all completed -> 'waiting'.
   if (conv.pauseReason === 'working') return 'working';
   if (conv.pauseReason === 'done') return 'complete';
   if (conv.pauseReason === 'error') return 'error';
-  if (conv.pauseReason === 'awaiting_review') return 'waiting';
   if (conv.pauseReason === 'awaiting_user') return 'waiting';
   if (conv.pauseReason === 'stopped') return 'stopped';
   // Legacy fallback for records written before #904 (no pauseReason field).
@@ -4833,6 +4834,9 @@ function defaultCoachNote(conv) {
   if (uiState === 'error') {
     return 'The employee encountered an error. Review the run log and send a corrective instruction to retry.';
   }
+  if (conv && conv.pauseReason === 'awaiting_user') {
+    return 'The employee is waiting on you. Send the next instruction to continue this run.';
+  }
   if (conv && conv.status === 'running') {
     return 'The employee is still working. Add coaching here to tighten the next step without losing context.';
   }
@@ -4939,6 +4943,10 @@ function convAwaitingReview(conv) {
   if (!conv) return false;
   if (conv.pauseReason === 'done') return false;
   if (conv.reviewApproved) return false;
+  const handoff = reviewHandoffForConversation(conv);
+  if (conv.pauseReason === 'awaiting_review') {
+    return handoff ? handoff.reviewRequired === true : false;
+  }
   // #770 R2/R4: never ask for a decision while the run is actively working a
   // (possibly later, no-decision) phase. conv.status is maintained by
   // foldRunIntoConversation. While 'running' the manager is coaching, not
@@ -4950,7 +4958,6 @@ function convAwaitingReview(conv) {
   // happens to have produced a file (it appears in the Deliverables panel, not
   // an approve/reject bar).
   if (conv.jobId === '__freeform__') return false;
-  const handoff = reviewHandoffForConversation(conv);
   if (handoff) return handoff.reviewRequired === true;
   // Delegation orchestration runs (fully-delegate with an active ledger) only enter review
   // via an explicit review_handoff — Mandy's delegation artifacts are orchestration working
@@ -7647,6 +7654,7 @@ function foldRunIntoConversation(conv, run) {
   conv.title = conversationTitle(conv);
   // Track session for resumption.
   if (run.sessionId) conv.sessionId = run.sessionId;
+  if (run.resumeCommand !== undefined) conv.resumeCommand = run.resumeCommand;
   if (run.hostSessions && typeof run.hostSessions === 'object') {
     conv.hostSessions = { ...(conv.hostSessions || {}), ...run.hostSessions };
   }
@@ -10079,7 +10087,6 @@ function tfShowArea(area) {
   }
   if (area === 'company') tfRenderCompany();
   if (area === 'manager') tfRenderManager();
-  if (area === 'brain') tfRenderBrain();
   // Issue #1065: the scope is derived from the active surface, so it changes with the tab (R3).
   if (typeof srchOnSurfaceChanged === 'function') srchOnSurfaceChanged();
   window.scrollTo(0, 0);
@@ -13468,44 +13475,6 @@ async function tfPromoteProposal(originScope, proposal, targetScope) {
     showStatus(`Promoted “${proposal.title}” to ${label} learnings. Run Share learnings to let sleep-on-learnings persist it.`, false);
   }
 }
-function tfStatCard(num, label, color) {
-  const card = document.createElement('div');
-  card.className = 'stat-card';
-  const n = document.createElement('div');
-  n.className = 'stat-num';
-  n.textContent = String(num);
-  if (color) n.style.color = color;
-  const l = document.createElement('div');
-  l.className = 'stat-lbl';
-  l.textContent = label;
-  card.appendChild(n); card.appendChild(l);
-  return card;
-}
-function tfRenderBrain() {
-  const brain = state.bootstrap && state.bootstrap.brain;
-  const learnHost = document.getElementById('brain-learnings');
-  const catHost = document.getElementById('brain-catalog');
-  if (learnHost) {
-    learnHost.innerHTML = '';
-    // Issue #1002 R10/R11: three tiles for the three LEVELS, in one vocabulary,
-    // then the two things that are not levels. "Manager" used to label the
-    // reverse-mentoring count, which collided with the manager level once that
-    // became a real level; it now has its own tile.
-    const l = (brain && brain.learnings) || { organization: 0, manager: 0, project: 0, reverseMentoring: 0, rawSignals: 0 };
-    learnHost.appendChild(tfStatCard(l.organization || 0, 'Company', 'var(--accent)'));
-    learnHost.appendChild(tfStatCard(l.manager || 0, 'Manager', '#6b4c92'));
-    learnHost.appendChild(tfStatCard(l.project || 0, 'Project', 'var(--done)'));
-    learnHost.appendChild(tfStatCard(l.reverseMentoring || 0, 'Reverse mentoring', '#6b4c92'));
-    learnHost.appendChild(tfStatCard(l.rawSignals || 0, 'Pending signals', '#f57c00'));
-  }
-  if (catHost) {
-    catHost.innerHTML = '';
-    const c = (brain && brain.catalog) || { skills: 0, rules: 0, jobs: 0 };
-    catHost.appendChild(tfStatCard(c.skills || 0, 'Skills available'));
-    catHost.appendChild(tfStatCard(c.rules || 0, 'Rules & guardrails'));
-    catHost.appendChild(tfStatCard(c.jobs || 0, 'Jobs in catalog'));
-  }
-}
 
 // ---------------------------------------------------------------------------
 // Account menu
@@ -15081,7 +15050,6 @@ function tfRefreshAfterBootstrap() {
   tfRenderProjectTabs();
   if (tf.area === 'company') tfRenderCompany();
   else if (tf.area === 'manager') tfRenderManager();
-  else if (tf.area === 'brain') tfRenderBrain();
   if (tf.projectView === 'overview') tfRenderOverview();
   else tfRenderTree();
   // Issue #1005: the bootstrap we just applied missed the first-paint persona budget and

package/public/ai-hub/styles.css

@@ -3451,7 +3451,8 @@ body.hub-shell { display: flex; flex-direction: column; height: 100vh; overflow:
 .pending-banner { background: var(--warn-soft); border: 1px solid rgba(176,132,66,.25); border-radius: 12px; padding: 12px 16px; display: flex; align-items: flex-start; gap: 10px; margin-bottom: 12px; }
 
 /* Projects sub-tabs — HTML uses .proj-tabs (not .proj-tabs-bar) and .ptab-add (not .ptab-add-btn) */
-.proj-tabs, .proj-tabs-bar { display: flex; align-items: center; background: var(--surface); border-bottom: 1px solid var(--line); padding: 0 8px 0 0; flex-shrink: 0; overflow-x: auto; }
+.proj-tabs, .proj-tabs-bar { display: flex; align-items: center; background: var(--surface); border-bottom: 1px solid var(--line); padding: 0 8px 0 0; flex-shrink: 0; overflow: hidden; }
+#proj-tab-list { display: flex; align-items: center; min-width: 0; flex: 1 1 auto; overflow-x: auto; overflow-y: hidden; white-space: nowrap; }
 .ptab { padding: 9px 16px; font-size: 13px; font-weight: 500; color: var(--muted); border: none; background: none; cursor: pointer; border-bottom: 2px solid transparent; white-space: nowrap; flex-shrink: 0; margin-bottom: -1px; }
 .ptab.on { color: var(--text); border-bottom-color: var(--text); font-weight: 600; }
 .ptab:hover { color: var(--text); }