fraim-hub 2.0.207 → 2.0.209

package/bin/fraim-hub.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 try {
   const { createFraimHubProgram } = require('../dist/src/cli/fraim-hub.js');

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

@@ -80,7 +80,10 @@ function openDesktopWindow(projectPath, preferredPort) {
     if (!electronBinary || !desktopEntry) {
         return false;
     }
-    const child = (0, child_process_1.spawn)(electronBinary, [desktopEntry, '--project-path', projectPath, '--port', String(preferredPort)], {
+    const args = projectPath
+        ? [desktopEntry, '--project-path', projectPath, '--port', String(preferredPort)]
+        : [desktopEntry, '--port', String(preferredPort)];
+    const child = (0, child_process_1.spawn)(electronBinary, args, {
         detached: true,
         stdio: 'ignore',
     });
@@ -182,7 +185,7 @@ async function reconcileRunningHub(flags) {
 async function runHub(options) {
     const { AiHubServer, findAvailablePort } = await Promise.resolve().then(() => __importStar(require('./server')));
     const preferredPort = options.port || (0, git_utils_1.getPort)() + 100;
-    const projectPath = path_1.default.resolve(options.projectPath || process.cwd());
+    const projectPath = options.projectPath ? path_1.default.resolve(options.projectPath) : undefined;
     if (options.open) {
         const wantDesktop = !options.browser;
         if (wantDesktop) {
@@ -191,22 +194,25 @@ async function runHub(options) {
         const openedDesktop = wantDesktop && openDesktopWindow(projectPath, preferredPort);
         if (!openedDesktop) {
             const port = await findAvailablePort(preferredPort);
-            const server = new AiHubServer({ projectPath });
+            const server = new AiHubServer(projectPath ? { projectPath } : {});
             await server.start(port);
             const url = `http://127.0.0.1:${port}/ai-hub/`;
             console.log(`AI Hub running at ${url}`);
-            console.log(`Project path: ${projectPath}`);
+            console.log(`Project path: ${server.getProjectPath()}`);
             openBrowser(url);
             return;
         }
         console.log('AI Hub desktop shell launched.');
-        console.log(`Project path: ${projectPath}`);
+        if (projectPath)
+            console.log(`Project path: ${projectPath}`);
+        else
+            console.log('Project path: loaded from saved Hub state');
         return;
     }
     const port = await findAvailablePort(preferredPort);
-    const server = new AiHubServer({ projectPath });
+    const server = new AiHubServer(projectPath ? { projectPath } : {});
     await server.start(port);
     const url = `http://127.0.0.1:${port}/ai-hub/`;
     console.log(`AI Hub running at ${url}`);
-    console.log(`Project path: ${projectPath}`);
+    console.log(`Project path: ${server.getProjectPath()}`);
 }

package/dist/src/ai-hub/desktop-main.js

@@ -33,7 +33,7 @@ function preferredWindowSize() {
     };
 }
 function parseArgs(argv) {
-    let projectPath = process.cwd();
+    let projectPath;
     let preferredPort = 43091;
     for (let i = 0; i < argv.length; i += 1) {
         if (argv[i] === '--project-path' && argv[i + 1]) {
@@ -355,7 +355,7 @@ async function launchDesktopShell(options) {
     // Fast on subsequent launches (file read); ~200ms on first launch (key gen).
     const certBundle = await (0, cert_store_1.loadOrCreateCert)();
     server = new server_1.AiHubServer({
-        projectPath: options.projectPath,
+        ...(options.projectPath ? { projectPath: options.projectPath } : {}),
         // Issue #701: no local DB. Persona/manager-team state resolves through the hosted
         // server via the Hub's default remote gateway (authenticated by the user's API key).
         httpsPort,
@@ -370,6 +370,7 @@ async function launchDesktopShell(options) {
         },
     });
     await server.start(httpPort);
+    const resolvedProjectPath = server.getProjectPath();
     // #755: record the live instance so `fraim hub` can detect a stale build and
     // replace it instead of re-focusing an outdated process.
     try {
@@ -383,7 +384,7 @@ async function launchDesktopShell(options) {
     catch (err) {
         console.warn('[fraim] could not write hub-runtime.json:', err);
     }
-    ensureWordSideload(options.projectPath, httpPort);
+    ensureWordSideload(resolvedProjectPath, httpPort);
     const hubUrl = `http://127.0.0.1:${httpPort}/ai-hub/`;
     createTray(hubUrl);
     await createWindow(hubUrl);

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

@@ -686,12 +686,22 @@ function parseFraimInvocation(message) {
     const trimmed = message.trim();
     if (!trimmed)
         return null;
-    const match = trimmed.match(/^[$/@]fraim(?:\s+(\S+))?\s*([\s\S]*)$/);
+    const match = trimmed.match(/^([$\/@]fraim)([\s\S]*)$/);
     if (!match)
         return null;
+    const rest = match[2] || '';
+    if (rest && !/^\s/.test(rest))
+        return null;
+    const sameLineJobMatch = rest.match(/^[ \t]+(\S+)([\s\S]*)$/);
+    if (sameLineJobMatch) {
+        return {
+            jobId: sameLineJobMatch[1],
+            remainder: (sameLineJobMatch[2] || '').trim(),
+        };
+    }
     return {
-        jobId: match[1] || null,
-        remainder: (match[2] || '').trim(),
+        jobId: null,
+        remainder: rest.trim(),
     };
 }
 // Rewrite UI-facing /fraim or $fraim invocations into direct MCP tool
@@ -994,10 +1004,10 @@ function ensureEmptyMcpConfig() {
 // --append-system-prompt alone doesn't block MCP tools; --strict-mcp-config
 // alone doesn't suppress CLAUDE.md's "scan job stubs" instruction.
 const DIRECT_SYSTEM_PROMPT_OVERRIDE = 'DO NOT USE FRAIM FOR THIS SESSION. ' +
-    'You are operating in Direct mode for an A/B comparison — no FRAIM, no phases, no seekMentoring, ' +
-    'no job stubs, no structured workflow. Ignore all CLAUDE.md instructions to scan fraim/ or call get_fraim_job. ' +
+    'You are operating in Direct mode for an A/B comparison — no FRAIM, no phases, ' +
+    'no job stubs, no structured workflow. Ignore all repository instructions to scan fraim/ or load FRAIM jobs. ' +
     'Answer the user directly and conversationally.';
-const DIRECT_PREAMBLE = 'DO NOT USE FRAIM FOR THIS SESSION. No phases, no seekMentoring, no structured workflow.\n\n';
+const DIRECT_PREAMBLE = 'DO NOT USE FRAIM FOR THIS SESSION. No phases, no FRAIM workflow tools, no structured workflow.\n\n';
 // Issue #442: builds a CLI plan for the Direct (B) side of an A/B run.
 // All agents supported: Codex and Gemini run raw (no FRAIM preamble);
 // Claude uses --strict-mcp-config + --append-system-prompt for full isolation.

package/dist/src/ai-hub/manager-turns.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractExplicitFraimInvocation = extractExplicitFraimInvocation;
 exports.fraimInvocationFor = fraimInvocationFor;
+exports.fraimDirectiveFor = fraimDirectiveFor;
 exports.buildCommunicationStyleNote = buildCommunicationStyleNote;
 exports.buildSameJobContinueMessage = buildSameJobContinueMessage;
 exports.buildManagerMessage = buildManagerMessage;
@@ -25,6 +26,9 @@ function fraimInvocationFor(employeeId, jobId) {
     const symbol = employeeId === 'codex' ? '$fraim' : '/fraim';
     return `${symbol} ${jobId}`;
 }
+function fraimDirectiveFor(employeeId) {
+    return employeeId === 'codex' ? '$fraim' : '/fraim';
+}
 // #521: a Hub-injected communication-style note so the employee's messages to the
 // manager stay about the JOB and its outcomes — not the FRAIM machinery (seeking
 // mentoring, tool calls, git, phase switches). The structured signals (the
@@ -54,6 +58,11 @@ function buildManagerMessage(employeeId, jobId, kind, instructions, stubPath) {
     const explicit = extractExplicitFraimInvocation(trimmed);
     const effectiveJobId = explicit?.jobId || jobId;
     const invocation = fraimInvocationFor(employeeId, effectiveJobId);
+    if (!invocation && effectiveJobId === '__freeform__' && kind === 'start') {
+        const directive = fraimDirectiveFor(employeeId);
+        const remainder = explicit ? explicit.remainder : trimmed;
+        return remainder ? `${directive}\n\n${remainder}` : directive;
+    }
     if (!invocation)
         return explicit?.remainder || trimmed;
     const remainder = explicit ? explicit.remainder : trimmed;

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

@@ -39,18 +39,21 @@ function projectPathExists(projectPath) {
 function projectIdForPath(projectPath) {
     return `p-${(0, crypto_1.createHash)('sha1').update(canonicalProjectPath(projectPath)).digest('base64url').slice(0, 16)}`;
 }
-function normalizeRemovedProjectPaths(raw, currentProjectPath) {
+// Issue #788: tombstones are canonicalized and de-duplicated, but NEVER dropped for
+// being the current project. The "current project is always visible" rule (#719) is a
+// DISPLAY concern handled in normalizeAiHubProjectList (the current entry bypasses the
+// tombstone filter). The original #726 code dropped the current-project tombstone HERE,
+// so load()/saveProjects()/bootstrap silently erased it from disk whenever the deleted
+// folder was the open workspace — an implicit revive that resurrected the project on the
+// next add. Revive must be explicit (reviveRemovedPaths only; #726 contract).
+function normalizeRemovedProjectPaths(raw) {
     if (!Array.isArray(raw))
         return [];
-    const currentKey = currentProjectPath ? canonicalProjectPath(currentProjectPath) : null;
     const seen = new Set();
     for (const value of raw) {
         if (typeof value !== 'string' || value.trim().length === 0)
             continue;
-        const key = canonicalProjectPath(value);
-        if (currentKey && key === currentKey)
-            continue;
-        seen.add(key);
+        seen.add(canonicalProjectPath(value));
     }
     return Array.from(seen);
 }
@@ -100,22 +103,33 @@ function normalizeProjectEntry(raw, fallbackPath) {
     };
 }
 function normalizeAiHubProjectList(projects, currentProjectPath, options = {}) {
+    // Issue #788: project identity is the CANONICAL path (case-insensitive on win32),
+    // matching both the tombstone comparison and the conversation store. De-duping by the
+    // case-preserving path (the old behavior) let the same folder in two casings — one from
+    // preferences.projects, one from a conversation bucket key — survive as two entries: the
+    // reported "2 instances". The map value keeps the first-seen case-preserving folderPath
+    // for display (the current project is added first, so its real casing wins).
     const byPath = new Map();
-    const currentKey = currentProjectPath ? normalizeProjectPath(currentProjectPath) : null;
-    const removedKeys = new Set(normalizeRemovedProjectPaths(options.removedProjectPaths, currentProjectPath));
-    const add = (entry) => {
+    const currentCanonical = currentProjectPath ? canonicalProjectPath(currentProjectPath) : null;
+    const removedKeys = new Set(normalizeRemovedProjectPaths(options.removedProjectPaths));
+    const add = (entry, isCurrent = false) => {
         if (!entry)
             return;
-        const key = normalizeProjectPath(entry.folderPath);
-        if (removedKeys.has(canonicalProjectPath(key)))
+        const displayPath = normalizeProjectPath(entry.folderPath);
+        const dedupKey = canonicalProjectPath(displayPath);
+        // Issue #788: the current project is always shown in its own workspace, even when
+        // tombstoned (#719 never-empty Hub). This is a display override ONLY — the tombstone
+        // is neither erased here nor in persistence, so switching away re-hides the project
+        // and no subsequent add can resurrect it.
+        if (!isCurrent && removedKeys.has(dedupKey))
             return;
-        if (!options.includeMissing && key !== currentKey && !projectPathExists(key))
+        if (!options.includeMissing && dedupKey !== currentCanonical && !projectPathExists(displayPath))
             return;
-        const existing = byPath.get(key);
-        byPath.set(key, existing ? { ...existing, ...entry, folderPath: key } : { ...entry, folderPath: key });
+        const existing = byPath.get(dedupKey);
+        byPath.set(dedupKey, existing ? { ...existing, ...entry, folderPath: existing.folderPath } : { ...entry, folderPath: displayPath });
     };
     if (currentProjectPath)
-        add(normalizeProjectEntry({ folderPath: currentProjectPath }, currentProjectPath));
+        add(normalizeProjectEntry({ folderPath: currentProjectPath }, currentProjectPath), true);
     for (const project of projects)
         add(normalizeProjectEntry(project));
     return withUniqueProjectIds(Array.from(byPath.values()));
@@ -130,7 +144,7 @@ class AiHubPreferencesStore {
         }
         try {
             const raw = JSON.parse(fs_1.default.readFileSync(this.stateFilePath, 'utf8'));
-            const removedProjectPaths = normalizeRemovedProjectPaths(raw.removedProjectPaths, projectPath);
+            const removedProjectPaths = normalizeRemovedProjectPaths(raw.removedProjectPaths);
             return {
                 projectPath: raw.projectPath || projectPath,
                 employeeId: (raw.employeeId === 'claude' || raw.employeeId === 'codex' || raw.employeeId === 'gemini' || raw.employeeId === 'copilot') ? raw.employeeId : DEFAULT_EMPLOYEE,
@@ -158,8 +172,8 @@ class AiHubPreferencesStore {
     saveProjects(projectPath, projects, options = {}) {
         const normalizedProjectPath = normalizeProjectPath(projectPath);
         const preferences = this.load(normalizedProjectPath);
-        const reviveKeys = new Set(normalizeRemovedProjectPaths(options.reviveRemovedPaths, normalizedProjectPath));
-        const removedProjectPaths = normalizeRemovedProjectPaths(preferences.removedProjectPaths, normalizedProjectPath)
+        const reviveKeys = new Set(normalizeRemovedProjectPaths(options.reviveRemovedPaths));
+        const removedProjectPaths = normalizeRemovedProjectPaths(preferences.removedProjectPaths)
             .filter((removedPath) => !reviveKeys.has(removedPath));
         const nextProjects = normalizeAiHubProjectList(projects, normalizedProjectPath, { removedProjectPaths });
         this.save({ ...preferences, projectPath: normalizedProjectPath, projects: nextProjects, removedProjectPaths });
@@ -168,7 +182,7 @@ class AiHubPreferencesStore {
     mergeProjects(projectPath, projects) {
         const normalizedProjectPath = normalizeProjectPath(projectPath);
         const preferences = this.load(normalizedProjectPath);
-        const removedProjectPaths = normalizeRemovedProjectPaths(preferences.removedProjectPaths, normalizedProjectPath);
+        const removedProjectPaths = normalizeRemovedProjectPaths(preferences.removedProjectPaths);
         const nextProjects = normalizeAiHubProjectList([...(preferences.projects || []), ...projects], normalizedProjectPath, { removedProjectPaths });
         this.save({ ...preferences, projectPath: normalizedProjectPath, projects: nextProjects, removedProjectPaths });
         return nextProjects;
@@ -176,7 +190,7 @@ class AiHubPreferencesStore {
     removeProject(projectPath, projects, removedProjectPath) {
         const normalizedProjectPath = normalizeProjectPath(projectPath);
         const preferences = this.load(normalizedProjectPath);
-        const removedProjectPaths = normalizeRemovedProjectPaths([...(preferences.removedProjectPaths || []), removedProjectPath], normalizedProjectPath);
+        const removedProjectPaths = normalizeRemovedProjectPaths([...(preferences.removedProjectPaths || []), removedProjectPath]);
         const nextProjects = normalizeAiHubProjectList(projects, normalizedProjectPath, { removedProjectPaths });
         this.save({ ...preferences, projectPath: normalizedProjectPath, projects: nextProjects, removedProjectPaths });
         return nextProjects;