fraim 2.0.175 → 2.0.177

package/dist/src/cli/commands/first-run.js

@@ -65,11 +65,9 @@ function openBrowser(url) {
     }
 }
 const runFirstRun = async (options) => {
-    const key = options.key || process.env.FRAIM_API_KEY || process.env.FRAIM_SETUP_KEY || process.env.FRAIM_INSTALL_KEY;
-    if (!key) {
-        console.log(chalk_1.default.red('FRAIM key is required for first-run.'));
-        process.exit(1);
-    }
+    // Issue #646: the key is optional. When launched by the no-terminal macOS
+    // installer (.pkg), no key is passed — the wizard prompts the user to paste it.
+    const key = options.key || process.env.FRAIM_API_KEY || process.env.FRAIM_SETUP_KEY || process.env.FRAIM_INSTALL_KEY || '';
     const sessionService = new session_service_1.FirstRunSessionService({
         key,
         headless: options.headless,

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

@@ -23,6 +23,39 @@ exports.expandPath = expandPath;
 const checkMultiplePaths = (paths) => {
     return paths.some(p => fs_1.default.existsSync(expandPath(p)));
 };
+// Issue #646 (Bug 2): a config directory left behind after uninstall (e.g. ~/.cursor,
+// ~/Library/Application Support/Cursor) made config-surface detection report a GUI app
+// as "Installed" when it was not. On macOS an installed GUI app keeps its .app bundle,
+// which is the reliable signal. So on macOS we require app-bundle evidence for GUI apps;
+// on Windows/Linux we keep the existing config-surface check unchanged (no reported
+// false-positive there, and those install paths are not validated on this platform).
+const macAppBundlePaths = (appName) => [
+    `/Applications/${appName}.app`,
+    `~/Applications/${appName}.app`,
+];
+// Issue #646 follow-up: a user may run a GUI app from a non-standard location
+// (e.g. straight from a mounted DMG: /Volumes/.../Cursor.app) that the
+// /Applications checks miss. A running process of the app is definitive proof it
+// is installed and in use, and a stale config dir alone has no such process — so
+// this catches real installs without re-introducing the stale-dir false positive.
+const isMacAppRunning = (appName) => {
+    if (process.platform !== 'darwin')
+        return false;
+    // Test seam: `pgrep` is system-global (not HOME-scoped), so tests that simulate
+    // "app not installed" via a temp HOME set this to keep results deterministic.
+    if (process.env.FRAIM_DETECT_DISABLE_PROCESS_CHECK === '1')
+        return false;
+    const result = (0, child_process_1.spawnSync)('pgrep', ['-f', `${appName}.app/Contents`], { encoding: 'utf8', timeout: 1500 });
+    return result.status === 0 && Boolean((result.stdout || '').trim());
+};
+const guiAppDetect = (configSurfaceCheck, macAppName) => {
+    return () => {
+        if (process.platform === 'darwin') {
+            return checkMultiplePaths(macAppBundlePaths(macAppName)) || isMacAppRunning(macAppName);
+        }
+        return configSurfaceCheck();
+    };
+};
 const availableByVersionProbe = (command) => {
     const result = process.platform === 'win32'
         ? (0, child_process_1.spawnSync)('cmd.exe', ['/d', '/s', '/c', `${command} --version`], { encoding: 'utf8', timeout: 1500 })
@@ -112,7 +145,7 @@ exports.IDE_CONFIGS = [
         configFormat: 'json',
         configType: 'claude',
         invocationProfile: 'launch-phrase',
-        detectMethod: detectClaude,
+        detectMethod: guiAppDetect(detectClaude, 'Claude'),
         aliases: ['claude', 'claude-desktop', 'claude desktop', 'claude-cowork', 'cowork', 'claude cowork'],
         alternativePaths: [
             '~/Library/Application Support/Claude/claude_desktop_config.json'
@@ -126,9 +159,9 @@ exports.IDE_CONFIGS = [
         configFormat: 'json',
         configType: 'standard',
         invocationProfile: 'cursor-mention',
-        detectMethod: () => fs_1.default.existsSync(expandPath('~/.gemini/antigravity')),
+        detectMethod: guiAppDetect(() => fs_1.default.existsSync(expandPath('~/.gemini/antigravity')), 'Antigravity'),
         description: 'Google Gemini Antigravity IDE',
-        downloadUrl: 'https://deepmind.google/technologies/gemini/',
+        downloadUrl: 'https://antigravity.google/',
     },
     {
         name: 'Gemini CLI',
@@ -152,7 +185,7 @@ exports.IDE_CONFIGS = [
         configFormat: 'json',
         configType: 'kiro',
         invocationProfile: 'kiro-hashtag',
-        detectMethod: () => fs_1.default.existsSync(expandPath('~/.kiro')),
+        detectMethod: guiAppDetect(() => fs_1.default.existsSync(expandPath('~/.kiro')), 'Kiro'),
         description: 'Kiro AI-powered IDE',
         downloadUrl: 'https://kiro.dev/',
     },
@@ -163,7 +196,7 @@ exports.IDE_CONFIGS = [
         configType: 'kiro',
         adapterConfigType: 'cursor',
         invocationProfile: 'cursor-mention',
-        detectMethod: detectCursor,
+        detectMethod: guiAppDetect(detectCursor, 'Cursor'),
         alternativePaths: [
             '~/Library/Application Support/Cursor/mcp.json',
             '~/AppData/Roaming/Cursor/mcp.json',
@@ -182,7 +215,7 @@ exports.IDE_CONFIGS = [
         configFormat: 'json',
         configType: 'vscode',
         invocationProfile: 'vscode-prompt',
-        detectMethod: detectVSCode,
+        detectMethod: guiAppDetect(detectVSCode, 'Visual Studio Code'),
         alternativePaths: [
             '~/Library/Application Support/Code/User/mcp.json',
             '~/AppData/Roaming/Code/User/mcp.json',
@@ -219,7 +252,7 @@ exports.IDE_CONFIGS = [
         configFormat: 'json',
         configType: 'windsurf',
         invocationProfile: 'windsurf-command',
-        detectMethod: detectWindsurf,
+        detectMethod: guiAppDetect(detectWindsurf, 'Windsurf'),
         alternativePaths: [
             '~/Library/Application Support/Windsurf/mcp_config.json',
             '~/AppData/Roaming/Windsurf/mcp_config.json',

package/dist/src/first-run/install-state.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.maskInstallKey = maskInstallKey;
 exports.createInitialFirstRunState = createInitialFirstRunState;
 exports.loadFirstRunState = loadFirstRunState;
 exports.saveFirstRunState = saveFirstRunState;

package/dist/src/first-run/server.js

@@ -183,6 +183,19 @@ class FirstRunServer {
                 return res.status(500).json({ error: error instanceof Error ? error.message : 'Could not run row.' });
             }
         });
+        // Issue #646: accept a user-pasted key when first-run was launched without one
+        // (the no-terminal macOS installer path).
+        this.app.post('/api/first-run/set-key', (req, res) => {
+            const { key } = req.body || {};
+            if (!key || typeof key !== 'string') {
+                return res.status(400).json({ ok: false, error: 'key is required.' });
+            }
+            const result = this.sessionService.setKey(key);
+            if (!result.ok) {
+                return res.status(400).json({ ok: false, error: result.message });
+            }
+            return res.json({ ok: true, session: this.sessionService.getSession() });
+        });
         this.app.post('/api/first-run/agent/change', (req, res) => {
             try {
                 return res.json(this.sessionService.changeAgent(req.body || {}));

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

@@ -200,7 +200,10 @@ function surfaceForAgent(option) {
 }
 class FirstRunSessionService {
     constructor(options) {
-        this.key = options.key;
+        // Issue #646: the key may be absent when first-run is launched by the macOS
+        // installer (.pkg) instead of `fraim first-run --key=…`. In that case the
+        // wizard prompts the user to paste their key (see setKey / needsKey).
+        this.key = options.key || '';
         this.headless = options.headless === true;
         this.fakeMode = getFakeStateMode();
         this.fakeStderr =
@@ -449,8 +452,24 @@ class FirstRunSessionService {
             agentOptions: types_1.FIRST_RUN_AGENT_OPTIONS,
             currentAgentId: this.state.agentId,
             supportedAgents,
+            needsKey: !this.key,
         };
     }
+    /**
+     * Issue #646: accept a user-pasted FRAIM key when first-run was launched
+     * without one (the no-terminal macOS installer path). Returns ok=false with a
+     * message on an invalid key so the wizard can show inline guidance.
+     */
+    setKey(rawKey) {
+        const key = (rawKey || '').trim();
+        if (!/^fraim_[A-Za-z0-9]+$/.test(key)) {
+            return { ok: false, message: 'That doesn\'t look like a FRAIM key. It should start with "fraim_" — copy it from your account page.' };
+        }
+        this.key = key;
+        this.state.installKeyRef = (0, install_state_1.maskInstallKey)(key);
+        this.persist();
+        return { ok: true };
+    }
     respond(message, ok) {
         return {
             ok,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim",
-  "version": "2.0.175",
+  "version": "2.0.177",
   "description": "FRAIM CLI - Framework for Rigor-based AI Management (alias for fraim-framework)",
   "main": "index.js",
   "bin": {
@@ -28,6 +28,8 @@
     "hub:desktop": "npm run build && electron dist/src/ai-hub/desktop-main.js",
     "hub:dev": "tsx scripts/start-hub-dev.ts",
     "firstrun:dev": "tsx scripts/start-firstrun-dev.ts",
+    "sign:mac": "bash scripts/sign-macos-installer.sh",
+    "build:mac-installer": "bash scripts/build-macos-installer.sh",
     "start:fraim": "tsx src/fraim-mcp-server.ts",
     "dev:fraim": "tsx --watch src/fraim-mcp-server.ts",
     "serve:website": "node fraim-pro/serve.js",

package/public/first-run/script.js

@@ -580,8 +580,72 @@
     }
   }
 
+  // Issue #646: when first-run was launched without a key (the no-terminal macOS
+  // installer path), gate the whole wizard behind a paste-your-key step.
+  function renderKeyEntry() {
+    CHECKLIST_EL.className = 'setup-shell';
+    CHECKLIST_EL.innerHTML = '';
+    PRIMARY_BUTTON.style.display = 'none';
+    setHeader('Set up FRAIM', 'Paste the FRAIM key from your account page to get started.');
+
+    const card = document.createElement('div');
+    card.className = 'setup-pane';
+    card.setAttribute('data-testid', 'key-entry');
+
+    const label = document.createElement('label');
+    label.className = 'pane-copy';
+    label.setAttribute('for', 'fraim-key-input');
+    label.textContent = 'Your FRAIM key';
+    card.appendChild(label);
+
+    const input = document.createElement('input');
+    input.type = 'text';
+    input.id = 'fraim-key-input';
+    input.className = 'key-input';
+    input.placeholder = 'fraim_…';
+    input.autocapitalize = 'off';
+    input.autocomplete = 'off';
+    input.spellcheck = false;
+    input.setAttribute('data-testid', 'key-input');
+    card.appendChild(input);
+
+    const err = document.createElement('p');
+    err.className = 'locked-note';
+    err.setAttribute('data-testid', 'key-error');
+    err.hidden = true;
+    card.appendChild(err);
+
+    const submit = button('Continue', 'primary');
+    submit.setAttribute('data-testid', 'key-submit');
+    const onSubmit = async () => {
+      const value = input.value.trim();
+      err.hidden = true;
+      submit.disabled = true;
+      submit.textContent = 'Checking…';
+      try {
+        const resp = await api('/api/first-run/set-key', 'POST', { key: value });
+        state.session = resp.session;
+        if (!state.session.state.agentInstalls) state.session.state.agentInstalls = {};
+        state.activeStep = chooseActiveStep();
+        render();
+      } catch (e) {
+        err.textContent = e.message || 'That key was not accepted. Copy it again from your account page.';
+        err.hidden = false;
+        submit.disabled = false;
+        submit.textContent = 'Continue';
+      }
+    };
+    submit.addEventListener('click', onSubmit);
+    input.addEventListener('keydown', (e) => { if (e.key === 'Enter') onSubmit(); });
+    card.appendChild(submit);
+
+    CHECKLIST_EL.appendChild(card);
+    input.focus();
+  }
+
   function render() {
     if (!state.session) return;
+    if (state.session.needsKey) { renderKeyEntry(); return; }
     if (!STEP_ORDER.includes(state.activeStep)) state.activeStep = chooseActiveStep();
     renderShell((pane) => {
       if (state.activeStep === 'prereqs') renderPrereqs(pane);

package/public/first-run/styles.css

@@ -494,6 +494,20 @@ body {
   font-size: 14px;
 }
 .locked-note { color: var(--warn); }
+
+/* Issue #646: paste-your-key step (no-terminal macOS installer path). */
+.key-input {
+  width: 100%;
+  margin: 10px 0 4px;
+  padding: 10px 12px;
+  font-family: ui-monospace, 'SFMono-Regular', Menlo, monospace;
+  font-size: 14px;
+  border: 1px solid var(--border, #2c3343);
+  border-radius: 8px;
+  background: var(--panel, #12151c);
+  color: var(--text, #e6e9ef);
+}
+.key-input:focus-visible { outline: 2px solid var(--accent-strong, #6366f1); outline-offset: 1px; }
 .row-list {
   list-style: none;
   margin: 0;