fraim 2.0.169 → 2.0.171

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

@@ -59,6 +59,7 @@ const conversation_store_1 = require("./conversation-store");
 const managed_browser_1 = require("./managed-browser");
 const managed_agent_paths_1 = require("../cli/utils/managed-agent-paths");
 let personaHiringModule;
+let managerHiringModule;
 function loadPersonaHiringModule() {
     const cached = personaHiringModule;
     if (cached !== undefined) {
@@ -77,6 +78,24 @@ function loadPersonaHiringModule() {
         return null;
     }
 }
+function loadManagerHiringModule() {
+    const cached = managerHiringModule;
+    if (cached !== undefined) {
+        return cached;
+    }
+    try {
+        // Server deployments include the manager-hiring catalog. The npm client
+        // package intentionally does not, so Hub bootstrap must not require it.
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const loaded = require('../config/ai-manager-hiring');
+        managerHiringModule = loaded;
+        return loaded;
+    }
+    catch {
+        managerHiringModule = null;
+        return null;
+    }
+}
 function loadPersonaCapabilityModule() {
     try {
         // Server deployments include the persona catalog. The npm client package
@@ -101,6 +120,13 @@ function buildHubPersonaHireUrl(personaKey, hireMode = 'job') {
 function buildHubPersonaAvatarUrl(personaKey) {
     return loadPersonaHiringModule()?.buildPersonaAvatarUrl(personaKey) ?? '';
 }
+function buildHubManagerHiringCatalog() {
+    return loadManagerHiringModule()?.buildManagerHiringCatalog() ?? {
+        qualities: [],
+        services: [],
+        roles: {},
+    };
+}
 async function getHubWorkspacePersonaState(dbService, userId, apiKey) {
     try {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -1037,7 +1063,7 @@ class AiHubServer {
             // Issue #538 — source of truth for the "Hire a human manager" UI. Lazy-required
             // (not a top-level import) so the lightweight client CLI paths that import this
             // module for findAvailablePort do not eagerly load server-only config (repro #422).
-            managerHiring: require('../config/ai-manager-hiring').buildManagerHiringCatalog(),
+            managerHiring: buildHubManagerHiringCatalog(),
             // Issue #540: server-authoritative manager team (personas assigned by this manager).
             managerTeam,
         };

package/dist/src/cli/commands/add-ide.js

@@ -384,7 +384,7 @@ const runAddIDE = async (options) => {
         const detectedIDEs = (0, ide_detector_1.detectInstalledIDEs)();
         if (detectedIDEs.length === 0) {
             console.log(chalk_1.default.yellow('⚠️ No supported IDEs detected on your system.'));
-            console.log(chalk_1.default.gray('Supported IDEs: Claude, Claude Code, Antigravity, Gemini CLI, Kiro, Cursor, VSCode, Codex, Windsurf'));
+            console.log(chalk_1.default.gray('Supported IDEs: Claude, Claude Code, Antigravity, Gemini CLI, Kiro, Cursor, VSCode, Codex, Grok, Windsurf'));
             console.log(chalk_1.default.blue('\n💡 Install an IDE and run this command again.'));
             return;
         }
@@ -446,7 +446,7 @@ const runAddIDE = async (options) => {
 exports.runAddIDE = runAddIDE;
 exports.addIDECommand = new commander_1.Command('add-ide')
     .description('Add FRAIM configuration to additional IDEs')
-    .option('--ide <name>', 'Configure specific IDE (claude, claude-code, claude-desktop, claude-cowork, antigravity, gemini, gemini-cli, kiro, cursor, vscode, codex, windsurf)')
+    .option('--ide <name>', 'Configure specific IDE (claude, claude-code, claude-desktop, claude-cowork, antigravity, gemini, gemini-cli, kiro, cursor, vscode, codex, grok, windsurf)')
     .option('--all', 'Configure all detected IDEs')
     .option('--list', 'List all supported IDEs and their detection status')
     .action(exports.runAddIDE);

package/dist/src/cli/commands/setup.js

@@ -677,7 +677,7 @@ const runSetup = async (options) => {
             name: 'choice',
             message: 'How would you like to work with your AI employees?',
             choices: [
-                { title: 'In my IDE  (Claude Code, Cursor, or another AI tool)', value: 'ide' },
+                { title: 'In my IDE  (Claude Code, Cursor, Grok, or another AI tool)', value: 'ide' },
                 { title: 'In FRAIM Hub  (browser-based — no terminal needed)', value: 'hub' },
             ],
         });

package/dist/src/cli/doctor/checks/ide-config-checks.js

@@ -35,8 +35,8 @@ function checkIDEsDetected() {
             return {
                 status: 'warning',
                 message: 'No IDEs detected',
-                suggestion: 'Install Claude Desktop, Cursor, or another supported IDE',
-                details: { supportedIDEs: ['Claude Desktop', 'Cursor', 'Windsurf', 'VS Code', 'Zed', 'Codex'] }
+                suggestion: 'Install Claude Desktop, Cursor, Grok, or another supported IDE',
+                details: { supportedIDEs: ['Claude Desktop', 'Cursor', 'Windsurf', 'VS Code', 'Zed', 'Codex', 'Grok'] }
             };
         }
     };

package/dist/src/cli/mcp/ide-formats.js

@@ -2,7 +2,7 @@
 // IDE Format Adapters - transform logical server structure to IDE-specific formats
 // Uses the centralized registry to determine server types
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IDE_FORMATS = exports.CodexFormat = exports.WindsurfFormat = exports.ClaudeCodeFormat = exports.ClaudeFormat = exports.GeminiCliFormat = exports.VSCodeFormat = exports.KiroFormat = exports.StandardFormat = void 0;
+exports.IDE_FORMATS = exports.GrokFormat = exports.CodexFormat = exports.WindsurfFormat = exports.ClaudeCodeFormat = exports.ClaudeFormat = exports.GeminiCliFormat = exports.VSCodeFormat = exports.KiroFormat = exports.StandardFormat = void 0;
 exports.getIDEFormat = getIDEFormat;
 const mcp_server_registry_1 = require("./mcp-server-registry");
 const provider_registry_1 = require("../providers/provider-registry");
@@ -252,6 +252,13 @@ class CodexFormat {
     }
 }
 exports.CodexFormat = CodexFormat;
+class GrokFormat extends CodexFormat {
+    constructor() {
+        super(...arguments);
+        this.name = 'grok';
+    }
+}
+exports.GrokFormat = GrokFormat;
 // Format registry
 exports.IDE_FORMATS = {
     standard: new StandardFormat(),
@@ -261,7 +268,8 @@ exports.IDE_FORMATS = {
     claude: new ClaudeFormat(),
     'claude-code': new ClaudeCodeFormat(),
     windsurf: new WindsurfFormat(),
-    codex: new CodexFormat()
+    codex: new CodexFormat(),
+    grok: new GrokFormat()
 };
 function getIDEFormat(configType) {
     const format = exports.IDE_FORMATS[configType];

package/dist/src/cli/setup/auto-mcp-setup.js

@@ -187,7 +187,9 @@ const configureIDEMCP = async (ide, fraimKey, tokenInput, providerConfigs) => {
         }
         const newTomlContent = await (0, mcp_config_generator_1.generateMCPConfig)(ide.configType, fraimKey, tokens, providerConfigs);
         const { getAllMCPServerIds } = await Promise.resolve().then(() => __importStar(require('../mcp/mcp-server-registry')));
-        const serversToAdd = getAllMCPServerIds();
+        const baseServerIds = getAllMCPServerIds();
+        const providerServerIds = Object.keys(tokens).filter(id => tokens[id]);
+        const serversToAdd = [...baseServerIds, ...providerServerIds];
         const mergeResult = (0, mcp_config_generator_1.mergeTomlMCPServers)(existingTomlContent, newTomlContent, serversToAdd);
         fs_1.default.writeFileSync(configPath, mergeResult.content);
         mergeResult.addedServers.forEach(server => {
@@ -254,7 +256,7 @@ const autoConfigureMCP = async (fraimKey, tokenInput, selectedIDEs, providerConf
     const detectedIDEs = (0, ide_detector_1.detectInstalledIDEs)();
     if (detectedIDEs.length === 0 && (!selectedIDEs || selectedIDEs.length === 0)) {
         console.log(chalk_1.default.yellow('⚠️ No supported IDEs detected.'));
-        console.log(chalk_1.default.gray('Supported IDEs: Claude, Claude Code, Antigravity, Gemini CLI, Kiro, Cursor, VSCode, Codex, Windsurf'));
+        console.log(chalk_1.default.gray('Supported IDEs: Claude, Claude Code, Antigravity, Gemini CLI, Kiro, Cursor, VSCode, Codex, Grok, Windsurf'));
         console.log(chalk_1.default.blue('\n💡 You can install an IDE and run setup again later.'));
         console.log(chalk_1.default.gray('   Or continue with manual MCP configuration.'));
         if (process.env.FRAIM_NON_INTERACTIVE) {

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

@@ -79,6 +79,13 @@ const detectCodexSurface = () => {
     ];
     return checkMultiplePaths(paths);
 };
+const detectGrokSurface = () => {
+    const paths = [
+        '~/.grok',
+        '~/.grok/config.toml'
+    ];
+    return checkMultiplePaths(paths);
+};
 exports.IDE_CONFIGS = [
     {
         name: 'Claude Code',
@@ -180,6 +187,17 @@ exports.IDE_CONFIGS = [
         detectMethod: detectCodexSurface,
         description: 'Codex AI development environment'
     },
+    {
+        name: 'Grok',
+        configPath: '~/.grok/config.toml',
+        configFormat: 'toml',
+        configType: 'grok',
+        invocationProfile: 'grok-skill',
+        detectMethod: detectGrokSurface,
+        supportsConfigBootstrap: true,
+        aliases: ['grok', 'grok-cli', 'grok cli', 'grok build'],
+        description: 'xAI Grok Build CLI local settings'
+    },
     {
         name: 'Windsurf',
         configPath: '~/.codeium/windsurf/mcp_config.json',
@@ -219,6 +237,8 @@ const isDetectedForMode = (ide, mode) => {
                 return availableByVersionProbe('claude');
             case 'codex':
                 return availableByVersionProbe('codex');
+            case 'grok':
+                return availableByVersionProbe('grok');
             case 'gemini-cli':
                 return detectGeminiCli();
             default:

package/dist/src/cli/setup/ide-global-integration.js

@@ -35,7 +35,7 @@ function describeOnboardingInvocationSurfaces(installedIDEs) {
             return `${ide.name}: onboard this project`;
         if (profile === 'instructions-only')
             return `${ide.name}: "onboard this project"`;
-        // claude-slash, vscode-prompt, codex-skill, windsurf-command, kiro-hashtag, gemini-command
+        // claude-slash, vscode-prompt, codex-skill, grok-skill, windsurf-command, kiro-hashtag, gemini-command
         return `${ide.name}: /fraim onboard this project`;
     });
 }
@@ -55,7 +55,7 @@ async function installSlashCommands(homeDir) {
 }
 /**
  * Install FRAIM invocation artifacts for non-Claude IDEs.
- * Supports: Cursor, Codex, Gemini CLI, Windsurf, Kiro
+ * Supports: Cursor, Codex, Grok, Gemini CLI, Windsurf, Kiro
  * Does not overwrite existing files.
  */
 async function installGlobalRules(homeDir) {
@@ -68,6 +68,10 @@ async function installGlobalRules(homeDir) {
     if (fs_1.default.existsSync(codexDir)) {
         installFileIfMissing(path_1.default.join(codexDir, 'skills', 'fraim', 'SKILL.md'), (0, ide_invocation_surfaces_1.buildCodexSkillContent)(), 'Codex FRAIM skill (~/.codex/skills/fraim/SKILL.md)');
     }
+    const grokDir = path_1.default.join(home, '.grok');
+    if (fs_1.default.existsSync(grokDir)) {
+        installFileIfMissing(path_1.default.join(grokDir, 'skills', 'fraim', 'SKILL.md'), (0, ide_invocation_surfaces_1.buildGrokSkillContent)(), 'Grok FRAIM skill (~/.grok/skills/fraim/SKILL.md)');
+    }
     const geminiDir = path_1.default.join(home, '.gemini');
     if (fs_1.default.existsSync(geminiDir)) {
         installFileIfMissing(path_1.default.join(geminiDir, 'commands', 'fraim.toml'), (0, ide_invocation_surfaces_1.buildGeminiCommandContent)(), 'Gemini CLI FRAIM command (~/.gemini/commands/fraim.toml)');

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

@@ -7,6 +7,7 @@ exports.buildClaudeCommandShimContent = buildClaudeCommandShimContent;
 exports.buildClaudeSlashCommandContent = buildClaudeSlashCommandContent;
 exports.buildCursorMentionRuleContent = buildCursorMentionRuleContent;
 exports.buildCodexSkillContent = buildCodexSkillContent;
+exports.buildGrokSkillContent = buildGrokSkillContent;
 exports.buildWindsurfCommandContent = buildWindsurfCommandContent;
 exports.buildKiroCommandContent = buildKiroCommandContent;
 exports.buildAntigravityCommandContent = buildAntigravityCommandContent;
@@ -95,13 +96,18 @@ ${buildFraimInvocationBody('generic-tool-discovery')}
 `;
 }
 function buildCodexSkillContent() {
-    return `# FRAIM
-
+    return `# FRAIM
+
 ${buildFraimInvocationBody('codex-tool-search')}`;
 }
+function buildGrokSkillContent() {
+    return `# FRAIM
+
+${buildFraimInvocationBody('generic-tool-discovery')}`;
+}
 function buildWindsurfCommandContent() {
-    return `# FRAIM
-
+    return `# FRAIM
+
 ${buildFraimInvocationBody('generic-tool-discovery')}`;
 }
 function buildKiroCommandContent() {
@@ -139,6 +145,8 @@ function describeInvocationSurface(ideName, invocationProfile) {
             return `${ideName}: /fraim via workspace prompt`;
         case 'codex-skill':
             return `${ideName}: /fraim, $fraim`;
+        case 'grok-skill':
+            return `${ideName}: /fraim`;
         case 'windsurf-command':
             return `${ideName}: /fraim`;
         case 'kiro-hashtag':

package/dist/src/cli/setup/mcp-config-generator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateMCPConfig = exports.generateWindsurfMCPServers = exports.generateGeminiCliMCPServers = exports.generateVSCodeMCPServers = exports.generateCodexMCPServers = exports.generateKiroMCPServers = exports.generateClaudeCodeMCPServers = exports.generateClaudeMCPServers = exports.generateStandardMCPServers = exports.mergeTomlMCPServers = exports.extractTomlMcpServerBlock = void 0;
+exports.generateMCPConfig = exports.generateWindsurfMCPServers = exports.generateGeminiCliMCPServers = exports.generateVSCodeMCPServers = exports.generateGrokMCPServers = exports.generateCodexMCPServers = exports.generateKiroMCPServers = exports.generateClaudeCodeMCPServers = exports.generateClaudeMCPServers = exports.generateStandardMCPServers = exports.mergeTomlMCPServers = exports.extractTomlMcpServerBlock = void 0;
 const mcp_server_builder_1 = require("../mcp/mcp-server-builder");
 const ide_formats_1 = require("../mcp/ide-formats");
 const normalizeTokens = (tokenInput) => {
@@ -151,6 +151,15 @@ const generateCodexMCPServers = async (fraimKey, tokenInput, providerConfigs) =>
     return format.transform(builder.getServers());
 };
 exports.generateCodexMCPServers = generateCodexMCPServers;
+const generateGrokMCPServers = async (fraimKey, tokenInput, providerConfigs) => {
+    const tokens = normalizeTokens(tokenInput);
+    const builder = new mcp_server_builder_1.MCPServerBuilder();
+    builder.addBaseServers(fraimKey);
+    await addProviderServers(builder, tokens, providerConfigs);
+    const format = (0, ide_formats_1.getIDEFormat)('grok');
+    return format.transform(builder.getServers());
+};
+exports.generateGrokMCPServers = generateGrokMCPServers;
 const generateVSCodeMCPServers = async (fraimKey, tokenInput, providerConfigs) => {
     const tokens = normalizeTokens(tokenInput);
     const builder = new mcp_server_builder_1.MCPServerBuilder();
@@ -194,6 +203,8 @@ const generateMCPConfig = async (configType, fraimKey, tokenInput, providerConfi
             return await (0, exports.generateGeminiCliMCPServers)(fraimKey, tokenInput, providerConfigs);
         case 'codex':
             return await (0, exports.generateCodexMCPServers)(fraimKey, tokenInput, providerConfigs);
+        case 'grok':
+            return await (0, exports.generateGrokMCPServers)(fraimKey, tokenInput, providerConfigs);
         case 'windsurf':
             return await (0, exports.generateWindsurfMCPServers)(fraimKey, tokenInput, providerConfigs);
         default:

package/dist/src/cli/utils/agent-adapters.js

@@ -15,6 +15,7 @@ const CLAUDE_FRAIM_COMMAND_PATH = path_1.default.join('.claude', 'commands', 'fr
 const CLAUDE_FRAIM_SKILL_PATH = path_1.default.join('.claude', 'skills', 'fraim', 'SKILL.md');
 const VSCODE_FRAIM_PROMPT_PATH = path_1.default.join('.github', 'prompts', 'fraim.prompt.md');
 const CODEX_FRAIM_SKILL_PATH = path_1.default.join('.codex', 'skills', 'fraim', 'SKILL.md');
+const GROK_FRAIM_SKILL_PATH = path_1.default.join('.grok', 'skills', 'fraim', 'SKILL.md');
 const GEMINI_FRAIM_COMMAND_PATH = path_1.default.join('.gemini', 'commands', 'fraim.toml');
 const GEMINI_PROJECT_INSTRUCTIONS_PATH = path_1.default.join('.gemini', 'GEMINI.md');
 const WINDSURF_FRAIM_COMMAND_PATH = path_1.default.join('.windsurf', 'commands', 'fraim.md');
@@ -118,6 +119,7 @@ ${(0, ide_invocation_surfaces_1.buildFraimInvocationBody)('generic-tool-discover
         { path: CLAUDE_FRAIM_SKILL_PATH, content: (0, ide_invocation_surfaces_1.buildClaudeSkillContent)() },
         { path: CLAUDE_FRAIM_COMMAND_PATH, content: (0, ide_invocation_surfaces_1.buildClaudeCommandShimContent)() },
         { path: CODEX_FRAIM_SKILL_PATH, content: (0, ide_invocation_surfaces_1.buildCodexSkillContent)() },
+        { path: GROK_FRAIM_SKILL_PATH, content: (0, ide_invocation_surfaces_1.buildGrokSkillContent)() },
         { path: GEMINI_FRAIM_COMMAND_PATH, content: (0, ide_invocation_surfaces_1.buildGeminiCommandContent)() },
         { path: GEMINI_PROJECT_INSTRUCTIONS_PATH, content: geminiProjectInstructions },
         { path: WINDSURF_FRAIM_COMMAND_PATH, content: (0, ide_invocation_surfaces_1.buildWindsurfCommandContent)() },
@@ -140,6 +142,7 @@ function ensureAgentAdapterFiles(projectRoot) {
                 || file.path === CLAUDE_FRAIM_SKILL_PATH
                 || file.path === CLAUDE_FRAIM_COMMAND_PATH
                 || file.path === CODEX_FRAIM_SKILL_PATH
+                || file.path === GROK_FRAIM_SKILL_PATH
                 || file.path === GEMINI_FRAIM_COMMAND_PATH
                 || file.path === GEMINI_PROJECT_INSTRUCTIONS_PATH
                 || file.path === WINDSURF_FRAIM_COMMAND_PATH

package/dist/src/core/utils/inheritance-parser.js

@@ -187,6 +187,11 @@ class InheritanceParser {
         const parentMeta = JSON.parse(parentMatch[1]);
         const mergedMeta = { ...parentMeta, ...childMeta };
         delete mergedMeta.extends; // Remove extends from final merged content
+        // Deep-merge phase routing so child only overrides the entries it specifies;
+        // parent routing for untouched phases flows through unchanged.
+        if (parentMeta.phases && childMeta.phases) {
+            mergedMeta.phases = { ...parentMeta.phases, ...childMeta.phases };
+        }
         // 2. Extract Body (everything after frontmatter)
         const childBody = this.stripRedundantParentImports(child.substring(childMatch[0].length).trim(), typeof childMeta.extends === 'string' ? childMeta.extends : undefined);
         const parentBody = parent.substring(parentMatch[0].length).trim();

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

@@ -174,8 +174,8 @@ function normalizeRows(rows) {
         ...(existingById.get(canonical.id) || {}),
     }));
 }
-function buildConfiguredSurfaces() {
-    const ides = (0, ide_detector_1.detectInstalledIDEs)();
+function buildRunnableAgentSurfaces() {
+    const ides = (0, ide_detector_1.detectInstalledIDEs)('cli-runnable');
     const hints = (0, ide_global_integration_1.describeOnboardingInvocationSurfaces)(ides);
     return ides.map((ide, index) => ({
         id: ide.configType,
@@ -333,7 +333,7 @@ class FirstRunSessionService {
             byId.set(surface.id, surface);
         }
         if (this.fakeMode !== 'no-agents') {
-            for (const surface of buildConfiguredSurfaces()) {
+            for (const surface of buildRunnableAgentSurfaces()) {
                 byId.set(surface.id, surface);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim",
-  "version": "2.0.169",
+  "version": "2.0.171",
   "description": "FRAIM CLI - Framework for Rigor-based AI Management (alias for fraim-framework)",
   "main": "index.js",
   "bin": {

package/public/ai-hub/script.js

@@ -3529,8 +3529,9 @@ function rerunLastJob() {
     openPalette();
     return;
   }
-  showRerunToast('Re-running: ' + (state.lastRun.job.title || state.lastRun.job.id));
-  startRun(state.lastRun.job, state.lastRun.instructions, state.lastRun.employeeId);
+  const lastRun = state.lastRun;
+  startRun(lastRun.job, lastRun.instructions, lastRun.employeeId);
+  showRerunToast('Re-running: ' + (lastRun.job.title || lastRun.job.id));
 }
 
 function showRerunToast(msg) {
@@ -3538,7 +3539,7 @@ function showRerunToast(msg) {
   t.className = 'cp-rerun-toast';
   t.textContent = msg;
   document.body.appendChild(t);
-  setTimeout(() => { if (t.parentNode) t.parentNode.removeChild(t); }, 2500);
+  setTimeout(() => { if (t.parentNode) t.parentNode.removeChild(t); }, 5000);
 }
 
 // ---------------------------------------------------------------------------
@@ -3978,6 +3979,9 @@ async function startRun(job, instructions, employeeId, preassignedConvId) {
   };
   upsertConversation(conv);
   state.activeId = conv.id;
+  // Issue #539: make Cmd/Ctrl+Shift+R available as soon as the run is queued,
+  // not only after the server responds with the run id.
+  state.lastRun = { job, instructions, employeeId };
   persistConversations();
   renderRail();
   renderActive();
@@ -4008,9 +4012,8 @@ async function startRun(job, instructions, employeeId, preassignedConvId) {
     renderRail();
     renderActive();
     startPolling();
-    // Issue #539: record last run for Cmd+Shift+R re-run and update in-memory
-    // preferences so the next palette open shows the correct recent section.
-    state.lastRun = { job, instructions, employeeId };
+    // Issue #539: update in-memory preferences so the next palette open shows
+    // the correct recent section.
     if (state.bootstrap && state.bootstrap.preferences) {
       const prefs = state.bootstrap.preferences;
       const nextIds = [job.id, ...(prefs.recentJobIds || []).filter((id) => id !== job.id)].slice(0, 8);