fraim-hub 2.0.231 → 2.0.233

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

@@ -58,10 +58,8 @@ function parseSeekMentoringSignal(line) {
         typeof obj.item === 'object' && obj.item !== null) {
         const item = obj.item;
         const itemType = item.type;
-        const tool = typeof item.tool === 'string' ? item.tool : null;
-        if (itemType === 'mcp_tool_call' &&
-            (tool === 'seekMentoring' || tool === 'mcp__fraim__seekMentoring')) {
-            const args = item.arguments;
+        if (itemType === 'mcp_tool_call' && isFraimTool(item.tool, 'seekMentoring')) {
+            const args = normalizeToolArgs(item.arguments) || undefined;
             const sig = extractSignalFromArgs(args);
             if (sig)
                 return sig;
@@ -82,13 +80,9 @@ function parseSeekMentoringSignal(line) {
             continue;
         const c = candidate;
         const isToolUse = c.type === 'tool_use' || c.type === 'function_call';
-        const nameField = typeof c.name === 'string' ? c.name : (typeof c.tool_name === 'string' ? c.tool_name : '');
-        const isSeekMentoring = nameField === 'seekMentoring' ||
-            nameField === 'mcp__fraim__seekMentoring' ||
-            nameField.endsWith('seekMentoring');
-        if (!isToolUse || !isSeekMentoring)
+        if (!isToolUse || !isFraimTool(readToolName(c), 'seekMentoring'))
             continue;
-        const input = (c.input || c.arguments || c.parameters);
+        const input = normalizeToolArgs(c.input || c.arguments || c.parameters) || undefined;
         const sig = extractSignalFromArgs(input);
         if (sig)
             return sig;
@@ -116,8 +110,7 @@ function parseFraimJobLoadSignal(line) {
     if ((obj.type === 'item.started' || obj.type === 'item.completed') &&
         typeof obj.item === 'object' && obj.item !== null) {
         const item = obj.item;
-        const tool = typeof item.tool === 'string' ? item.tool : '';
-        if (item.type === 'mcp_tool_call' && isGetFraimJobTool(tool)) {
+        if (item.type === 'mcp_tool_call' && isFraimTool(item.tool, 'get_fraim_job')) {
             const sig = readFraimJobFromArgs(item.arguments);
             if (sig)
                 return sig;
@@ -138,8 +131,7 @@ function parseFraimJobLoadSignal(line) {
             continue;
         const c = candidate;
         const isToolUse = c.type === 'tool_use' || c.type === 'function_call';
-        const nameField = typeof c.name === 'string' ? c.name : (typeof c.tool_name === 'string' ? c.tool_name : '');
-        if (!isToolUse || !isGetFraimJobTool(nameField))
+        if (!isToolUse || !isFraimTool(readToolName(c), 'get_fraim_job'))
             continue;
         const sig = readFraimJobFromArgs(c.input || c.arguments || c.parameters);
         if (sig)
@@ -276,8 +268,8 @@ function parseAgentIdentitySignal(line) {
     // Codex shape.
     if ((obj.type === 'item.started' || obj.type === 'item.completed') && typeof obj.item === 'object' && obj.item !== null) {
         const item = obj.item;
-        if (item.type === 'mcp_tool_call' && item.tool === 'fraim_connect') {
-            return readAgentFromArgs(item.arguments);
+        if (item.type === 'mcp_tool_call' && isFraimTool(item.tool, 'fraim_connect')) {
+            return readAgentFromArgs(normalizeToolArgs(item.arguments) || undefined);
         }
     }
     // Claude Code shape.
@@ -293,10 +285,9 @@ function parseAgentIdentitySignal(line) {
         const c = candidate;
         if (c.type !== 'tool_use' && c.type !== 'function_call')
             continue;
-        const name = typeof c.name === 'string' ? c.name : '';
-        if (!name.endsWith('fraim_connect'))
+        if (!isFraimTool(readToolName(c), 'fraim_connect'))
             continue;
-        const sig = readAgentFromArgs((c.input || c.arguments));
+        const sig = readAgentFromArgs(normalizeToolArgs(c.input || c.arguments || c.parameters) || undefined);
         if (sig)
             return sig;
     }
@@ -312,10 +303,31 @@ function readAgentFromArgs(args) {
         return null;
     return { agentName, agentModel };
 }
-function isGetFraimJobTool(toolName) {
-    return toolName === 'get_fraim_job' ||
-        toolName === 'mcp__fraim__get_fraim_job' ||
-        toolName.endsWith('get_fraim_job');
+function readToolName(candidate) {
+    if (typeof candidate.name === 'string')
+        return candidate.name;
+    if (typeof candidate.tool_name === 'string')
+        return candidate.tool_name;
+    if (typeof candidate.tool === 'string')
+        return candidate.tool;
+    if (typeof candidate.function === 'object' && candidate.function !== null) {
+        const fn = candidate.function;
+        if (typeof fn.name === 'string')
+            return fn.name;
+    }
+    return null;
+}
+function canonicalToolName(rawName) {
+    if (typeof rawName !== 'string')
+        return null;
+    const trimmed = rawName.trim();
+    if (!trimmed)
+        return null;
+    const byDoubleUnderscore = trimmed.split('__').filter(Boolean).pop() || trimmed;
+    return byDoubleUnderscore.split(/[./:]/).filter(Boolean).pop() || null;
+}
+function isFraimTool(rawName, canonicalName) {
+    return canonicalToolName(rawName) === canonicalName;
 }
 function readFraimJobFromArgs(rawArgs) {
     const args = normalizeToolArgs(rawArgs);

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

@@ -154,6 +154,14 @@ function getHubPersonaForJob(jobName) {
         return null;
     return getProtectedPersonaForHubJob(jobName) ?? DEFAULT_UNASSIGNED_PERSONA_KEY;
 }
+// Issue #991: consult custom employee records before falling back to the catalog.
+// Returns the key of the first custom employee whose jobIds array includes jobId,
+// or null if no custom employee owns it.
+function getCustomPersonaForJob(projectPath, jobId) {
+    const employees = (0, custom_employees_1.readCustomEmployees)(projectPath);
+    const match = employees.find((e) => Array.isArray(e.jobIds) && e.jobIds.includes(jobId));
+    return match ? match.key : null;
+}
 const FRAIM_INTERNAL_JOB_IDS = new Set([
     'contribute-to-fraim',
     'create-registry-asset',
@@ -1237,6 +1245,9 @@ async function configureFraimForHubAgent(hubId) {
     }
 }
 function hubCommandVersion(command, extraBinDirs, basePath) {
+    if (process.env.NODE_ENV === 'test' && process.env.FRAIM_TEST_HUB_COMMAND_VERSION_EMPTY === '1') {
+        return null;
+    }
     const executable = process.platform === 'win32' ? 'cmd.exe' : command;
     const args = process.platform === 'win32'
         ? ['/d', '/s', '/c', `${command} --version`]
@@ -1252,6 +1263,9 @@ function hubCommandVersion(command, extraBinDirs, basePath) {
     return raw || null;
 }
 function hubRunProcess(command, args, env) {
+    if (process.env.NODE_ENV === 'test' && command === 'npm' && process.env.FRAIM_TEST_HUB_NPM_ERROR) {
+        return Promise.reject(new Error(process.env.FRAIM_TEST_HUB_NPM_ERROR));
+    }
     return new Promise((resolve, reject) => {
         const [realCmd, realArgs] = process.platform === 'win32'
             ? ['cmd.exe', ['/d', '/s', '/c', command, ...args]]
@@ -2446,7 +2460,7 @@ class AiHubServer {
                 id: employeeJob.id,
                 title: employeeJob.title,
                 stubPath: employeeJob.stubPath,
-                personaKey: employeeJob.requiredPersonaKey ?? getHubPersonaForJob(employeeJob.id),
+                personaKey: employeeJob.requiredPersonaKey ?? getCustomPersonaForJob(projectPath, employeeJob.id) ?? getHubPersonaForJob(employeeJob.id),
             };
         }
         const managerTemplate = (0, catalog_1.discoverManagerTemplates)(projectPath).find((job) => job.id === jobId);

package/dist/src/cli/setup/ide-detector.js

@@ -76,6 +76,8 @@ const guiAppDetect = (configSurfaceCheck, appName, options = {}) => {
     };
 };
 const availableByVersionProbe = (command) => {
+    if (process.env.FRAIM_DETECT_DISABLE_CLI_PROBES === '1')
+        return false;
     const result = process.platform === 'win32'
         ? (0, child_process_1.spawnSync)('cmd.exe', ['/d', '/s', '/c', `${command} --version`], { encoding: 'utf8', timeout: 1500 })
         : (0, child_process_1.spawnSync)(command, ['--version'], { encoding: 'utf8', timeout: 1500 });

package/package.json

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

package/public/ai-hub/script.js

@@ -73,6 +73,8 @@ const state = {
   // the active employee; the user never sees the raw invocation syntax.
   pendingCoachingJobId: null,
   pendingCoachingLabel: null,
+  // Issue #989 R1-R6: area preserved when a next-job chip opens step-2 pre-filled.
+  pendingNextJobArea: null,
   conversationPersistTimer: null,
   conversationRefreshHandle: null,
   conversationDiskAvailable: true,
@@ -300,7 +302,11 @@ function tfRefreshPersonaDependentSurfaces() {
   else if (tf.area === 'brain') tfRenderBrain();
   if (tf.area === 'projects') {
     if (tf.projectView === 'overview') tfRenderOverview();
-    else tfRenderTree();
+    else {
+      tfRenderTree();
+      // tfRenderTree rebuilds tree chrome only; renderRail rebuilds per-employee accordion groups.
+      if (typeof renderRail === 'function') renderRail();
+    }
   }
 }
 
@@ -1664,7 +1670,7 @@ function renderRail() {
     titleSpan.className = 'conv-title';
     titleSpan.textContent = conv.title || '';
     bodyDiv.appendChild(titleSpan);
-    appendHubTimestamp(bodyDiv, conv.lastUpdatedAt, 'conv-time', 'Run last updated');
+    appendHubTimestamp(bodyDiv, conversationStartTimestamp(conv), 'conv-time', 'Job started');
     btn.appendChild(bodyDiv);
     // Issue #566 R7: mark runs of a personalized (taught/customized) job.
     if (isTaughtJob(conv.jobId)) {
@@ -4851,7 +4857,14 @@ function renderNextJobRecommendations(conv) {
           : conv.scope === 'company' ? 'company'
             : 'projects';
         const employeeId = conversationAgentName(conv) || (state.selectedEmployeeId) || 'claude';
-        startRun(job, instructions, employeeId, undefined, area);
+        // Issue #989 R1-R6: open step-2 with job pre-selected and instructions pre-filled
+        // so the manager can review/edit before starting, instead of calling startRun directly.
+        state.selectedJob = job;
+        state.selectedEmployeeId = employeeId;
+        state.pendingNextJobArea = area;
+        showStep2(job);
+        els['instructions'].value = instructions;
+        els['start'].disabled = instructions.trim().length === 0;
       });
     }
     chips.appendChild(btn);
@@ -6018,6 +6031,7 @@ function closeModal() {
   els['modal'].classList.remove('open');
   els['modal'].hidden = true;
   state.activeFilter = null;
+  state.pendingNextJobArea = null;
 }
 
 // Build the unified picker list. Employee jobs are organized by their
@@ -6707,7 +6721,15 @@ function foldRunIntoConversation(conv, run) {
   if (run.configuredAgentLabel) conv.configuredAgentLabel = run.configuredAgentLabel;
   if (run.baseHostId) conv.baseHostId = run.baseHostId;
   if (run.personaKey !== undefined) {
-    conv.personaKey = run.personaKey;
+    // Issue #991: do not let a server-side catalog/default key overwrite a custom:*
+    // key the client already holds. The client stamps custom:* at kickoff from the
+    // user's explicit action (cpPersonaOverride); the server resolves it via
+    // getCustomPersonaForJob, but the client guard is defense-in-depth.
+    const isClientCustom = conv.personaKey && conv.personaKey.startsWith('custom:');
+    const isServerCustom = run.personaKey && run.personaKey.startsWith('custom:');
+    if (!isClientCustom || isServerCustom) {
+      conv.personaKey = run.personaKey;
+    }
   }
   // Issue #347: keep the latest server snapshot under conv.run so the
   // tracker / totals renderers can read it without re-doing work. Stages,
@@ -7561,6 +7583,9 @@ function wireEvents() {
     if (!job || !text) return;
     const employeeId = els['employee-select'].value || state.selectedEmployeeId;
     state.selectedEmployeeId = employeeId;
+    // Issue #989 R4: consume pendingNextJobArea so the run lands in the right tab.
+    const invokedArea = state.pendingNextJobArea || undefined;
+    state.pendingNextJobArea = null;
     closeModal();
     // R2: if no project path is set, show the inline project picker instead.
     if (!state.projectPath) {
@@ -7574,7 +7599,7 @@ function wireEvents() {
       showHireStrip(job, pendingConvId, text, employeeId);
       return;
     }
-    await startRun(job, text, employeeId);
+    await startRun(job, text, employeeId, undefined, invokedArea);
   });
   els['job-search'].addEventListener('input', () => renderJobCatalog(els['job-search'].value));
   els['modal'].addEventListener('click', (e) => {
@@ -10486,7 +10511,7 @@ function tfBuildManagerRunItem(conv) {
   const body = document.createElement('span'); body.className = 'conv-body';
   const title = document.createElement('span'); title.className = 'conv-title';
   title.textContent = conv.title || conv.jobTitle || conv.jobId || 'Run';
-  body.appendChild(title); appendHubTimestamp(body, conv.lastUpdatedAt, 'conv-time', 'Run last updated'); btn.appendChild(body);
+  body.appendChild(title); appendHubTimestamp(body, conversationStartTimestamp(conv), 'conv-time', 'Job started'); btn.appendChild(body);
   const dotClass = conversationStateDotClass(conv);
   const dot = document.createElement('span'); dot.className = 'state-dot conv-state-dot dot-' + dotClass;
   if (typeof tfDotTitle === 'function') dot.title = tfDotTitle(dotClass);