fraim-hub 2.0.322 → 2.0.323

package/dist/src/ai-hub/conversation-search-projection.js

@@ -11,6 +11,7 @@ exports.searchProjectionDirPath = searchProjectionDirPath;
 exports.searchProjectionFileName = searchProjectionFileName;
 exports.searchProjectionEntryPath = searchProjectionEntryPath;
 exports.writeConversationSearchEntry = writeConversationSearchEntry;
+exports.deleteConversationSearchEntry = deleteConversationSearchEntry;
 exports.readConversationSearchEntries = readConversationSearchEntries;
 exports.pruneConversationSearchEntries = pruneConversationSearchEntries;
 const crypto_1 = __importDefault(require("crypto"));
@@ -169,6 +170,14 @@ function writeConversationSearchEntry(bucketDir, conv) {
         /* the projection self-heals on the next read */
     }
 }
+/**
+ * Remove one derived search copy for an explicit conversation deletion.
+ * Unlike cache writes, this is deliberately not best-effort: a successful user-facing delete
+ * must not leave a searchable copy behind.
+ */
+function deleteConversationSearchEntry(bucketDir, conversationId) {
+    fs_1.default.rmSync(searchProjectionEntryPath(bucketDir, conversationId), { force: true });
+}
 function readConversationSearchEntries(bucketDir) {
     const dir = searchProjectionDirPath(bucketDir);
     let files;

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

@@ -917,6 +917,38 @@ class AiHubConversationStore {
             this.invalidateProjectPathCache();
         return state;
     }
+    /** Delete one authoritative conversation and every persistence-owned projection. */
+    deleteConversation(projectPath, conversationId) {
+        this.ensureMigrated();
+        const key = normalizeConversationKey(projectPath);
+        const bucketDir = this.bucketDir(key);
+        if (!fs_1.default.existsSync(bucketDir))
+            return { removed: false, activeId: null };
+        return (0, conversation_store_lock_1.withBucketLock)(this.lockPath(bucketDir), () => {
+            const index = this.loadIndex(bucketDir, key);
+            const conversationPath = this.convFilePath(bucketDir, conversationId);
+            const conversationExists = fs_1.default.existsSync(conversationPath);
+            const headers = index.headers.filter((header) => header.id !== conversationId);
+            const activeId = index.activeId === conversationId ? null : index.activeId;
+            // A stale projection/header can survive a prior interrupted whole-bucket write. Heal those
+            // derived copies even though the authoritative shard is already absent.
+            if (!conversationExists) {
+                (0, conversation_search_projection_1.deleteConversationSearchEntry)(bucketDir, conversationId);
+                if (headers.length !== index.headers.length || activeId !== index.activeId) {
+                    (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 2, bucketKey: key, activeId, headers });
+                }
+                return { removed: false, activeId };
+            }
+            // Search is a derived copy, but explicit deletion requires its removal to succeed before
+            // the authoritative shard is touched. Invalidate the derived index before shard removal so
+            // every crash point self-heals from the authoritative files.
+            (0, conversation_search_projection_1.deleteConversationSearchEntry)(bucketDir, conversationId);
+            fs_1.default.rmSync(this.indexPath(bucketDir), { force: true });
+            fs_1.default.rmSync(conversationPath, { force: true });
+            (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 2, bucketKey: key, activeId, headers });
+            return { removed: true, activeId };
+        });
+    }
     // Update the index header for one conversation and return the (header-shaped) project state.
     reindexAfterUpsert(bucketDir, bucketKey, conv, activeId) {
         const idx = this.loadIndex(bucketDir, bucketKey);
@@ -951,13 +983,13 @@ class AiHubConversationStore {
     indexConversationForSearch(bucketKey, conversationId) {
         const key = normalizeConversationKey(bucketKey);
         const bucketDir = this.bucketDir(key);
-        const conversation = this.loadConversation(key, conversationId);
-        if (!conversation)
-            return false;
-        (0, conversation_store_lock_1.withBucketLock)(this.lockPath(bucketDir), () => {
+        return (0, conversation_store_lock_1.withBucketLock)(this.lockPath(bucketDir), () => {
+            const conversation = this.loadConversation(key, conversationId);
+            if (!conversation)
+                return false;
             (0, conversation_search_projection_1.writeConversationSearchEntry)(bucketDir, conversation);
+            return true;
         });
-        return true;
     }
 }
 exports.AiHubConversationStore = AiHubConversationStore;

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

@@ -5864,6 +5864,26 @@ class AiHubServer {
                 return res.status(400).json({ error: error instanceof Error ? error.message : 'Could not persist conversation.' });
             }
         });
+        // Issue #1740: interactive run deletion is a bounded one-record mutation. It requires an
+        // explicit record-owned partition and never falls back to the currently selected project.
+        this.app.delete('/api/ai-hub/conversations/:conversationId', (req, res) => {
+            try {
+                const scope = scopeParam(req.query.scope);
+                if (!scope && (typeof req.query.projectPath !== 'string' || req.query.projectPath.trim().length === 0)) {
+                    return res.status(400).json({ error: 'projectPath required for project conversations' });
+                }
+                const key = scope
+                    ? (0, conversation_store_1.conversationScopeKey)(scope, '')
+                    : ensureDirectoryPath(req.query.projectPath);
+                const result = this.conversationStore.deleteConversation(key, req.params.conversationId);
+                if (!result.removed)
+                    return res.status(404).json({ error: 'Conversation not found.' });
+                return res.json(result);
+            }
+            catch (error) {
+                return res.status(400).json({ error: error instanceof Error ? error.message : 'Could not delete conversation.' });
+            }
+        });
         this.app.post('/api/ai-hub/conversations/:conversationId/switch-agent', (req, res) => {
             try {
                 const body = (req.body ?? {});
@@ -6598,9 +6618,6 @@ class AiHubServer {
                     });
                 }
                 const outcome = await installAgentAndRefreshDetection({ label: option.label, installPackage: option.installPackage, launchCommand: option.launchCommand }, systemPath, { runProcess: hubRunProcess, commandVersion: hubCommandVersion });
-                if (outcome.outcome === 'standard' && outcome.npmGlobalBinDirs.length > 0) {
-                    process.env.PATH = (0, managed_agent_paths_1.appendBinDirsToPath)(systemPath, outcome.npmGlobalBinDirs);
-                }
                 const mcp = await configureFraimForHubAgent(hubId);
                 if (!mcp.configured) {
                     console.warn(`[ai-hub] install-agent: FRAIM add-ide did not run for ${option.label} (${outcome.outcome} install): ${mcp.error || 'unknown reason'}`);

package/dist/src/cli/doctor/checks/agent-cli-health-checks.js

@@ -14,6 +14,7 @@ exports.checkAgentCliHealthByCommand = checkAgentCliHealthByCommand;
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const managed_agent_paths_1 = require("../../utils/managed-agent-paths");
+const machine_path_1 = require("../../utils/machine-path");
 const command_resolution_1 = require("../../mcp/command-resolution");
 // CLIs with a managed-install fallback (npm install -g into FRAIM's portable
 // Node when no system install is found). Add gemini/copilot here when their
@@ -57,18 +58,14 @@ function probeVersion(commandPath) {
 // shell already open before the fix landed still uses) — issue #1285's
 // exact "update said success but --version looked wrong" ambiguity.
 // Windows-only; there is no equivalent persisted-PATH registry on macOS/Linux.
+// Issue #1748: this used to shell out to PowerShell for HKCU Environment Path on its own,
+// a second independently-written Windows registry PATH reader. Two implementations of the
+// same read drift apart, and a parsing fix applied to one is easy to miss on the other,
+// which is the same PATH-resolution-drift bug class this check exists to report. Delegates
+// to the shared reader instead, which also covers HKLM rather than only the user hive and
+// expands REG_EXPAND_SZ references.
 function readPersistedUserPath() {
-    if (process.platform !== 'win32')
-        return null;
-    try {
-        const result = (0, child_process_1.spawnSync)('powershell', ['-NoProfile', '-NonInteractive', '-Command', "[Environment]::GetEnvironmentVariable('PATH','User')"], { encoding: 'utf8', timeout: 5000 });
-        if (result.status !== 0 || result.error)
-            return null;
-        return (result.stdout || '').trim() || null;
-    }
-    catch {
-        return null;
-    }
+    return (0, machine_path_1.resolveMachinePathCached)();
 }
 async function runAgentCliHealthCheck(cli) {
     // "Ambient" is this process's own raw, unmodified PATH — exactly what a
@@ -83,7 +80,16 @@ async function runAgentCliHealthCheck(cli) {
     // is system-PATH-first for launch purposes and would silently agree with
     // a stale ambient entry instead of surfacing the drift this check exists
     // to catch.
-    const ambientPath = (0, command_resolution_1.getSystemCommandPath)(cli.command);
+    // Issue #1748: process.env.PATH no longer carries FRAIM's managed bin dirs (the
+    // module-load mutation that put them there was the defect). Without a fallback,
+    // `ambientPath` is null whenever the only install is FRAIM-managed, and both clauses
+    // of `versionMismatch` below short-circuit on it, so this check would return
+    // "consistent" while the #1285 stale-shim drift it exists to catch went unreported.
+    // The machine PATH is what a newly opened shell resolves, which is the notion of
+    // "ambient" this check actually wants once the process is no longer self-mutating.
+    const machinePathForAmbient = (0, machine_path_1.resolveMachinePathCached)();
+    const ambientPath = (0, command_resolution_1.getSystemCommandPath)(cli.command)
+        || (machinePathForAmbient ? (0, command_resolution_1.getSystemCommandPath)(cli.command, machinePathForAmbient) : null);
     const managedSearchPath = (0, managed_agent_paths_1.buildPathWithManagedAgentBins)(process.env.PATH);
     const managedPath = (0, command_resolution_1.getSystemCommandPath)(cli.command, managedSearchPath);
     if (!ambientPath && !managedPath) {

package/dist/src/cli/mcp/command-resolution.js

@@ -87,8 +87,13 @@ const resolveManagedCommand = (command) => {
     // path and the status-check path. Fall back to the FRAIM-managed portable
     // copy only when no system install is found by either check. Last resort:
     // bare command name.
-    return (0, exports.getSystemCommandPath)(command)
-        || (0, exports.getSystemCommandPath)(command, (0, managed_agent_paths_1.buildRecoveredSystemPath)(process.env.PATH))
+    // Issue #1748: resolve ONLY against the recovered system PATH. The previous first tier
+    // scanned this process's ambient PATH, which carries FRAIM's own managed dirs (registered
+    // on the machine PATH at install, and formerly appended again at module load), so a
+    // FRAIM-managed binary was returned as if it were a system install and the tiers below
+    // never ran. buildRecoveredSystemPath() re-reads the machine PATH and excludes the managed
+    // dirs, so FRAIM's bundled copy is reachable only through the explicit tier below.
+    return (0, exports.getSystemCommandPath)(command, (0, managed_agent_paths_1.buildRecoveredSystemPath)(process.env.PATH))
         || (0, exports.getPortableManagedCommandPath)(command)
         || command;
 };

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

@@ -72,7 +72,7 @@ ${buildDeferredToolBootstrapSection(profile)}1. **Confirm FRAIM activation**:
    If local FRAIM job stubs are present in the workspace, inspect those first and match the request locally. Also inspect \`fraim/personalized-employee/jobs/\` for local overrides or repo-specific jobs. If local files are missing or you cannot inspect workspace files, call \`list_fraim_jobs()\` to view the full catalog, including any proxy-discoverable personalized jobs.
 
 3. **Find the match**:
-   If the user names an exact FRAIM job, call \`get_fraim_job({ job: "<job-name>" })\` directly. Otherwise, match the user's request to a FRAIM job from the local stub catalog, \`fraim/personalized-employee/jobs/\`, or the full \`list_fraim_jobs()\` response. If no exact or high-confidence job match exists, ask once: "No catalog job matches. Would you like to run this as an ad-hoc task?" On confirmation, call \`get_fraim_job({ job: "adhoc-prompt" })\` and execute it with the user's instructions as the task input — do not pick the nearest catalog job. Do not ask again if the user already provided instructions.
+   If the user names an exact FRAIM job, call \`get_fraim_job({ job: "<job-name>" })\` directly. Otherwise, match the user's request to a FRAIM job from the local stub catalog, \`fraim/personalized-employee/jobs/\`, or the full \`list_fraim_jobs()\` response. If no exact or high-confidence job match exists, call \`get_fraim_job({ job: "adhoc-prompt" })\` directly and execute it with the user's instructions as the task input — no confirmation question, and do not pick the nearest catalog job.
 
 4. **Load the full content**:
    - For jobs, call \`get_fraim_job({ job: "<matched-job-name>" })\`.

package/dist/src/cli/utils/machine-path.js

@@ -0,0 +1,165 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseRegQueryPathValue = parseRegQueryPathValue;
+exports.expandWindowsEnvRefs = expandWindowsEnvRefs;
+exports.composeMachinePath = composeMachinePath;
+exports.resolveMachinePathCached = resolveMachinePathCached;
+exports.clearMachinePathCache = clearMachinePathCache;
+exports.setMachinePathResolver = setMachinePathResolver;
+const path_1 = __importDefault(require("path"));
+const child_process_1 = require("child_process");
+// ─── Issue #1748: Windows machine-PATH recovery ─────────────────────────────
+//
+// A Windows process inherits its environment at creation and never observes later
+// registry changes (Node/Electron do not handle WM_SETTINGCHANGE). A Hub running for
+// hours therefore holds the PATH as of its launch. When a user installs an agent CLI
+// after that (Claude Code's native installer adding ~/.local/bin, say), the Hub cannot
+// see it while a freshly opened terminal can, so the Hub falls through to FRAIM's own
+// managed copy and runs a different CLI than the user installed and signed into.
+//
+// `defaultResolveLoginShellPath()` in managed-agent-paths.ts returns null on win32 (there
+// is no login-shell PATH concept there), so before this the only recovery on Windows was
+// the npm-prefix lookup: nothing re-read HKLM/HKCU. This module is the win32 counterpart
+// to that POSIX recovery. Ask the OS what the PATH is now, rather than trusting the
+// snapshot this process was handed.
+//
+// Lives in its own module rather than inside managed-agent-paths.ts so that file stays
+// under the 500-line architecture threshold, and because "read the OS environment" is a
+// distinct concern from "compose the PATH FRAIM resolves agents against". The dependency
+// runs one way only (managed-agent-paths imports this), so there is no import cycle.
+// Per-read ceiling. Both registry reads run sequentially (spawnSync is synchronous by
+// definition, so they cannot overlap without making the whole resolution path async,
+// which every caller is sync today), so the worst case is twice this. Measured cost is
+// ~25ms per read, so 2s is already ~80x headroom while bounding a pathological stall at
+// 4s rather than 10s.
+const MACHINE_PATH_TIMEOUT_MS = 2000;
+// The machine PATH changes when the user installs or moves a CLI, which is exactly the
+// case this issue exists to handle, so this cache must expire rather than live for the
+// life of the process. A Hub can run for days; a permanent cache would mean "install a
+// CLI, then use it" still required a restart. Bounded by a TTL rather than an explicit
+// invalidation call because the install that matters most is the one made OUTSIDE FRAIM
+// (a vendor installer adding ~/.local/bin), which FRAIM never observes and so cannot
+// invalidate on. Measured cost of a refresh on Windows is ~50ms for both registry reads,
+// far below the blocking-spawn budget issue #1010 set (the POSIX login-shell read it sits
+// beside costs 1-3s and is cached for the whole process).
+const MACHINE_PATH_CACHE_TTL_MS = 60_000;
+let machinePathResolverOverride = null;
+let cachedMachinePath;
+let cachedMachinePathAtMs = 0;
+// The two registry values Windows itself composes a process PATH from, in the order it
+// composes them: Machine first, then User.
+const WINDOWS_PATH_REGISTRY_KEYS = [
+    [String.raw `HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment`, 'Path'],
+    [String.raw `HKCU\Environment`, 'Path'],
+];
+// Resolve reg.exe by absolute path rather than letting the OS search PATH for it. This
+// module's whole purpose is to stop a PATH entry from deciding which binary FRAIM runs,
+// so invoking its own helper by bare name through that same untrusted PATH would undercut
+// the control it implements. Falls back to the bare name only if SystemRoot is unset,
+// which on a real Windows install it is not.
+function resolveRegExePath() {
+    const systemRoot = process.env.SystemRoot || process.env.SYSTEMROOT;
+    return systemRoot ? path_1.default.join(systemRoot, 'System32', 'reg.exe') : 'reg';
+}
+// `reg query` prints a line shaped like "    Path    REG_EXPAND_SZ    C:\foo;C:\bar".
+// Split on the value type rather than on whitespace, because a PATH entry may itself
+// contain spaces (C:\Program Files\...).
+function parseRegQueryPathValue(stdout) {
+    for (const line of (stdout || '').split(/\r?\n/)) {
+        const match = line.match(/\s+(?:REG_EXPAND_SZ|REG_SZ)\s+(.*)$/);
+        if (match && match[1] !== undefined) {
+            const value = match[1].trim();
+            if (value)
+                return value;
+        }
+    }
+    return null;
+}
+// REG_EXPAND_SZ keeps %VAR% references verbatim; Windows expands them when it builds a
+// process environment. Reading the raw value means expanding them here too, or an entry
+// like %USERPROFILE%\.local\bin never resolves. Unknown variables are left as written
+// rather than blanked, so a failed expansion cannot silently collapse an entry into a
+// different directory.
+function expandWindowsEnvRefs(value, env = process.env) {
+    return value.replace(/%([^%]+)%/g, (whole, name) => {
+        const key = Object.keys(env).find((k) => k.toLowerCase() === name.toLowerCase());
+        const resolved = key === undefined ? undefined : env[key];
+        return resolved === undefined ? whole : resolved;
+    });
+}
+// Composition is separated from the registry I/O so the ordering contract can be tested
+// without spawning reg.exe: Machine entries precede User entries, because that is the
+// order Windows itself composes a process PATH in, and %VAR% references are expanded
+// before splitting so an expanded value containing a delimiter still splits correctly.
+function composeMachinePath(rawValues, env = process.env) {
+    const parts = [];
+    for (const raw of rawValues) {
+        if (!raw)
+            continue;
+        for (const entry of expandWindowsEnvRefs(raw, env).split(path_1.default.delimiter)) {
+            const trimmed = entry.trim();
+            if (trimmed)
+                parts.push(trimmed);
+        }
+    }
+    // Not de-duplicated here: every consumer composes this through appendBinDirsToPath,
+    // which already collapses repeats. A second dedupe would be duplicated logic.
+    return parts.length > 0 ? parts.join(path_1.default.delimiter) : null;
+}
+function defaultResolveMachinePath() {
+    if (process.platform !== 'win32')
+        return null;
+    // Issue #1692 established that a sandboxed test run must never WRITE the real,
+    // registry-backed Windows User PATH. Reading it is the same isolation break in the
+    // other direction: it lets whatever agent CLIs happen to be installed on the build
+    // machine shadow a test's own isolated fixtures, which is the cross-contamination
+    // hazard already documented on resolveNpmGlobalBinDirsCached. Tests that need
+    // machine-PATH behavior inject it through __setMachinePathResolverForTests.
+    if (process.env.FRAIM_TEST_SANDBOX === '1')
+        return null;
+    const rawValues = WINDOWS_PATH_REGISTRY_KEYS.map(([key, valueName]) => {
+        const result = (0, child_process_1.spawnSync)(resolveRegExePath(), ['query', key, '/v', valueName], {
+            encoding: 'utf8',
+            timeout: MACHINE_PATH_TIMEOUT_MS,
+            windowsHide: true,
+        });
+        if (result.status !== 0 || result.error)
+            return null;
+        return parseRegQueryPathValue(result.stdout || '');
+    });
+    return composeMachinePath(rawValues);
+}
+function resolveMachinePathUncached() {
+    if (machinePathResolverOverride)
+        return machinePathResolverOverride();
+    return defaultResolveMachinePath();
+}
+/**
+ * The PATH the machine reports, read fresh instead of inherited, memoized for
+ * `MACHINE_PATH_CACHE_TTL_MS`. `nowMs` is injectable so a test can prove the entry expires
+ * without sleeping.
+ */
+function resolveMachinePathCached(nowMs = Date.now()) {
+    if (cachedMachinePath !== undefined && nowMs - cachedMachinePathAtMs < MACHINE_PATH_CACHE_TTL_MS) {
+        return cachedMachinePath;
+    }
+    try {
+        cachedMachinePath = resolveMachinePathUncached();
+    }
+    catch {
+        cachedMachinePath = null;
+    }
+    cachedMachinePathAtMs = nowMs;
+    return cachedMachinePath;
+}
+function clearMachinePathCache() {
+    cachedMachinePath = undefined;
+    cachedMachinePathAtMs = 0;
+}
+function setMachinePathResolver(resolver) {
+    machinePathResolverOverride = resolver;
+    clearMachinePathCache();
+}

package/dist/src/cli/utils/managed-agent-install.js

@@ -112,6 +112,11 @@ async function installManagedAgent(option, systemPath, deps) {
             NPM_CONFIG_PREFIX: undefined,
         });
         const standardVersion = deps.commandVersion(option.launchCommand, undefined, systemPath);
+        // Only look up npm global bin dirs when the CLI was NOT already runnable: that lookup
+        // is a blocking npm-prefix subprocess, and on the success path there is nothing to find.
+        // (Commit 16cea56ac made this unconditional so the caller could persist the directory onto
+        // process.env.PATH; issue #1748 removed that in-process PATH write, so the unconditional
+        // lookup has no consumer and only costs the happy path a blocking subprocess.)
         const npmGlobalBinDirs = standardVersion
             ? []
             : (0, managed_agent_paths_1.resolveNpmGlobalBinDirs)(systemPath, {
@@ -123,7 +128,7 @@ async function installManagedAgent(option, systemPath, deps) {
                 ? deps.commandVersion(option.launchCommand, npmGlobalBinDirs, systemPath)
                 : null);
         if (standardVersionWithNpmBin) {
-            return { outcome: 'standard', npmGlobalBinDirs };
+            return { outcome: 'standard' };
         }
         standardInstallError = `${option.label} standard install completed, but the CLI is not runnable from the user PATH.`;
     }

package/dist/src/cli/utils/managed-agent-paths.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveMachinePathCached = exports.expandWindowsEnvRefs = exports.parseRegQueryPathValue = void 0;
 exports.getManagedNodeRoot = getManagedNodeRoot;
 exports.getPortableNodeBinPath = getPortableNodeBinPath;
 exports.getManagedAgentBinDirs = getManagedAgentBinDirs;
@@ -13,10 +14,11 @@ exports.appendBinDirsToPath = appendBinDirsToPath;
 exports.getNpmGlobalBinDirsFromPrefix = getNpmGlobalBinDirsFromPrefix;
 exports.resolveNpmGlobalBinDirs = resolveNpmGlobalBinDirs;
 exports.buildPathWithManagedAgentBins = buildPathWithManagedAgentBins;
-exports.appendManagedAgentBinDirsToProcessPath = appendManagedAgentBinDirsToProcessPath;
 exports.__setLoginShellPathResolverForTests = __setLoginShellPathResolverForTests;
 exports.resolveLoginShellPathCached = resolveLoginShellPathCached;
 exports.__clearLoginShellPathCacheForTests = __clearLoginShellPathCacheForTests;
+exports.invalidateMachinePathCache = invalidateMachinePathCache;
+exports.__setMachinePathResolverForTests = __setMachinePathResolverForTests;
 exports.buildRecoveredSystemPath = buildRecoveredSystemPath;
 exports.buildRecoveredAgentPath = buildRecoveredAgentPath;
 exports.versionFromProbeOutput = versionFromProbeOutput;
@@ -24,6 +26,13 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const script_sync_utils_1 = require("./script-sync-utils");
+const machine_path_1 = require("./machine-path");
+// Re-exported so the machine-PATH surface stays reachable from this module, which is
+// where every other PATH helper already lives.
+var machine_path_2 = require("./machine-path");
+Object.defineProperty(exports, "parseRegQueryPathValue", { enumerable: true, get: function () { return machine_path_2.parseRegQueryPathValue; } });
+Object.defineProperty(exports, "expandWindowsEnvRefs", { enumerable: true, get: function () { return machine_path_2.expandWindowsEnvRefs; } });
+Object.defineProperty(exports, "resolveMachinePathCached", { enumerable: true, get: function () { return machine_path_2.resolveMachinePathCached; } });
 function getManagedNodeRoot() {
     return path_1.default.join((0, script_sync_utils_1.getUserFraimDir)(), 'node');
 }
@@ -185,9 +194,6 @@ function resolveNpmGlobalBinDirs(basePath, env) {
 function buildPathWithManagedAgentBins(basePath) {
     return appendBinDirsToPath(stripManagedAgentBinDirsFromPath(basePath), getManagedAgentBinDirs());
 }
-function appendManagedAgentBinDirsToProcessPath() {
-    process.env.PATH = buildPathWithManagedAgentBins(process.env.PATH);
-}
 // ─── Issue #1256 (slice a): location-agnostic PATH recovery ─────────────────
 //
 // A Hub launched from Launchpad/Finder/a Windows shortcut inherits the OS's minimal
@@ -350,17 +356,55 @@ function resolveNpmGlobalBinDirsCached(basePath) {
 // — resolve against this path for the system-install check, then consult
 // `getPortableManagedCommandPath()` (never the flat dir) as an explicit,
 // separate fallback tier.
+// Issue #1748: the win32 machine-PATH read lives in ./machine-path so this file stays
+// under the 500-line architecture threshold. These wrappers exist because changing the
+// machine PATH also invalidates npm-global dirs, which are resolved against the PATH
+// derived from it and cached here. Callers get one call that keeps both caches coherent
+// rather than having to remember to clear a second one.
+function invalidateMachinePathCache() {
+    (0, machine_path_1.clearMachinePathCache)();
+    cachedNpmGlobalBinDirsForRecovery.clear();
+}
+function __setMachinePathResolverForTests(resolver) {
+    (0, machine_path_1.setMachinePathResolver)(resolver);
+    cachedNpmGlobalBinDirsForRecovery.clear();
+}
 function buildRecoveredSystemPath(basePath) {
     const withoutManaged = stripManagedAgentBinDirsFromPath(basePath);
-    const withoutProjectBins = stripProjectLocalNodeBinDirs(withoutManaged);
+    const inherited = stripProjectLocalNodeBinDirs(withoutManaged);
+    // Issue #1748 (win32 only): the PATH the machine reports right now. This process may
+    // predate the user's install, so its own inherited PATH is a stale copy of the same
+    // registry. Machine entries go FIRST, because entries present in both would otherwise
+    // keep their stale relative position and an entry existing only on the machine PATH
+    // would land last, which is how resolution picked a different install than the one a
+    // fresh terminal resolves.
+    //
+    // Deliberately NOT applied to the POSIX login-shell tier below, which keeps its
+    // original append semantics. The staleness this reorders around is a Windows
+    // registry-snapshot problem; on POSIX a GUI-launched process has a minimal inherited
+    // PATH that carries no competing entry to out-order, so appending already resolves it.
+    // Promoting login-shell entries above inherited ones there would let the login shell
+    // silently override a directory a wrapper deliberately prepended for that launch,
+    // which is the same class of "wrong binary launched" bug this change exists to fix.
+    const machinePath = process.platform === 'win32' ? (0, machine_path_1.resolveMachinePathCached)() : null;
+    const machineEntries = machinePath ? machinePath.split(path_1.default.delimiter).filter(Boolean) : [];
+    const withMachine = machineEntries.length > 0
+        ? appendBinDirsToPath(machineEntries.join(path_1.default.delimiter), inherited.split(path_1.default.delimiter).filter(Boolean))
+        : inherited;
     const loginShellPath = resolveLoginShellPathCached();
     const loginShellEntries = loginShellPath ? loginShellPath.split(path_1.default.delimiter).filter(Boolean) : [];
     const withLoginShell = loginShellEntries.length > 0
-        ? appendBinDirsToPath(withoutProjectBins, loginShellEntries)
-        : withoutProjectBins;
-    const withLoginShellClean = stripProjectLocalNodeBinDirs(withLoginShell);
-    const npmGlobalBinDirs = resolveNpmGlobalBinDirsCached(withLoginShellClean);
-    return appendBinDirsToPath(withLoginShellClean, npmGlobalBinDirs);
+        ? appendBinDirsToPath(withMachine, loginShellEntries)
+        : withMachine;
+    const cleaned = stripProjectLocalNodeBinDirs(withLoginShell);
+    // Strip managed dirs a second time. FRAIM registers its own directory on the machine
+    // PATH at install (persistShellPath), so the recovered PATH legitimately contains it,
+    // but this helper's contract is "what the real machine provides, excluding FRAIM's
+    // bundled copy" - which is what lets callers tell a user install apart from FRAIM's
+    // fallback. Without this the machine read would smuggle the managed dir back in.
+    const systemOnly = stripManagedAgentBinDirsFromPath(cleaned);
+    const npmGlobalBinDirs = resolveNpmGlobalBinDirsCached(systemOnly);
+    return appendBinDirsToPath(systemOnly, npmGlobalBinDirs);
 }
 function buildRecoveredAgentPath(basePath) {
     return appendBinDirsToPath(buildRecoveredSystemPath(basePath), getManagedAgentBinDirs());

package/dist/src/first-run/session-service.js

@@ -89,11 +89,18 @@ function ensureOutputDirs() {
     fs_1.default.mkdirSync((0, script_sync_utils_1.getUserFraimDir)(), { recursive: true });
     fs_1.default.mkdirSync(path_1.default.join((0, script_sync_utils_1.getUserFraimDir)(), 'last-install'), { recursive: true });
 }
-// Append the portable Node bin dir to process PATH once at module load so
-// every spawnSync call (detection, login probe, change-agent) finds binaries
-// installed there without shadowing user/system installs.
+// Issue #1748: this no longer touches process.env.PATH. It used to append FRAIM's
+// managed bin dirs here so spawnSync callers would find them, but desktop-main imports
+// this module, so every Hub inherited them and command resolution could no longer tell
+// a user install from FRAIM's bundled copy. Anything that needs to find a managed
+// binary must route through buildRecoveredAgentPath()/resolveManagedCommand() rather
+// than relying on ambient process.env.PATH. What remains here is shim cleanup only.
 (function bootstrapFraimNodeBin() {
-    (0, managed_agent_paths_1.appendManagedAgentBinDirsToProcessPath)();
+    // Issue #1748: this used to call appendManagedAgentBinDirsToProcessPath(), putting FRAIM's
+    // managed dirs on this process's own PATH. desktop-main imports this module, so every Hub
+    // inherited that, and command resolution could no longer tell a user install from FRAIM's
+    // bundled copy. Resolution now re-reads the machine PATH instead, and FRAIM's directory is
+    // reachable there because persistShellPath registers it with the OS at install time.
     // Issue #1285 (Implementation Strategy §3): remove any managed-agent shim
     // orphaned in the legacy flat directory by an older FRAIM version, so it
     // can no longer shadow the current versioned build.
@@ -914,9 +921,6 @@ class FirstRunSessionService {
             });
             const pathWithNpm = (0, managed_agent_paths_1.appendBinDirsToPath)(systemPath, [npm.binDir]);
             const outcome = await (0, managed_agent_install_1.installManagedAgent)({ label: option.label, installPackage: option.installPackage, launchCommand: option.launchCommand }, pathWithNpm, { runProcess, commandVersion });
-            if (outcome.outcome === 'standard' && outcome.npmGlobalBinDirs.length > 0) {
-                process.env.PATH = (0, managed_agent_paths_1.appendBinDirsToPath)(pathWithNpm, outcome.npmGlobalBinDirs);
-            }
             this.setAgentInstallStatus(agentId, 'needs-sign-in', `Sign in to ${option.label} to activate it.`);
             appendInstallLog(outcome.outcome === 'standard' ? `agent-installed-standard ${agentId}` : `agent-installed-managed ${agentId}`);
             this.persist();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.322",
+  "version": "2.0.323",
   "description": "FRAIM Hub local companion package.",
   "author": "Sid Mathur <sid.mathur@gmail.com>",
   "homepage": "https://github.com/mathursrus/FRAIM#readme",
@@ -46,6 +46,7 @@
     "dist/src/cli/setup/provider-prompts.js",
     "dist/src/cli/setup/user-level-sync.js",
     "dist/src/cli/utils/local-folder-sync.js",
+    "dist/src/cli/utils/machine-path.js",
     "dist/src/cli/utils/managed-agent-install.js",
     "dist/src/cli/utils/managed-agent-paths.js",
     "dist/src/cli/utils/managed-node-runtime.js",
@@ -212,7 +213,7 @@
     "electron-updater": "^6.8.9",
     "express": "^5.2.1",
     "extract-zip": "^2.0.1",
-    "fraim": "2.0.322",
+    "fraim": "2.0.323",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",

package/public/ai-hub/index.html

@@ -592,9 +592,11 @@
               <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>
-              <div class="quick-coach-row composer-coach-actions" id="quick-coach-btns" 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-active="Coach this run, or type new instructions..." data-placeholder-armed="Now type what you want done..."></textarea>
+              <div class="composer-footer">
+                <button class="attach-btn" type="button" id="attach-btn" aria-label="Attach a file or screenshot" title="Attach a file or screenshot">&#128206;</button>
+                <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">
@@ -663,13 +665,13 @@
                       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>
+                </div>
+                <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>
             <div class="composer-hint" id="composer-hint">Attach or paste a screenshot, log, or PDF, up to 10&nbsp;MB each.</div>
             <div class="coach-note" id="coach-note"></div>
@@ -698,40 +700,8 @@
        is retired. Job browsing moves to the inline #composer-suggestions
        list; instructions move to the persistent composer's #coach-text.
        hire-notice is superseded by the non-blocking #hire-strip (#540).
-       The real secondary options step2 carried - the A/B compare toggle and
-       the Word document-context card - are not dropped: they moved into
-       #composer-options below, an always-reachable floating "Options" toggle
-       pinned near the composer (fixed-positioned, since this div is declared
-       far from #persistent-composer in the DOM), keeping their exact
-       ids/markup so the code that populates and reads them is unchanged.
-       Manager decision (2026-09-14, PR #1660 review round 5): Teach a new
-       job (#teach-btn) is out of this composer's scope entirely - it opens
-       its own #teach-job-modal dialog below, unrelated to #persistent-
-       composer/#composer-options. Picking an agent to run a Delegate Job
-       with is the inline "Run with:" pills' (#cp-agent-picker) job; installing
-       a missing one is the composer's own #cp-agent-install-panel "Go to
-       Manager -> AI Agents" link's job. Options carries no agent-tool
-       picker of its own. -->
-  <div id="composer-options">
-    <button type="button" class="ghost composer-options-toggle" id="composer-options-toggle" aria-expanded="false" aria-controls="composer-options-body">Options</button>
-    <div id="composer-options-body" hidden>
-      <div id="word-context-card" class="word-context-card" hidden>
-        <div class="word-ctx-card-header">
-          <span class="word-ctx-card-icon">📄</span>
-          <span class="word-ctx-card-label" id="word-ctx-card-label">Document context</span>
-          <button type="button" class="word-ctx-card-toggle" id="word-ctx-card-toggle" aria-label="Expand document context">▸</button>
-        </div>
-        <div class="word-ctx-card-body" id="word-ctx-card-body" hidden></div>
-      </div>
-      <div id="ab-toggle-wrap" hidden>
-        <label class="ab-toggle-label">
-          <input type="checkbox" id="ab-toggle">
-          Compare with Direct mode (no FRAIM)
-        </label>
-        <p id="ab-toggle-explanation" hidden>FRAIM runs the job on the left. A direct session with no FRAIM framework runs on the right. Compare results side by side.</p>
-      </div>
-    </div>
-  </div>
+       Job selection and agent setup use the inline composer catalog.
+       Document context remains in the task-pane context bar. -->
 
   <!-- Issue #512: New-project flow (4-step modal) -->
   <div id="np-modal" class="np-overlay" role="dialog" aria-modal="true" aria-labelledby="np-title" hidden>

package/public/ai-hub/script.js

@@ -145,9 +145,7 @@ function gatherElements() {
     // job-search/job-catalog/job-pick-status/hire-notice*/job-persona-filter/
     // picked-name/picked-desc/instructions were all part of the retired
     // #modal (legacy 2-step "New job" dialog) - no longer in the DOM.
-    // Issue #1660 review round 3: employee-select/agent-install-panel (the
-    // #composer-options popover's own agent-tool picker + install nudge) were
-    // retired - no longer in the DOM (see index.html's #composer-options).
+    // Agent setup and selection use the inline composer controls.
     'cp-agent-install-panel', 'active-employee-select',
     // Issue #1292: "this conversation's agent is unavailable" notice.
     'active-agent-unavailable-note',
@@ -155,11 +153,10 @@ function gatherElements() {
     'tracker', 'tracker-rows', 'tracker-note',
     'totals',
     // Issue #442: A/B mode elements.
-    'ab-toggle-wrap', 'ab-direct-panel',
+    'ab-direct-panel',
     'ab-direct-totals', 'ab-direct-progress', 'ab-direct-send',
     // Issue #489: Word context elements.
     'word-context-bar', 'word-ctx-text', 'word-ctx-refresh',
-    'word-context-card', 'word-ctx-card-label', 'word-ctx-card-body', 'word-ctx-card-toggle',
     // Issue #512 S6: review experience (R7) + learnings (R9) + reverse mentoring (R10).
     'review-actions', 'review-approve', 'review-request-changes', 'review-handoff',
     // Issue #770: Deliverables panel (single-run artifact home).
@@ -598,7 +595,6 @@ function applyWordContext(ctx, partial) {
     state.wordContext = ctx || null;
   }
   renderWordContextBar();
-  renderWordContextInModal();
   renderTaskPaneLauncher();
 }
 
@@ -685,28 +681,6 @@ function renderWordContextBar() {
   }
 }
 
-function renderWordContextInModal() {
-  const card = els['word-context-card'];
-  const label = els['word-ctx-card-label'];
-  const body = els['word-ctx-card-body'];
-  if (!card || !label || !body) return;
-  const wc = state.wordContext;
-  if (!wc || (!wc.selection && !wc.bodyPreview && !wc.comments?.length)) {
-    card.hidden = true;
-    return;
-  }
-  card.hidden = false;
-  // Label line: "3 words selected · MyDoc" or "MyDoc · 1,234 words"
-  if (wc.selection) {
-    const words = wc.selection.split(/\s+/).filter(Boolean).length;
-    label.textContent = `${words} word${words !== 1 ? 's' : ''} selected${wc.docTitle ? ' · ' + wc.docTitle : ''}`;
-  } else {
-    label.textContent = (wc.docTitle || 'Document') + (wc.wordCount ? ` · ${wc.wordCount} words` : '');
-  }
-  // Body: shows block that will be sent to the agent
-  body.textContent = buildWordContextBlock(wc);
-}
-
 function isTaskPaneSurface() {
   return document.body.dataset.surface === 'task-pane' || document.body.dataset.surface === 'extension';
 }
@@ -2332,8 +2306,19 @@ function newConversationId() {
 // #533 R6: remove a run from the Hub. This is a Hub-local projection delete — it
 // drops the conversation from state + localStorage and clears any pointer to it.
 // It never touches artifacts the employee wrote to disk (the confirm copy says so).
-function deleteConversation(id) {
+async function deleteConversation(id) {
   if (!id) return false;
+  const target = findConversation(id);
+  if (!target) return false;
+  const params = conversationLookupParams(target, target.projectPath);
+  try {
+    await requestJson(`/api/ai-hub/conversations/${encodeURIComponent(id)}?${params.toString()}`, {
+      method: 'DELETE',
+    });
+  } catch (error) {
+    showStatus(error instanceof Error ? error.message : String(error), true);
+    return false;
+  }
   let removed = false;
   for (const key of Object.keys(state.conversations || {})) {
     const list = state.conversations[key] || [];
@@ -2354,7 +2339,6 @@ function deleteConversation(id) {
       if (tfLearningRunByScope[sc] && tfLearningRunByScope[sc].id === id) tfLearningRunByScope[sc] = null;
     }
   }
-  persistConversations();
   if (typeof refreshStatusSurfaces === 'function') refreshStatusSurfaces();
   if (typeof renderActive === 'function') renderActive();
   if (typeof showStatus === 'function') showStatus('Run deleted.', false);
@@ -2394,7 +2378,19 @@ function tfBuildRunDeleteConfirm(conv) {
   msg.textContent = 'Delete "' + title + '"? This removes it from the Hub. The run’s artifacts on disk are untouched.';
   const row = document.createElement('div'); row.className = 'dc-row';
   const del = document.createElement('button'); del.className = 'dc-del'; del.type = 'button'; del.textContent = 'Delete run';
-  del.addEventListener('click', (e) => { e.stopPropagation(); state.pendingRunDeleteId = null; box.remove(); deleteConversation(conv.id); });
+  del.addEventListener('click', async (e) => {
+    e.stopPropagation();
+    del.disabled = true;
+    del.textContent = 'Deleting...';
+    const removed = await deleteConversation(conv.id);
+    if (removed) {
+      state.pendingRunDeleteId = null;
+      box.remove();
+      return;
+    }
+    del.disabled = false;
+    del.textContent = 'Delete run';
+  });
   const cancel = document.createElement('button'); cancel.className = 'dc-cancel'; cancel.type = 'button'; cancel.textContent = 'Cancel';
   cancel.addEventListener('click', (e) => { e.stopPropagation(); state.pendingRunDeleteId = null; box.remove(); });
   row.appendChild(del); row.appendChild(cancel);
@@ -5345,55 +5341,40 @@ function positionCoachDropdown(dropdown, btn) {
   if (!dropdown || !btn || dropdown.hidden) return;
   const margin = 6;
   const viewportPad = 8;
+  const visualViewport = window.visualViewport;
+  const viewportLeft = visualViewport ? visualViewport.offsetLeft : 0;
+  const viewportTop = visualViewport ? visualViewport.offsetTop : 0;
+  const viewportWidth = visualViewport ? visualViewport.width : window.innerWidth;
+  const viewportHeight = visualViewport ? visualViewport.height : window.innerHeight;
+  const viewportRight = viewportLeft + viewportWidth;
+  const viewportBottom = viewportTop + viewportHeight;
   ensureCoachDropdownPortal(dropdown);
   const rect = btn.getBoundingClientRect();
   const minWidth = Math.max(200, Math.ceil(rect.width));
   dropdown.style.minWidth = minWidth + 'px';
-  dropdown.style.maxWidth = Math.max(220, window.innerWidth - viewportPad * 2) + 'px';
-  dropdown.style.maxHeight = '';
+  dropdown.style.maxWidth = Math.max(minWidth, viewportWidth - viewportPad * 2) + 'px';
+  dropdown.style.maxHeight = Math.max(1, viewportHeight - viewportPad * 2) + 'px';
   dropdown.style.visibility = 'hidden';
   dropdown.style.transform = 'none';
   const menuRect = dropdown.getBoundingClientRect();
   const menuWidth = Math.max(menuRect.width, minWidth);
   const menuHeight = menuRect.height || 160;
-  const viewportMaxLeft = Math.max(viewportPad, window.innerWidth - menuWidth - viewportPad);
-  const wouldOverflowRight = rect.left + menuWidth > window.innerWidth - viewportPad;
+  const viewportMinLeft = viewportLeft + viewportPad;
+  const viewportMaxLeft = Math.max(viewportMinLeft, viewportRight - menuWidth - viewportPad);
+  const wouldOverflowRight = rect.left + menuWidth > viewportRight - viewportPad;
   const idealLeft = wouldOverflowRight ? rect.right - menuWidth : rect.left;
-  const left = Math.min(Math.max(viewportPad, idealLeft), viewportMaxLeft);
-  const availableBelow = Math.max(0, window.innerHeight - rect.bottom - margin - viewportPad);
-  const availableAbove = Math.max(0, rect.top - margin - viewportPad);
-  const opensBelow = availableBelow >= Math.min(menuHeight, 160) || availableBelow >= availableAbove;
-  const availableSpace = opensBelow ? availableBelow : availableAbove;
+  const left = Math.min(Math.max(viewportMinLeft, idealLeft), viewportMaxLeft);
+  const availableBelow = Math.max(0, viewportBottom - rect.bottom - margin - viewportPad);
+  const availableAbove = Math.max(0, rect.top - viewportTop - margin - viewportPad);
+  const opensAbove = availableAbove >= menuHeight || (availableBelow < menuHeight && availableAbove >= availableBelow);
+  const availableSpace = opensAbove ? availableAbove : availableBelow;
   const renderedHeight = Math.min(menuHeight, availableSpace || menuHeight);
-  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);
-    }
-  }
+  const top = opensAbove
+    ? Math.max(viewportTop + viewportPad, rect.top - renderedHeight - margin)
+    : Math.min(rect.bottom + margin, viewportBottom - renderedHeight - viewportPad);
   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';
+  dropdown.style.maxHeight = Math.max(1, Math.floor(availableSpace || (viewportHeight - viewportPad * 2))) + 'px';
   dropdown.style.visibility = '';
 }
 
@@ -6084,7 +6065,33 @@ function attachmentUrlFor(conv, attachmentId) {
   return `/api/ai-hub/conversations/${encodeURIComponent(conv.id)}/attachments/${encodeURIComponent(attachmentId)}?${params.toString()}`;
 }
 
+const COMPOSER_MIN_HEIGHT = 54;
+const COMPOSER_MAX_HEIGHT = 360;
+const COMPOSER_VIEWPORT_RATIO = 0.45;
+
+function composerVisibleViewportHeight() {
+  return window.visualViewport && window.visualViewport.height
+    ? window.visualViewport.height
+    : window.innerHeight;
+}
+
+function resizeComposerTextarea() {
+  const textarea = els['coach-text'] || document.getElementById('coach-text');
+  if (!textarea) return;
+  const cap = Math.max(
+    COMPOSER_MIN_HEIGHT,
+    Math.min(COMPOSER_MAX_HEIGHT, composerVisibleViewportHeight() * COMPOSER_VIEWPORT_RATIO)
+  );
+  textarea.style.height = '0px';
+  const contentHeight = textarea.scrollHeight;
+  const height = Math.max(COMPOSER_MIN_HEIGHT, Math.min(contentHeight, cap));
+  textarea.style.height = Math.ceil(height) + 'px';
+  textarea.style.overflowY = contentHeight > height + 1 ? 'auto' : 'hidden';
+  positionOpenCoachDropdowns();
+}
+
 function syncSendButton() {
+  resizeComposerTextarea();
   const conv = activeConversation();
   const hasText = els['coach-text'].value.trim().length > 0;
   if (isManagedDelegationChild(conv)) {
@@ -8165,7 +8172,6 @@ function renderCpAgentPicker() {
       pill.addEventListener('click', () => {
         state.cpEmployee = e.id;
         renderCpAgentPicker();
-        updateAbToggleVisibility();
       });
     }
     picker.appendChild(pill);
@@ -8381,18 +8387,6 @@ function showRerunToast(msg) {
 // job browsing is now the always-inline composer-suggestions list
 // (renderCpRows/buildCpRow), which every catalog job already flows through.
 
-function updateAbToggleVisibility() {
-  const wrap = els['ab-toggle-wrap'];
-  if (!wrap) return;
-  // Issue #1657 Treatment 3: state.cpEmployee (the inline "Run with:" pills)
-  // is the only picker now (the #composer-options popover's own agent-tool
-  // select was removed per PR #1660 review round 3 - see index.html; Teach
-  // is out of this composer entirely as of round 5).
-  const empId = baseHostIdForAgent(state.cpEmployee || state.selectedEmployeeId || 'claude');
-  const emp = (state.bootstrap && state.bootstrap.employees || []).find(e => e.id === empId);
-  wrap.hidden = !(emp && emp.supportsRaw);
-}
-
 function hubEmployees() {
   return state.bootstrap?.employees || [];
 }
@@ -8660,7 +8654,6 @@ async function refreshEmployees() {
     const bootstrap = await requestJson(`/api/ai-hub/bootstrap?projectPath=${encodeURIComponent(state.projectPath)}`);
     applyBootstrap(bootstrap);
     renderCpAgentPicker();
-    updateAbToggleVisibility();
     // Issue #1256 (slice b): re-render the install panel + status cards too, not just the
     // employee picker, so a stale-roster correction (or a manual re-check) is visible
     // everywhere the roster is shown, not only in the picker this function originally served.
@@ -8731,9 +8724,6 @@ async function startRun(job, instructions, employeeId, preassignedConvId, invoke
   // looking at. stubPath resolution and FRAIM invocation are now server-side.
   const effectiveInstructions = await withWordContext(instructions);
 
-  // Issue #442: read the A/B toggle state from the modal before it closes.
-  const abToggle = document.getElementById('ab-toggle');
-  const isAB = !isFreeform && abToggle && abToggle.checked;
   const assignedPersonaKey = assignedPersonaKeyForJob(job);
   const assignedPersona = assignedPersonaKey && assignedPersonaKey.startsWith('custom:')
     ? (typeof tfPersonaByKey === 'function' ? tfPersonaByKey(assignedPersonaKey) : null)
@@ -8769,8 +8759,7 @@ async function startRun(job, instructions, employeeId, preassignedConvId, invoke
     artifacts: [],
     createdAt: startedAt,
     lastUpdatedAt: startedAt,
-    // Issue #442: A/B mode fields (only set when toggle was on).
-    compareMode: isAB ? 'ab' : undefined,
+    // Historical comparison fields retained for shared conversation rendering.
     compareRunId: null,
     compareRun: null,
     // Issue #489: capture selection state at job-start so write-back knows insert-after vs append.
@@ -8812,7 +8801,6 @@ async function startRun(job, instructions, employeeId, preassignedConvId, invoke
         conversationId: conv.id,
         conversationTitle: conv.title,
         instructions: effectiveInstructions,
-        ...(isAB ? { compareMode: 'ab', directInstructions: effectiveInstructions } : {}),
         // Issue #1657 R7/R9: attachments staged in the palette/ad-hoc/Teach/
         // task-pane composer, already uploaded against `conv.id` by the
         // caller before this request.
@@ -10206,41 +10194,12 @@ function wireEvents() {
     });
   }
 
-  // Issue #442: keep A/B toggle visible only when the selected employee supports
-  // direct-path invocation (supportsRaw). Also wire the explanation paragraph.
-  // Issue #1660 review round 5: the inline "Run with:" pills (#cp-agent-picker)
-  // are the only agent picker now - see their own click handler in
-  // renderCpAgentPicker for where state.cpEmployee/updateAbToggleVisibility
-  // are kept live. Teach is out of this composer entirely.
+  // The inline agent picker owns agent selection; clearing the armed job
+  // returns this composer to its catalog.
   const armedJobClearBtn = document.getElementById('cp-armed-job-clear');
   if (armedJobClearBtn) {
     armedJobClearBtn.addEventListener('click', () => clearArmedJob());
   }
-  const composerOptionsToggle = document.getElementById('composer-options-toggle');
-  const composerOptionsBody = document.getElementById('composer-options-body');
-  const composerOptions = document.getElementById('composer-options');
-  if (composerOptions) document.getElementById('persistent-composer')?.appendChild(composerOptions);
-  if (composerOptionsToggle && composerOptionsBody) {
-    composerOptionsToggle.addEventListener('click', () => {
-      const expanded = composerOptionsBody.hidden;
-      composerOptionsBody.hidden = !expanded;
-      composerOptionsToggle.setAttribute('aria-expanded', String(expanded));
-      // PR #1660 review round 3: Options no longer carries its own agent-tool
-      // picker (see index.html) - refresh only the A/B toggle's visibility,
-      // which depends on the inline "Run with:" pills' live selection.
-      if (expanded) updateAbToggleVisibility();
-    });
-  }
-  const abToggleCheckbox = document.getElementById('ab-toggle');
-  if (abToggleCheckbox) {
-    abToggleCheckbox.addEventListener('change', () => {
-      const exp = document.getElementById('ab-toggle-explanation');
-      if (exp) exp.hidden = !abToggleCheckbox.checked;
-      // R1.3: Start button label changes to "Start A/B test" when toggle is on.
-      if (els['start']) els['start'].textContent = abToggleCheckbox.checked ? 'Start A/B test' : 'Start';
-    });
-  }
-
   // Issue #442: Direct panel send button.
   const abDirectInput = document.getElementById('ab-direct-input');
   if (abDirectInput && els['ab-direct-send']) {
@@ -10348,7 +10307,21 @@ function wireEvents() {
     const inDropdown = e.target.closest('.coach-dropdown, .coach-dropdown-menu');
     if (!inDropdown) closeAllCoachDropdowns();
   });
-  window.addEventListener('resize', positionOpenCoachDropdowns);
+  window.addEventListener('resize', resizeComposerTextarea);
+  if (window.visualViewport) {
+    window.visualViewport.addEventListener('resize', resizeComposerTextarea);
+    window.visualViewport.addEventListener('scroll', positionOpenCoachDropdowns);
+  }
+  const composerInput = document.querySelector('#persistent-composer .coach-input');
+  if (composerInput && typeof ResizeObserver !== 'undefined') {
+    let observedComposerWidth = -1;
+    new ResizeObserver((entries) => {
+      const width = entries[0] ? entries[0].contentRect.width : composerInput.getBoundingClientRect().width;
+      if (Math.abs(width - observedComposerWidth) < 0.5) return;
+      observedComposerWidth = width;
+      resizeComposerTextarea();
+    }).observe(composerInput);
+  }
   document.addEventListener('scroll', positionOpenCoachDropdowns, true);
   // #937: the approve dropdown no longer auto-closes on the conversation poll, so
   // give it explicit dismissal. A click anywhere outside the combo closes it (the
@@ -10415,19 +10388,10 @@ function wireEvents() {
   if (els['word-ctx-refresh']) {
     els['word-ctx-refresh'].addEventListener('click', async () => {
       const fresh = await requestWordContext('get-context');
-      if (fresh) { state.wordContext = fresh; renderWordContextBar(); renderWordContextInModal(); }
-    });
-  }
-  // Word context card expand/collapse toggle.
-  if (els['word-ctx-card-toggle']) {
-    els['word-ctx-card-toggle'].addEventListener('click', () => {
-      const body = els['word-ctx-card-body'];
-      if (!body) return;
-      const expanded = !body.hidden;
-      body.hidden = expanded;
-      els['word-ctx-card-toggle'].textContent = expanded ? '▸' : '▾';
+      if (fresh) { state.wordContext = fresh; renderWordContextBar(); }
     });
   }
+
 }
 
 // ---------------------------------------------------------------------------

package/public/ai-hub/styles.css

@@ -3163,31 +3163,6 @@ button.small { padding: 4px 10px; font-size: 12px; }
 
 /* ── Issue #442: A/B Testing Mode ─────────────────────────────────────── */
 
-/* Modal step 2 — A/B toggle */
-#ab-toggle-wrap {
-  margin-top: 12px;
-  padding: 10px 12px;
-  background: var(--accent-soft);
-  border-radius: 8px;
-  border: 1px solid var(--line);
-}
-.ab-toggle-label {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  font-size: 13px;
-  font-weight: 500;
-  color: var(--text);
-  cursor: pointer;
-}
-.ab-toggle-label input[type="checkbox"] { cursor: pointer; }
-#ab-toggle-explanation {
-  margin: 8px 0 0;
-  font-size: 12px;
-  color: var(--muted);
-  line-height: 1.5;
-}
-
 /* Rail badge */
 .ab-badge {
   margin-left: auto;
@@ -3673,53 +3648,6 @@ body:is([data-surface="task-pane"],[data-surface="extension"]) .word-context-bar
 }
 .word-ctx-refresh:hover { color: var(--accent); }
 
-/* ── Word context card in step 2 modal ────────────────────────────────────── */
-.word-context-card {
-  border: 1px solid var(--border, rgba(0,0,0,0.10));
-  border-radius: 8px;
-  margin-top: 8px;
-  font-size: 12px;
-  overflow: hidden;
-}
-.word-ctx-card-header {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  padding: 7px 10px;
-  background: var(--surface, rgba(0,0,0,0.03));
-  cursor: default;
-}
-.word-ctx-card-label {
-  flex: 1;
-  font-weight: 600;
-  font-size: 11px;
-  color: var(--muted);
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.word-ctx-card-toggle {
-  background: none;
-  border: none;
-  color: var(--muted);
-  cursor: pointer;
-  font-size: 11px;
-  padding: 0 2px;
-  flex-shrink: 0;
-}
-.word-ctx-card-toggle:hover { color: var(--accent); }
-.word-ctx-card-body {
-  padding: 8px 10px;
-  color: var(--fg, #231e17);
-  font-size: 11px;
-  line-height: 1.5;
-  white-space: pre-wrap;
-  word-break: break-word;
-  max-height: 120px;
-  overflow-y: auto;
-  border-top: 1px solid var(--border, rgba(0,0,0,0.07));
-}
-
 /* ── Extension surface overrides (Chrome/browser extensions) ─────────────────
    Inherits all task-pane layout rules (via :is() above) but hides the
    project label since extensions work on web pages, not local project paths. */
@@ -4170,9 +4098,18 @@ body.hub-shell { display: flex; flex-direction: column; height: 100vh; overflow:
 .tree-job .tj-del:hover { color: var(--danger, #d2261f); border-color: var(--danger, #d2261f); }
 .del-confirm { margin: 8px 14px 4px; background: var(--surface); border: 1px solid var(--line);
   border-radius: 10px; padding: 10px 12px; font-size: 12px; color: var(--text); line-height: 1.5; }
-.del-confirm .dc-row { display: flex; gap: 8px; margin-top: 8px; }
+/* #1740: the confirm is rendered inside the ~175px employee rail. An unwrappable action
+   row makes the box's min-content width exceed the rail, which clipped Cancel and forced a
+   horizontal rail scrollbar. Wrapping the row lets the box shrink to the rail. */
+.del-confirm .dc-row { display: flex; flex-wrap: wrap; gap: 8px; margin-top: 8px; }
 .del-confirm button { font: inherit; font-size: 12px; border-radius: 7px; padding: 5px 12px; cursor: pointer; }
-.del-confirm .dc-del { background: var(--danger, #d2261f); color: #fff; border: none; }
+/* #1740: the in-flight label ("Deleting...") is a single unbreakable token while the idle
+   label ("Delete run") wraps to two lines. Without a stable box the control widened and the
+   confirm collapsed ~34px mid-click. Keep both labels on one line and reserve the width of
+   the wider of the two (measured 79.3px for "Delete run" at 12px/400) so the swap is inert.
+   The regression test asserts both the button and the confirm box are unchanged by it. */
+.del-confirm .dc-del { background: var(--danger, #d2261f); color: #fff; border: none;
+  min-width: 80px; white-space: nowrap; }
 .del-confirm .dc-del:disabled { opacity: .55; cursor: not-allowed; }
 .del-confirm .dc-cancel { background: var(--surface); border: 1px solid var(--line); color: var(--text); }
 .del-confirm .dc-detail { margin-top: 6px; color: var(--muted); }
@@ -6908,6 +6845,7 @@ img.eh-av { object-fit: cover; background: var(--surface); }
    siblings get flex:1 so whichever is visible fills the remaining height and
    pushes the composer to the true bottom edge. */
 #empty { flex: 1; min-height: 0; overflow-y: auto; }
+#conversation:has(> #persistent-composer) { padding-bottom: 8px; }
 #persistent-composer {
   flex-shrink: 0;
   display: flex;
@@ -6915,6 +6853,67 @@ img.eh-av { object-fit: cover; background: var(--surface); }
   position: relative;
 }
 
+/* Issue #1744: keep the draft and its controls in one bordered composer while
+   letting the text area size independently above the always-reachable footer. */
+#persistent-composer .coach-input {
+  border: 1px solid var(--line);
+  border-radius: 8px;
+  background: var(--surface);
+  overflow: visible;
+}
+#persistent-composer .coach-input:focus-within { border-color: var(--accent); }
+#persistent-composer .coach-input textarea {
+  min-height: 54px;
+  max-height: none;
+  height: 54px;
+  padding: 12px 16px;
+  border: 0;
+  border-radius: 8px 8px 0 0;
+  resize: none;
+  overflow-y: hidden;
+  line-height: 22px;
+  box-sizing: border-box;
+}
+#persistent-composer .composer-footer {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-height: 46px;
+  padding: 7px;
+  flex-wrap: wrap;
+}
+#persistent-composer .composer-footer .attach-btn,
+#persistent-composer .composer-footer .composer-coach-actions,
+#persistent-composer .composer-footer .composer-agent-row,
+#persistent-composer .composer-footer #send {
+  position: static;
+  inset: auto;
+  transform: none;
+}
+#persistent-composer .composer-footer .composer-coach-actions {
+  display: flex;
+  flex: 0 1 auto;
+  flex-wrap: wrap;
+  gap: 5px;
+  margin: 0;
+  overflow: visible;
+}
+#persistent-composer .composer-footer .composer-coach-actions[hidden] { display: none; }
+#persistent-composer .composer-footer .composer-agent-row {
+  display: flex;
+  min-width: 0;
+  max-width: 150px;
+  margin-left: auto;
+}
+#persistent-composer .composer-footer .composer-agent-row[hidden] { display: none; }
+#persistent-composer .composer-footer .composer-agent-row .employee-select.inline { max-width: 120px; }
+#persistent-composer .composer-footer #send { flex-shrink: 0; }
+
+@media (max-width: 650px) {
+  #persistent-composer .composer-footer { gap: 4px; }
+  #persistent-composer .composer-footer .composer-agent-row { margin-left: auto; }
+}
+
 /* Full-panel A/B split (#442) turns #conversation into a flex row so
    #active-conv/#ab-direct-panel sit side by side - but #persistent-composer
    is now a third child of #conversation (not nested in either pane) and must
@@ -6969,51 +6968,6 @@ img.eh-av { object-fit: cover; background: var(--surface); }
 .composer-suggestions[hidden] { display: none; }
 .cp-employee-footer[hidden] { display: none; }
 
-/* Composer options popover (word-context detail, Agent Tool select + CLI
-   install nudge, A/B compare toggle) - the real secondary controls #step2
-   used to carry, kept reachable from the composer without permanently
-   occupying the instruction input. Event setup places #composer-options in
-   the persistent composer's flow; the expanded panel opens above its button. */
-#composer-options {
-  position: relative;
-  align-self: flex-end;
-  margin-top: 4px;
-  z-index: var(--z-dropdown-menu);
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  gap: 8px;
-}
-body:has(.modal-overlay:not([hidden])) #composer-options { visibility: hidden; }
-.composer-options-toggle {
-  font-size: 12px;
-  font-weight: 600;
-  padding: 6px 14px;
-  border-radius: 20px;
-  background: var(--surface);
-  border: 1px solid var(--line);
-  color: var(--muted);
-  box-shadow: 0 2px 10px rgba(0,0,0,.10);
-  cursor: pointer;
-}
-.composer-options-toggle:hover { color: var(--text); background: var(--soft); }
-.composer-options-toggle[aria-expanded="true"] { color: var(--accent); border-color: var(--accent); }
-#composer-options-body {
-  position: absolute;
-  bottom: calc(100% + 8px);
-  right: 0;
-  width: 300px;
-  max-width: calc(100vw - 48px);
-  max-height: 60vh;
-  overflow-y: auto;
-  background: var(--surface);
-  border: 1px solid var(--line);
-  border-radius: 10px;
-  box-shadow: 0 10px 32px rgba(0,0,0,.18);
-  padding: 14px;
-}
-#composer-options-body[hidden] { display: none; }
-
 /* Issue #1657 post-launch fix: the armed-job chip shown while a catalog job
    is committed and the box is cleared for the manager to type instructions
    (see armSelectedJob in script.js). Sits directly above the input, in the