fraim 2.0.270 → 2.0.272

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

@@ -181,46 +181,34 @@ function failSync(mode, message) {
 }
 const runSync = async (options) => {
     const failHard = options.failHard ?? 'exit';
-    // Handle --global flag: sync to user-level ~/.fraim/ instead of project
-    if (options.global) {
-        console.log(chalk_1.default.blue('Syncing FRAIM content to user-level directory (~/.fraim/)...'));
-        try {
-            const { syncUserLevelArtifacts } = await Promise.resolve().then(() => __importStar(require('../setup/user-level-sync')));
-            await syncUserLevelArtifacts();
-            console.log(chalk_1.default.green('\n✅ User-level FRAIM content sync complete.'));
-        }
-        catch (error) {
-            console.error(chalk_1.default.red(`User-level sync failed: ${error.message}`));
-            failSync(failHard, `User-level sync failed: ${error.message}`);
-        }
-        return;
-    }
     const projectRoot = options.projectRoot ? path_1.default.resolve(options.projectRoot) : process.cwd();
-    const config = (0, config_loader_1.loadFraimConfig)((0, project_fraim_paths_1.getWorkspaceConfigPath)(projectRoot));
-    const fraimDir = (0, project_fraim_paths_1.getWorkspaceFraimDir)(projectRoot);
-    const refreshLocalIgnoreConfig = () => {
-        const ignoreUpdate = (0, fraim_gitignore_1.ensureFraimSyncedContentLocallyExcluded)(projectRoot);
-        if (ignoreUpdate.gitInfoExcludeUpdated) {
-            console.log(chalk_1.default.green('Updated .git/info/exclude FRAIM managed block'));
+    // ─── Credential resolution (before project detection) ─────────────────────
+    // Order: user-level config → env var → project config (only if in a project)
+    const remoteUrl = process.env.FRAIM_REMOTE_URL || 'https://fraim.wellnessatwork.me';
+    let apiKey = loadUserApiKey() || process.env.FRAIM_API_KEY;
+    const hasProject = (0, project_fraim_paths_1.workspaceFraimExists)(projectRoot);
+    if (!apiKey && hasProject) {
+        const config = (0, config_loader_1.loadFraimConfig)((0, project_fraim_paths_1.getWorkspaceConfigPath)(projectRoot));
+        apiKey = config.apiKey;
+    }
+    if (!apiKey) {
+        if (process.env.TEST_MODE === 'true') {
+            console.log(chalk_1.default.yellow('TEST_MODE: No API key configured. Using test placeholder key.'));
+            apiKey = 'test-mode-key';
         }
-        if (ignoreUpdate.gitignoreUpdated) {
-            console.log(chalk_1.default.green('Removed legacy FRAIM sync block from .gitignore'));
+        else {
+            console.error(chalk_1.default.red('No API key configured. Cannot sync.'));
+            console.error(chalk_1.default.yellow('Set FRAIM_API_KEY in your environment, or add apiKey to ~/.fraim/config.json'));
+            console.error(chalk_1.default.yellow('Or use --local to sync from a locally running FRAIM server.'));
+            failSync(failHard, 'No API key configured.');
         }
-    };
-    // Issue #563: refresh the machine-level org cache (~/.fraim/org/) from the
-    // configured org backend. Failures never fail the sync: an existing cache is
-    // served stale with its age (R2.3, R4.3).
-    const refreshOrgCache = async (remoteUrl, apiKey) => {
-        // Org sync is a network round-trip to the org backend. In automated
-        // tests there is no org configured and no server to reach, so skip it
-        // entirely rather than emit warnings or attempt a real request. Local
-        // dev (--local / FRAIM_LOCAL_SYNC) passes the loopback URL + 'local-dev'
-        // key below, which syncOrgCache treats as "no cloud org" unless a git
-        // backend is configured, so it degrades cleanly without this guard.
+    }
+    // ─── Closures shared between layers ───────────────────────────────────────
+    const refreshOrgCache = async (url, key) => {
         if (process.env.TEST_MODE === 'true')
             return;
         const { syncOrgCache } = await Promise.resolve().then(() => __importStar(require('../utils/org-pack-sync')));
-        const outcome = await syncOrgCache({ remoteUrl, apiKey });
+        const outcome = await syncOrgCache({ remoteUrl: url, apiKey: key });
         if (outcome.status === 'synced') {
             console.log(chalk_1.default.green(`Org context synced (${outcome.metadata.backend}, version ${outcome.metadata.version.slice(0, 12)})`));
         }
@@ -230,8 +218,6 @@ const runSync = async (options) => {
         else if (outcome.status === 'absent') {
             console.log(chalk_1.default.yellow(`Org context not synced: ${outcome.error}`));
         }
-        // Migrate stranded content from the legacy standard path to contentRoot,
-        // then report any files that still could not be moved.
         try {
             const { migrateStrandedContent, findStrandedLegacyContent, resolvePackHome } = await Promise.resolve().then(() => __importStar(require('../utils/pack-home')));
             migrateStrandedContent('org');
@@ -247,10 +233,6 @@ const runSync = async (options) => {
             }
         }
         catch { /* reporting must never fail a sync */ }
-        // 'disabled' (no org configured) stays silent.
-        // R8.1: one-time publish offer for legacy machine-local org files. The
-        // publish itself runs through organization-onboarding (propose-and-approve);
-        // sync only surfaces the offer and never moves files on its own (R8.2).
         if (outcome.status !== 'disabled') {
             const { detectLegacyOrgArtifacts } = await Promise.resolve().then(() => __importStar(require('../utils/org-migration')));
             const legacy = detectLegacyOrgArtifacts();
@@ -260,11 +242,11 @@ const runSync = async (options) => {
             }
         }
     };
-    const refreshManagerCache = async (remoteUrl, apiKey) => {
+    const refreshManagerCache = async (url, key) => {
         if (process.env.TEST_MODE === 'true')
             return;
         const { syncManagerCache } = await Promise.resolve().then(() => __importStar(require('../utils/manager-pack-sync')));
-        const outcome = await syncManagerCache({ remoteUrl, apiKey });
+        const outcome = await syncManagerCache({ remoteUrl: url, apiKey: key });
         if (outcome.status === 'synced') {
             console.log(chalk_1.default.green(`Manager context synced (${outcome.metadata.backend}, version ${outcome.metadata.version.slice(0, 12)})`));
         }
@@ -274,8 +256,6 @@ const runSync = async (options) => {
         else if (outcome.status === 'absent') {
             console.log(chalk_1.default.yellow(`Manager context not synced: ${outcome.error}`));
         }
-        // Migrate stranded content from the legacy standard path to contentRoot,
-        // then report any files that still could not be moved.
         try {
             const { migrateStrandedContent, findStrandedLegacyContent, resolvePackHome } = await Promise.resolve().then(() => __importStar(require('../utils/pack-home')));
             migrateStrandedContent('manager');
@@ -292,25 +272,17 @@ const runSync = async (options) => {
         }
         catch { /* reporting must never fail a sync */ }
     };
-    const isNpx = process.env.npm_config_prefix === undefined || process.env.npm_lifecycle_event === 'npx';
-    const isGlobal = !isNpx && (process.env.npm_config_global === 'true' || process.env.npm_config_prefix);
-    if (isGlobal && !options.skipUpdates) {
-        console.log(chalk_1.default.yellow('You are running a global installation of FRAIM.'));
-        console.log(chalk_1.default.gray('Updates are not automatic in this mode.'));
-        console.log(chalk_1.default.cyan('Recommended: Use "npx fraim@latest sync" instead.\n'));
-    }
-    const { syncFromRemote } = await Promise.resolve().then(() => __importStar(require('../utils/remote-sync')));
-    // Allow `FRAIM_LOCAL_SYNC=1` to flip into local-mode without needing
-    // the --local CLI flag. The FRE's runProjectRow path doesn't surface
-    // a --local flag, but devs validating the FRE locally need a way to
-    // point sync at their localhost MCP server. With this env var set,
-    // any caller (including the FRE) routes through the local sync path
-    // exactly as if the user had passed --local.
+    // ─── Local sync shortcut (dev mode) ───────────────────────────────────────
     const useLocal = options.local || process.env.FRAIM_LOCAL_SYNC === '1';
     if (useLocal) {
         console.log(chalk_1.default.blue('Syncing FRAIM jobs from local server...'));
         const localPort = process.env.FRAIM_MCP_PORT ? parseInt(process.env.FRAIM_MCP_PORT) : (0, git_utils_1.getPort)();
         const localUrl = resolveExplicitLocalSyncUrl() || `http://localhost:${localPort}`;
+        const { syncFromRemote } = await Promise.resolve().then(() => __importStar(require('../utils/remote-sync')));
+        if (!hasProject) {
+            console.error(chalk_1.default.red('Local sync requires a FRAIM project directory (fraim/ must exist).'));
+            failSync(failHard, 'Local sync requires a project directory.');
+        }
         const result = await syncFromRemote({
             remoteUrl: localUrl,
             apiKey: 'local-dev',
@@ -319,9 +291,16 @@ const runSync = async (options) => {
         });
         if (result.success) {
             console.log(chalk_1.default.green(`Successfully synced ${result.employeeJobsSynced} ai-employee jobs, ${result.managerJobsSynced} ai-manager jobs, ${result.skillsSynced} skills, ${result.rulesSynced} rules, ${result.scriptsSynced} scripts, and ${result.docsSynced} docs from local server`));
+            const fraimDir = (0, project_fraim_paths_1.getWorkspaceFraimDir)(projectRoot);
             removeLegacyVersionFromConfig(fraimDir);
             writeSyncMetadata('local', localUrl);
-            refreshLocalIgnoreConfig();
+            const ignoreUpdate = (0, fraim_gitignore_1.ensureFraimSyncedContentLocallyExcluded)(projectRoot);
+            if (ignoreUpdate.gitInfoExcludeUpdated) {
+                console.log(chalk_1.default.green('Updated .git/info/exclude FRAIM managed block'));
+            }
+            if (ignoreUpdate.gitignoreUpdated) {
+                console.log(chalk_1.default.green('Removed legacy FRAIM sync block from .gitignore'));
+            }
             if (options.projectAdapters) {
                 const allowedTypes = resolveAllowedConfigTypes();
                 await cleanupStaleAdapterFiles(projectRoot, allowedTypes);
@@ -338,39 +317,91 @@ const runSync = async (options) => {
         console.error(chalk_1.default.yellow('Make sure the FRAIM MCP server is running locally (npm run dev).'));
         failSync(failHard, `Local sync failed: ${result.error}`);
     }
-    let apiKey = loadUserApiKey() || config.apiKey || process.env.FRAIM_API_KEY;
-    if (!apiKey) {
+    // ─── Global install notice ────────────────────────────────────────────────
+    const isNpx = process.env.npm_config_prefix === undefined || process.env.npm_lifecycle_event === 'npx';
+    const isGlobal = !isNpx && (process.env.npm_config_global === 'true' || process.env.npm_config_prefix);
+    if (isGlobal && !options.skipUpdates) {
+        console.log(chalk_1.default.yellow('You are running a global installation of FRAIM.'));
+        console.log(chalk_1.default.gray('Updates are not automatic in this mode.'));
+        console.log(chalk_1.default.cyan('Recommended: Use "npx fraim@latest sync" instead.\n'));
+    }
+    // ═══════════════════════════════════════════════════════════════════════════
+    // LAYER 1 — Machine-level sync (always runs)
+    // ═══════════════════════════════════════════════════════════════════════════
+    console.log(chalk_1.default.blue('Syncing machine-level FRAIM content (~/.fraim/)...'));
+    // 1a. Fetch registry files (single API call shared with Layer 2)
+    let registryFiles = [];
+    try {
+        registryFiles = await (0, remote_sync_1.fetchRegistryFiles)(remoteUrl, apiKey);
+    }
+    catch (error) {
         if (process.env.TEST_MODE === 'true') {
-            console.log(chalk_1.default.yellow('TEST_MODE: No API key configured. Using test placeholder key.'));
-            apiKey = 'test-mode-key';
+            console.log(chalk_1.default.yellow('TEST_MODE: Registry fetch failed (server may be unavailable). Continuing.'));
         }
         else {
-            console.error(chalk_1.default.red('No API key configured. Cannot sync.'));
-            console.error(chalk_1.default.yellow(`Set FRAIM_API_KEY in your environment, or add apiKey to ~/.fraim/config.json or ${(0, project_fraim_paths_1.getWorkspaceFraimDisplayPath)('config.json')}`));
-            console.error(chalk_1.default.yellow('Or use --local to sync from a locally running FRAIM server.'));
-            failSync(failHard, 'No API key configured.');
+            console.error(chalk_1.default.red(`Registry sync failed: ${error.message}`));
+            console.error(chalk_1.default.yellow('Check your API key and network connection.'));
+            failSync(failHard, `Registry sync failed: ${error.message}`);
         }
     }
-    console.log(chalk_1.default.blue('Syncing FRAIM jobs from remote server...'));
+    // 1b. Sync scripts to ~/.fraim/scripts/
+    const scriptsSynced = await (0, remote_sync_1.syncScriptsToUserDir)(registryFiles);
+    if (scriptsSynced > 0) {
+        console.log(chalk_1.default.green(`  Synced ${scriptsSynced} scripts to ~/.fraim/scripts/`));
+    }
+    // 1c. Refresh org home
+    await refreshOrgCache(remoteUrl, apiKey);
+    // 1d. Refresh manager home
+    await refreshManagerCache(remoteUrl, apiKey);
+    // 1e. Refresh MCP proxy launcher
+    const { ensureFraimMcpLatestLauncher } = await Promise.resolve().then(() => __importStar(require('../mcp/fraim-mcp-latest-launcher')));
+    ensureFraimMcpLatestLauncher();
+    // 1f. Ensure user-level directories
+    const { ensureUserLevelDirectories } = await Promise.resolve().then(() => __importStar(require('../setup/user-level-sync')));
+    ensureUserLevelDirectories();
+    // 1g. Write sync metadata
+    writeSyncMetadata('remote', remoteUrl);
+    console.log(chalk_1.default.green('✅ Machine-level sync complete.'));
+    // ═══════════════════════════════════════════════════════════════════════════
+    // LAYER 2 — Project-level sync (conditional)
+    // ═══════════════════════════════════════════════════════════════════════════
+    if (options.global) {
+        console.log(chalk_1.default.gray('--global: skipping project-level sync.'));
+        return;
+    }
+    if (!hasProject) {
+        console.log(chalk_1.default.cyan('No FRAIM project detected at cwd. Machine-level sync complete.'));
+        console.log(chalk_1.default.cyan('Run from a project folder or pass --project-root to sync project stubs.'));
+        return;
+    }
+    console.log(chalk_1.default.blue('Syncing project-level FRAIM content (fraim/)...'));
+    const { syncFromRemote } = await Promise.resolve().then(() => __importStar(require('../utils/remote-sync')));
+    const config = (0, config_loader_1.loadFraimConfig)((0, project_fraim_paths_1.getWorkspaceConfigPath)(projectRoot));
+    const fraimDir = (0, project_fraim_paths_1.getWorkspaceFraimDir)(projectRoot);
     const result = await syncFromRemote({
-        remoteUrl: config.remoteUrl,
+        remoteUrl: config.remoteUrl || remoteUrl,
         apiKey,
         projectRoot,
-        skipUpdates: options.skipUpdates || false
+        skipUpdates: options.skipUpdates || false,
+        registryFiles
     });
     if (!result.success) {
-        console.error(chalk_1.default.red(`Remote sync failed: ${result.error}`));
-        console.error(chalk_1.default.yellow('Check your API key and network connection.'));
+        console.error(chalk_1.default.red(`Project sync failed: ${result.error}`));
         if (process.env.TEST_MODE === 'true') {
-            console.log(chalk_1.default.yellow('TEST_MODE: Continuing without remote sync (server may be unavailable).'));
+            console.log(chalk_1.default.yellow('TEST_MODE: Continuing without project sync.'));
             return;
         }
-        failSync(failHard, `Remote sync failed: ${result.error}`);
+        failSync(failHard, `Project sync failed: ${result.error}`);
     }
-    console.log(chalk_1.default.green(`Successfully synced ${result.employeeJobsSynced} ai-employee jobs, ${result.managerJobsSynced} ai-manager jobs, ${result.skillsSynced} skills, ${result.rulesSynced} rules, ${result.scriptsSynced} scripts, and ${result.docsSynced} docs from remote`));
+    console.log(chalk_1.default.green(`Successfully synced ${result.employeeJobsSynced} ai-employee jobs, ${result.managerJobsSynced} ai-manager jobs, ${result.skillsSynced} skills, ${result.rulesSynced} rules, and ${result.docsSynced} docs`));
     removeLegacyVersionFromConfig(fraimDir);
-    writeSyncMetadata('remote', config.remoteUrl || process.env.FRAIM_REMOTE_URL || 'https://fraim.wellnessatwork.me');
-    refreshLocalIgnoreConfig();
+    const ignoreUpdate = (0, fraim_gitignore_1.ensureFraimSyncedContentLocallyExcluded)(projectRoot);
+    if (ignoreUpdate.gitInfoExcludeUpdated) {
+        console.log(chalk_1.default.green('Updated .git/info/exclude FRAIM managed block'));
+    }
+    if (ignoreUpdate.gitignoreUpdated) {
+        console.log(chalk_1.default.green('Removed legacy FRAIM sync block from .gitignore'));
+    }
     if (options.projectAdapters) {
         const allowedTypes = resolveAllowedConfigTypes();
         await cleanupStaleAdapterFiles(projectRoot, allowedTypes);
@@ -379,8 +410,7 @@ const runSync = async (options) => {
             console.log(chalk_1.default.green(`Updated FRAIM agent adapter files: ${adapterUpdates.join(', ')}`));
         }
     }
-    await refreshOrgCache(config.remoteUrl || process.env.FRAIM_REMOTE_URL || 'https://fraim.wellnessatwork.me', apiKey);
-    await refreshManagerCache(config.remoteUrl || process.env.FRAIM_REMOTE_URL || 'https://fraim.wellnessatwork.me', apiKey);
+    console.log(chalk_1.default.green('✅ Project-level sync complete.'));
 };
 exports.runSync = runSync;
 exports.syncCommand = new commander_1.Command('sync')
@@ -388,6 +418,7 @@ exports.syncCommand = new commander_1.Command('sync')
     .option('-f, --force', 'Force sync even if digest matches')
     .option('--skip-updates', 'Skip checking for CLI updates (legacy)')
     .option('--local', 'Sync from local development server (port derived from git branch)')
-    .option('--global', 'Sync user-level FRAIM content (~/.fraim/) instead of project')
+    .option('--global', 'Sync machine-level FRAIM content only (~/.fraim/), skip project stubs')
+    .option('--project-root <path>', 'Explicit project root (enables project-level sync from any cwd)')
     .option('--project-adapters', 'Write legacy project-local FRAIM agent adapter files')
     .action(exports.runSync);

package/dist/src/cli/fraim.js

@@ -1,38 +1,5 @@
 #!/usr/bin/env node
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -101,12 +68,4 @@ program.addCommand(workspace_config_1.workspaceConfigCommand);
 program.addCommand(org_1.orgCommand);
 program.addCommand(manager_1.managerCommand);
 program.addCommand(cleanup_artifacts_1.cleanupArtifactsCommand);
-// Wait for async command initialization before parsing
-(async () => {
-    // Import the initialization promise from setup command
-    const { setupCommandInitialization } = await Promise.resolve().then(() => __importStar(require('./commands/setup')));
-    if (setupCommandInitialization) {
-        await setupCommandInitialization;
-    }
-    program.parse(process.argv);
-})();
+program.parse(process.argv);

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

@@ -257,7 +257,7 @@ class CodexFormat {
                 const escapedUrl = this.escapeToml(server.url);
                 sections.push(`[mcp_servers.${key}]`);
                 sections.push(`url = "${escapedUrl}"`);
-                // OAuth-first providers (e.g. GitHub) have no Authorization header — IDE manages auth
+                // URL-only provider metadata serializes without a synthesized Authorization header.
                 if (authHeader) {
                     sections.push(`http_headers = { Authorization = "${this.escapeToml(authHeader)}" }`);
                 }

package/dist/src/cli/mcp/mcp-server-registry.js

@@ -81,9 +81,9 @@ async function buildProviderMCPServer(providerId, token, config) {
     }
 }
 /**
- * Build an HTTP MCP server.
- * When authHeaderTemplate is absent the provider uses IDE-native OAuth (e.g. GitHub);
- * write a URL-only entry so the IDE handles the OAuth flow on first tool use.
+ * Serialize an HTTP MCP server from explicit provider metadata.
+ * A missing authHeaderTemplate produces a URL-only shape; it does not establish
+ * authentication compatibility for any agent host.
  */
 function buildHTTPServer(mcpConfig, token) {
     if (!mcpConfig.url) {

package/dist/src/cli/providers/local-provider-registry.js

@@ -22,7 +22,7 @@ const LOCAL_PROVIDERS = [
         description: 'GitHub repository and issue management',
         capabilities: ['code', 'issues', 'integrated'],
         docsUrl: 'https://docs.github.com',
-        setupInstructions: 'Run "fraim add-provider github" — your IDE handles OAuth automatically on first use',
+        setupInstructions: 'Ask your agent to use the FRAIM connect-mcp skill and follow current GitHub and host guidance',
         hasAdditionalConfig: false,
         mcpServer: {
             type: 'http',
@@ -35,7 +35,7 @@ const LOCAL_PROVIDERS = [
         description: 'GitLab repository and issue management',
         capabilities: ['code', 'issues', 'integrated'],
         docsUrl: 'https://docs.gitlab.com',
-        setupInstructions: 'Create a Personal Access Token in your GitLab settings',
+        setupInstructions: 'Ask your agent to use the FRAIM connect-mcp skill and follow current GitLab and host guidance',
         hasAdditionalConfig: false,
         mcpServer: {
             type: 'http',
@@ -49,7 +49,7 @@ const LOCAL_PROVIDERS = [
         description: 'Azure DevOps repository and issue management',
         capabilities: ['code', 'issues', 'integrated'],
         docsUrl: 'https://docs.microsoft.com/azure/devops',
-        setupInstructions: 'Create a Personal Access Token in Azure DevOps',
+        setupInstructions: 'Ask your agent to use the FRAIM connect-mcp skill and follow current Azure DevOps and host guidance',
         hasAdditionalConfig: true,
         mcpServer: {
             type: 'stdio',
@@ -66,7 +66,7 @@ const LOCAL_PROVIDERS = [
         description: 'Jira issue tracking and project management',
         capabilities: ['issues'],
         docsUrl: 'https://support.atlassian.com/jira',
-        setupInstructions: 'Create an API token at https://id.atlassian.com/manage-profile/security/api-tokens',
+        setupInstructions: 'Ask your agent to use the FRAIM connect-mcp skill and follow current Jira and host guidance',
         hasAdditionalConfig: true,
         mcpServer: {
             type: 'stdio',

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

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.autoConfigureMCP = exports.validateSetupResults = exports.promptForGitHubToken = exports.promptForIDESelection = void 0;
+exports.autoConfigureMCP = exports.validateSetupResults = exports.promptForIDESelection = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
@@ -60,7 +60,7 @@ const promptForIDESelection = async (detectedIDEs) => {
     console.log(chalk_1.default.gray('   • fraim (required for FRAIM jobs)'));
     console.log(chalk_1.default.gray('   • git (version control integration)'));
     console.log(chalk_1.default.gray('   • playwright (browser automation)'));
-    console.log(chalk_1.default.blue('\n💡 Run "fraim add-provider <provider>" after setup to connect GitHub, GitLab, Jira, or other tools.'));
+    console.log(chalk_1.default.blue('\n💡 Ask your agent to use the FRAIM connect-mcp skill for GitHub, GitLab, Jira, or other tools.'));
     console.log(chalk_1.default.yellow('\n💡 Existing MCP servers will be preserved - only missing servers will be added.'));
     const response = await (0, prompts_1.default)({
         type: 'text',
@@ -87,15 +87,6 @@ const promptForIDESelection = async (detectedIDEs) => {
     return selectedIndices.map((i) => detectedIDEs[i]).filter((ide) => ide !== undefined);
 };
 exports.promptForIDESelection = promptForIDESelection;
-// Re-export promptForProviderToken for backward compatibility
-// This maintains the same interface but uses the generic system
-const promptForGitHubToken = async () => {
-    const { promptForProviderToken } = await Promise.resolve().then(() => __importStar(require('./provider-prompts')));
-    const { getProviderClient } = await Promise.resolve().then(() => __importStar(require('../api/get-provider-client')));
-    const client = getProviderClient();
-    return promptForProviderToken(client, 'github');
-};
-exports.promptForGitHubToken = promptForGitHubToken;
 const backupConfig = (configPath) => {
     if (fs_1.default.existsSync(configPath)) {
         const backupPath = `${configPath}.fraim-backup-${Date.now()}`;
@@ -188,8 +179,8 @@ const configureIDEMCP = async (ide, fraimKey) => {
         const addedServers = [];
         const updatedServers = [];
         const skippedServers = [];
-        // Servers that should always be updated (not skipped)
-        const alwaysUpdateServers = new Set(['fraim', 'github', 'gitlab', 'jira', 'ado', 'linear']);
+        // FRAIM owns its own base server entry. Third-party entries are preserved.
+        const alwaysUpdateServers = new Set(['fraim']);
         for (const [serverName, serverConfig] of Object.entries(newMCPServers)) {
             if (!existingMCPServers[serverName]) {
                 mergedMCPServers[serverName] = serverConfig;

package/dist/src/cli/utils/remote-sync.js

@@ -12,6 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SYNCED_CONTENT_BANNER_MARKER = void 0;
+exports.fetchRegistryFiles = fetchRegistryFiles;
+exports.syncScriptsToUserDir = syncScriptsToUserDir;
 exports.syncFromRemote = syncFromRemote;
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = require("fs");
@@ -177,6 +179,42 @@ function applySyncedContentBanner(file) {
     const banner = buildSyncedContentBanner(typeLabel);
     return insertAfterFrontmatter(file.content, banner);
 }
+/**
+ * Fetch all registry files from the remote FRAIM server.
+ * Extracted so callers can partition the result (scripts vs project stubs).
+ */
+async function fetchRegistryFiles(remoteUrl, apiKey) {
+    const response = await fetchRegistrySync(remoteUrl, apiKey);
+    return response.data.files || [];
+}
+/**
+ * Sync script files to the user-level ~/.fraim/scripts/ directory.
+ * Extracted from syncFromRemote so it can run without a project root.
+ */
+async function syncScriptsToUserDir(files) {
+    const scriptFiles = files.filter(f => f.type === 'script');
+    if (scriptFiles.length === 0)
+        return 0;
+    const userDir = (0, script_sync_utils_1.getUserFraimDir)();
+    const scriptsDir = (0, path_1.join)(userDir, 'scripts');
+    if (!(0, fs_1.existsSync)(scriptsDir)) {
+        (0, fs_1.mkdirSync)(scriptsDir, { recursive: true });
+    }
+    cleanDirectory(scriptsDir, (candidatePath) => {
+        if ((0, path_1.resolve)(candidatePath) !== (0, path_1.resolve)(scriptsDir)) {
+            assertPathInsideDirectory(scriptsDir, candidatePath, 'script directory');
+        }
+    });
+    for (const file of scriptFiles) {
+        const { filePath } = resolveUserRegistryFile(scriptsDir, file.path, 'script file');
+        const fileDir = (0, path_1.dirname)(filePath);
+        if (!(0, fs_1.existsSync)(fileDir)) {
+            (0, fs_1.mkdirSync)(fileDir, { recursive: true });
+        }
+        (0, fs_1.writeFileSync)(filePath, file.content, 'utf8');
+    }
+    return scriptFiles.length;
+}
 /**
  * Sync jobs and scripts from remote FRAIM server
  */
@@ -200,9 +238,7 @@ async function syncFromRemote(options) {
         const assertWorkspacePath = (0, project_fraim_paths_1.createWorkspaceFraimPathAsserter)(options.projectRoot);
         console.log(chalk_1.default.blue('🔄 Syncing from remote FRAIM server...'));
         console.log(chalk_1.default.gray(`   Remote: ${remoteUrl}`));
-        // Fetch registry files from remote server
-        const response = await fetchRegistrySync(remoteUrl, apiKey);
-        const files = response.data.files || [];
+        const files = options.registryFiles || await fetchRegistryFiles(remoteUrl, apiKey);
         if (!files || files.length === 0) {
             console.log(chalk_1.default.yellow('⚠️  No files received from remote server'));
             return {
@@ -297,29 +333,9 @@ async function syncFromRemote(options) {
             (0, fs_1.writeFileSync)(filePath, applySyncedContentBanner(file), 'utf8');
             console.log(chalk_1.default.gray(`  + ${(0, project_fraim_paths_1.getWorkspaceFraimDisplayPath)(`ai-employee/rules/${relativePath}`)} (stub)`));
         }
-        // Sync scripts to user directory
+        // Scripts are synced by machine-level layer (syncScriptsToUserDir).
+        // Only count them for the result.
         const scriptFiles = files.filter(f => f.type === 'script');
-        const userDir = (0, script_sync_utils_1.getUserFraimDir)();
-        const scriptsDir = (0, path_1.join)(userDir, 'scripts');
-        if (!(0, fs_1.existsSync)(scriptsDir)) {
-            (0, fs_1.mkdirSync)(scriptsDir, { recursive: true });
-        }
-        // Clean existing scripts
-        cleanDirectory(scriptsDir, (candidatePath) => {
-            if ((0, path_1.resolve)(candidatePath) !== (0, path_1.resolve)(scriptsDir)) {
-                assertPathInsideDirectory(scriptsDir, candidatePath, 'script directory');
-            }
-        });
-        // Write script files
-        for (const file of scriptFiles) {
-            const { filePath, relativePath } = resolveUserRegistryFile(scriptsDir, file.path, 'script file');
-            const fileDir = (0, path_1.dirname)(filePath);
-            if (!(0, fs_1.existsSync)(fileDir)) {
-                (0, fs_1.mkdirSync)(fileDir, { recursive: true });
-            }
-            (0, fs_1.writeFileSync)(filePath, file.content, 'utf8');
-            console.log(chalk_1.default.gray(`  + ${relativePath}`));
-        }
         // Sync docs to fraim/docs/
         const docsFiles = files.filter(f => f.type === 'docs');
         const docsDir = (0, project_fraim_paths_1.getWorkspaceFraimPath)(options.projectRoot, 'docs');

package/dist/src/core/ai-mentor.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AIMentor = void 0;
 const include_resolver_1 = require("./utils/include-resolver");
+const resolve_phase_edge_1 = require("./resolve-phase-edge");
 class AIMentor {
     constructor(resolver, skillDedup) {
         this.jobCache = new Map();
@@ -36,7 +37,10 @@ class AIMentor {
             return await this.generateCompletionMessage(workflow, args.currentPhase, args.findings, args.evidence, args.skipIncludes);
         }
         else {
-            return await this.generateHelpMessage(workflow, args.currentPhase, args.status, args.skipIncludes);
+            // Issue #1123: findings/evidence must reach the failure path too. The
+            // MCP layer has always forwarded them for every status; only this hop
+            // dropped them, which is why a failure edge could not be discriminated.
+            return await this.generateHelpMessage(workflow, args.currentPhase, args.status, args.skipIncludes, args.findings, args.evidence);
         }
     }
     async getOrLoadJob(jobType) {
@@ -65,15 +69,21 @@ class AIMentor {
             return '';
         const onSuccess = phaseFlow.onSuccess;
         const completionCall = `seekMentoring({ jobName: "${jobName}", issueNumber: "<issue_number>", currentPhase: "${phaseId}", status: "complete" })`;
+        // Issue #1123: a routing map nobody knows how to trigger is decorative,
+        // which is the defect recorded as #1135. Whichever edge carries a map, the
+        // footer has to name its outcomes so the agent can actually supply one.
+        const failureOutcomes = (0, resolve_phase_edge_1.discriminantKeys)(phaseFlow.onFailure);
+        const failureNote = failureOutcomes.length > 0
+            ? `\nIf this phase needs to loop back, call the same tool with \`status: "failure"\`, and set \`findings.phaseOutcome\` to one of: ${failureOutcomes.map((key) => `"${key}"`).join(' | ')} when one applies. Omit it otherwise.`
+            : '';
         if (!onSuccess || typeof onSuccess === 'string') {
             const finalPhaseNote = onSuccess ? '' : ' This is the final phase.';
-            return `\n\n---\n\n## Report Back\nWhen this phase is done, call \`${completionCall}\`.${finalPhaseNote}`;
+            return `\n\n---\n\n## Report Back\nWhen this phase is done, call \`${completionCall}\`.${finalPhaseNote}${failureNote}`;
         }
-        const validOutcomes = Object.keys(onSuccess)
-            .filter((key) => key !== 'default')
+        const validOutcomes = (0, resolve_phase_edge_1.discriminantKeys)(onSuccess)
             .map((key) => `"${key}"`)
             .join(' | ');
-        return `\n\n---\n\n## Report Back\nWhen this phase is done, call \`seekMentoring({ jobName: "${jobName}", issueNumber: "<issue_number>", currentPhase: "${phaseId}", status: "complete", findings: { issueType: "<outcome>" } })\` with one of: ${validOutcomes}.`;
+        return `\n\n---\n\n## Report Back\nWhen this phase is done, call \`seekMentoring({ jobName: "${jobName}", issueNumber: "<issue_number>", currentPhase: "${phaseId}", status: "complete", findings: { issueType: "<outcome>" } })\` with one of: ${validOutcomes}.${failureNote}`;
     }
     /** Phase-authority content injected for all phased workflows. Loaded from orchestration/phase-authority.md. */
     async getPhaseAuthorityContent() {
@@ -158,13 +168,9 @@ class AIMentor {
         const phaseFlow = workflow.metadata.phases?.[phaseId];
         let nextPhaseId = null;
         if (phaseFlow && phaseFlow.onSuccess) {
-            if (typeof phaseFlow.onSuccess === 'string') {
-                nextPhaseId = phaseFlow.onSuccess;
-            }
-            else {
-                const outcome = findings?.phaseOutcome ?? findings?.issueType ?? evidence?.issueType ?? evidence?.phaseOutcome ?? 'default';
-                nextPhaseId = phaseFlow.onSuccess[outcome] ?? phaseFlow.onSuccess.default ?? null;
-            }
+            // Issue #1123: resolved through the shared authority so the success and
+            // failure paths cannot read the discriminant differently.
+            nextPhaseId = (0, resolve_phase_edge_1.resolvePhaseEdge)(phaseFlow.onSuccess, (0, resolve_phase_edge_1.resolveDiscriminant)(findings, evidence));
         }
         let message = '';
         if (nextPhaseId) {
@@ -189,7 +195,7 @@ class AIMentor {
             status: 'complete'
         };
     }
-    async generateHelpMessage(workflow, phaseId, status, skipIncludes) {
+    async generateHelpMessage(workflow, phaseId, status, skipIncludes, findings, evidence) {
         const entityType = 'Job';
         if (workflow.isSimple) {
             const message = `${entityType}: ${workflow.metadata.name}\n\n${workflow.overview}`;
@@ -201,7 +207,14 @@ class AIMentor {
             };
         }
         const phaseMeta = workflow.metadata.phases?.[phaseId];
-        const targetPhaseId = status === 'failure' ? (phaseMeta?.onFailure || phaseId) : phaseId;
+        // Issue #1123: the failure edge may be a discriminant map. Resolving to
+        // null (terminal, malformed, or a map with no `default` and no match)
+        // falls back to self-retry, which is what the previous `|| phaseId` did
+        // for an absent edge. The old expression could not do this: an object is
+        // truthy, so it was returned as the target and `phases.get()` then missed.
+        const targetPhaseId = status === 'failure'
+            ? ((0, resolve_phase_edge_1.resolvePhaseEdge)(phaseMeta?.onFailure, (0, resolve_phase_edge_1.resolveDiscriminant)(findings, evidence)) || phaseId)
+            : phaseId;
         let message = `### Current Phase: ${targetPhaseId}\n\n`;
         let instructions = workflow.phases.get(targetPhaseId);
         if (instructions) {