fraim-hub 2.0.208 → 2.0.209

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;

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

@@ -146,6 +146,13 @@ const FRAIM_INTERNAL_JOB_IDS = new Set([
     'setup-remote-hub',
     'update-registry-override',
 ]);
+const DEFAULT_CONVERSATION_FLUSH_DELAY_MS = 2000;
+function conversationFlushDelayMs() {
+    const configured = Number(process.env.FRAIM_HUB_CONVERSATION_FLUSH_MS);
+    if (Number.isFinite(configured) && configured >= 0)
+        return configured;
+    return DEFAULT_CONVERSATION_FLUSH_DELAY_MS;
+}
 function listHubPersonaBundles() {
     return loadPersonaCapabilityModule()?.listPersonaCapabilityBundles() ?? [];
 }
@@ -1209,6 +1216,8 @@ class AiHubServer {
         this.app = (0, express_1.default)();
         this.runRegistry = new AiHubRunRegistry();
         this.cronHandles = new Map();
+        this.pendingConversationWrites = new Map();
+        this.conversationFlushTimer = null;
         this.preferencesStore = options.preferencesStore || new preferences_1.AiHubPreferencesStore();
         this.projectPath = options.projectPath
             ? path_1.default.resolve(options.projectPath)
@@ -1398,6 +1407,7 @@ class AiHubServer {
         }
     }
     async stop() {
+        this.flushPendingRunConversations();
         const closeServer = (srv) => new Promise((resolve, reject) => {
             const closable = srv;
             closable.closeIdleConnections?.();
@@ -1617,7 +1627,7 @@ class AiHubServer {
             },
         };
     }
-    persistRunConversation(run, activeId) {
+    persistRunConversationNow(run, activeId) {
         try {
             // Issue #708: route the record to its scope bucket (manager/company runs get a
             // project-independent home); project runs continue to key by project path.
@@ -1629,6 +1639,30 @@ class AiHubServer {
             console.warn('[ai-hub] conversation store write failed:', error instanceof Error ? error.message : error);
         }
     }
+    persistRunConversation(run, activeId) {
+        this.pendingConversationWrites.delete(run.id);
+        this.persistRunConversationNow(run, activeId);
+    }
+    scheduleRunConversationPersistence(run, activeId) {
+        this.pendingConversationWrites.set(run.id, { run, activeId });
+        if (this.conversationFlushTimer)
+            return;
+        this.conversationFlushTimer = setTimeout(() => {
+            this.flushPendingRunConversations();
+        }, conversationFlushDelayMs());
+        this.conversationFlushTimer.unref?.();
+    }
+    flushPendingRunConversations() {
+        if (this.conversationFlushTimer) {
+            clearTimeout(this.conversationFlushTimer);
+            this.conversationFlushTimer = null;
+        }
+        const pending = Array.from(this.pendingConversationWrites.values());
+        this.pendingConversationWrites.clear();
+        for (const entry of pending) {
+            this.persistRunConversationNow(entry.run, entry.activeId);
+        }
+    }
     // Issue #512 (S3, R13) — derive the four Get-started step states, then let any
     // persisted `true` in ~/.fraim/{install-state,preferences}.json override the
     // derivation (so a completed step stays completed even if its signal vanishes).
@@ -1743,7 +1777,7 @@ class AiHubServer {
                 });
                 const updatedChild = this.runRegistry.get(childRun.id);
                 if (updatedChild)
-                    this.persistRunConversation(updatedChild);
+                    this.scheduleRunConversationPersistence(updatedChild);
             },
             onExit: (exitCode) => {
                 this.runRegistry.update(childRun.id, (current) => {
@@ -1893,7 +1927,7 @@ class AiHubServer {
                 });
                 const updated = this.runRegistry.get(managerRun.id);
                 if (updated)
-                    this.persistRunConversation(updated, updated.conversationId || updated.id);
+                    this.scheduleRunConversationPersistence(updated, updated.conversationId || updated.id);
             },
             onExit: (exitCode) => {
                 this.runRegistry.update(managerRun.id, (current) => {
@@ -2969,7 +3003,7 @@ class AiHubServer {
                         const updated = this.runRegistry.get(run.id);
                         if (updated) {
                             this.maybeStartDelegatedChildRuns(updated);
-                            this.persistRunConversation(updated, updated.conversationId || updated.id);
+                            this.scheduleRunConversationPersistence(updated, updated.conversationId || updated.id);
                         }
                     },
                     onExit: (exitCode) => {
@@ -3164,7 +3198,7 @@ class AiHubServer {
                         const updated = this.runRegistry.get(run.id);
                         if (updated) {
                             this.maybeStartDelegatedChildRuns(updated);
-                            this.persistRunConversation(updated, updated.conversationId || updated.id);
+                            this.scheduleRunConversationPersistence(updated, updated.conversationId || updated.id);
                         }
                     },
                     onExit: (exitCode) => {
@@ -3270,7 +3304,7 @@ class AiHubServer {
                         });
                         const updated = this.runRegistry.get(run.id);
                         if (updated)
-                            this.persistRunConversation(updated, updated.conversationId || updated.id);
+                            this.scheduleRunConversationPersistence(updated, updated.conversationId || updated.id);
                     },
                     onExit: (exitCode) => {
                         this.runRegistry.update(run.id, (current) => {
@@ -3828,7 +3862,7 @@ class AiHubServer {
                 });
                 const updated = this.runRegistry.get(run.id);
                 if (updated)
-                    this.persistRunConversation(updated, updated.conversationId || updated.id);
+                    this.scheduleRunConversationPersistence(updated, updated.conversationId || updated.id);
             },
             onExit: (exitCode) => {
                 this.runRegistry.update(run.id, (r) => {

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

@@ -56,17 +56,20 @@ function buildDeferredToolBootstrapSection(profile) {
 function buildFraimInvocationBody(profile = 'none') {
     return `Follow this process:
 
-${buildDeferredToolBootstrapSection(profile)}1. **If the user did not specify a FRAIM job or topic**:
+${buildDeferredToolBootstrapSection(profile)}1. **Confirm FRAIM activation**:
+   Use this process only when the user explicitly invokes FRAIM, names a FRAIM job, asks what FRAIM job to run, or the active surface has already selected a FRAIM job. For ordinary requests, answer or work normally; do not scan FRAIM stubs first.
+
+2. **If the user did not specify a FRAIM job or topic after activation**:
    If local FRAIM job stubs are present in the workspace, inspect those first and match the request locally. Also inspect \`fraim/personalized-employee/jobs/\` for local overrides or repo-specific jobs. If local files are missing or you cannot inspect workspace files, call \`list_fraim_jobs()\` to view the full catalog, including any proxy-discoverable personalized jobs.
 
-2. **Find the match**:
-   Match the user's request to a FRAIM job from the local stub catalog, \`fraim/personalized-employee/jobs/\`, or the full \`list_fraim_jobs()\` response. If no job matches, try a likely FRAIM skill with \`get_fraim_file({ path: "skills/<likely-category>/<argument>.md" })\` and confirm the match with the user.
+3. **Find the match**:
+   If the user names an exact FRAIM job, call \`get_fraim_job({ job: "<job-name>" })\` directly. Otherwise, match the user's request to a FRAIM job from the local stub catalog, \`fraim/personalized-employee/jobs/\`, or the full \`list_fraim_jobs()\` response. If no exact or high-confidence job match exists, say that no FRAIM job matches and continue with normal tools or ask one concise clarification. Do not pick the nearest catalog job.
 
-3. **Load the full content**:
+4. **Load the full content**:
    - For jobs, call \`get_fraim_job({ job: "<matched-job-name>" })\`.
    - For skills, use the content returned by \`get_fraim_file(...)\`.
 
-4. **Execute**:
+5. **Execute**:
    - For jobs, follow the phased instructions and use \`seekMentoring\` when the job requires phase transitions.
    - For skills, apply the skill steps directly to the user's current context.
 `;
@@ -96,18 +99,18 @@ ${buildFraimInvocationBody('generic-tool-discovery')}
 `;
 }
 function buildCodexSkillContent() {
-    return `# FRAIM
-
+    return `# FRAIM
+
 ${buildFraimInvocationBody('codex-tool-search')}`;
 }
 function buildGrokSkillContent() {
-    return `# FRAIM
-
+    return `# FRAIM
+
 ${buildFraimInvocationBody('generic-tool-discovery')}`;
 }
 function buildWindsurfCommandContent() {
-    return `# FRAIM
-
+    return `# FRAIM
+
 ${buildFraimInvocationBody('generic-tool-discovery')}`;
 }
 function buildKiroCommandContent() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.208",
+  "version": "2.0.209",
   "description": "FRAIM Hub local companion package.",
   "main": "index.js",
   "bin": {
@@ -89,7 +89,7 @@
     "dotenv": "^16.4.7",
     "electron": "^41.2.2",
     "express": "^5.2.1",
-    "fraim": "2.0.208",
+    "fraim": "2.0.209",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",