fraim-framework 2.0.182 → 2.0.184

package/dist/src/ai-hub/conversation-store.js

@@ -68,6 +68,10 @@ class AiHubConversationStore {
     constructor(stateFilePath = path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'ai-hub-conversations.json')) {
         this.stateFilePath = stateFilePath;
     }
+    listProjectPaths() {
+        const state = this.readStore();
+        return Object.keys(state.projects || {}).map((projectPath) => normalizeProjectPath(projectPath));
+    }
     loadProject(projectPath) {
         const state = this.readStore();
         const normalizedProjectPath = normalizeProjectPath(projectPath);

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

@@ -52,6 +52,13 @@ function parseArgs(argv) {
     }
     return { projectPath, preferredPort };
 }
+function applyUserDataOverride() {
+    const userDataDir = process.env.FRAIM_AI_HUB_USER_DATA_DIR;
+    if (!userDataDir)
+        return;
+    fs_1.default.mkdirSync(userDataDir, { recursive: true });
+    electron_1.app.setPath('userData', userDataDir);
+}
 // ---------------------------------------------------------------------------
 // Tray icon resolution — prefers bundled icon, falls back to a 1×1 empty image
 // so the app never crashes if assets aren't present.
@@ -271,6 +278,7 @@ async function launchDesktopShell(options) {
 // ---------------------------------------------------------------------------
 async function bootstrap() {
     const options = parseArgs(process.argv.slice(2));
+    applyUserDataOverride();
     // Single-instance lock — if another instance is already running, focus it
     // and exit rather than spawning a second server + window.
     // Skip when FRAIM_AI_HUB_FAKE_HOST=1 (test mode) so Playwright can launch

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

@@ -592,7 +592,7 @@ 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+))?\s*([\s\S]*)$/);
     if (!match)
         return null;
     return {

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

@@ -6,14 +6,14 @@ exports.buildCommunicationStyleNote = buildCommunicationStyleNote;
 exports.buildManagerMessage = buildManagerMessage;
 function extractExplicitFraimInvocation(text) {
     const raw = String(text || '');
-    const match = raw.match(/(?:^|\n|\s)([$/]fraim)\s+([a-z0-9][a-z0-9-]*)(?=\s|$)/i);
+    const match = raw.match(/(?:^|\n|\s)([$/@]fraim)\s+([a-z0-9][a-z0-9-]*)(?=\s|$)/i);
     if (!match || match.index == null)
         return null;
     const before = raw.slice(0, match.index).trim();
     const after = raw.slice(match.index + match[0].length).trim();
     const remainder = [before, after].filter(Boolean).join('\n\n').trim();
     return {
-        symbol: match[1].toLowerCase() === '$fraim' ? '$fraim' : '/fraim',
+        symbol: match[1].toLowerCase(),
         jobId: match[2].toLowerCase(),
         remainder,
     };

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

@@ -4,7 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AiHubPreferencesStore = void 0;
+exports.normalizeAiHubProjectList = normalizeAiHubProjectList;
 const fs_1 = __importDefault(require("fs"));
+const crypto_1 = require("crypto");
 const path_1 = __importDefault(require("path"));
 const project_fraim_paths_1 = require("../core/utils/project-fraim-paths");
 const DEFAULT_CATEGORY = 'marketing';
@@ -16,7 +18,89 @@ const defaultPreferences = (projectPath) => ({
     recentJobIds: [],
     recentJobInstructions: {},
     personaKey: null,
+    projects: normalizeAiHubProjectList([], projectPath),
 });
+function normalizeProjectPath(projectPath) {
+    return path_1.default.resolve(projectPath || process.cwd());
+}
+function canonicalProjectPath(projectPath) {
+    const normalized = normalizeProjectPath(projectPath);
+    return process.platform === 'win32' ? normalized.toLowerCase() : normalized;
+}
+function projectPathExists(projectPath) {
+    try {
+        return fs_1.default.statSync(projectPath).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+function projectIdForPath(projectPath) {
+    return `p-${(0, crypto_1.createHash)('sha1').update(canonicalProjectPath(projectPath)).digest('base64url').slice(0, 16)}`;
+}
+function uniqueProjectId(entry, seenIds) {
+    const fallbackId = projectIdForPath(entry.folderPath);
+    const rawId = typeof entry.id === 'string' ? entry.id.trim() : '';
+    const preferredId = rawId && rawId !== 'p-current' ? rawId : fallbackId;
+    let id = preferredId;
+    let suffix = 2;
+    while (seenIds.has(id)) {
+        id = `${fallbackId}-${suffix}`;
+        suffix += 1;
+    }
+    seenIds.add(id);
+    return id;
+}
+function withUniqueProjectIds(projects) {
+    const seenIds = new Set();
+    return projects.map((entry) => ({ ...entry, id: uniqueProjectId(entry, seenIds) }));
+}
+function normalizeProjectEntry(raw, fallbackPath) {
+    if (!raw || typeof raw !== 'object')
+        return null;
+    const value = raw;
+    const rawPath = typeof value.folderPath === 'string'
+        ? value.folderPath
+        : (typeof value.path === 'string'
+            ? value.path
+            : (typeof value.folder === 'string' ? value.folder : fallbackPath));
+    if (!rawPath || typeof rawPath !== 'string')
+        return null;
+    const folderPath = normalizeProjectPath(rawPath);
+    const basename = path_1.default.basename(folderPath) || folderPath;
+    const rawId = typeof value.id === 'string' ? value.id.trim() : '';
+    // The employee roster is deliberately dropped here (not read, not persisted):
+    // it is derived from the bootstrap's hired personas at render time so it stays
+    // consistent across machines. Any `team` on incoming/legacy state is discarded.
+    return {
+        id: rawId || projectIdForPath(folderPath),
+        name: typeof value.name === 'string' && value.name.length > 0 ? value.name : basename,
+        folderPath,
+        intent: typeof value.intent === 'string' ? value.intent : '',
+        outcome: typeof value.outcome === 'string' ? value.outcome : '',
+        rules: typeof value.rules === 'string' ? value.rules : '',
+        brief: typeof value.brief === 'string' ? value.brief : (typeof value.intent === 'string' ? value.intent : ''),
+        updatedAt: typeof value.updatedAt === 'string' ? value.updatedAt : undefined,
+    };
+}
+function normalizeAiHubProjectList(projects, currentProjectPath, options = {}) {
+    const byPath = new Map();
+    const currentKey = currentProjectPath ? normalizeProjectPath(currentProjectPath) : null;
+    const add = (entry) => {
+        if (!entry)
+            return;
+        const key = normalizeProjectPath(entry.folderPath);
+        if (!options.includeMissing && key !== currentKey && !projectPathExists(key))
+            return;
+        const existing = byPath.get(key);
+        byPath.set(key, existing ? { ...existing, ...entry, folderPath: key } : { ...entry, folderPath: key });
+    };
+    if (currentProjectPath)
+        add(normalizeProjectEntry({ folderPath: currentProjectPath }, currentProjectPath));
+    for (const project of projects)
+        add(normalizeProjectEntry(project));
+    return withUniqueProjectIds(Array.from(byPath.values()));
+}
 class AiHubPreferencesStore {
     constructor(stateFilePath = path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'ai-hub-state.json')) {
         this.stateFilePath = stateFilePath;
@@ -37,6 +121,7 @@ class AiHubPreferencesStore {
                     : {},
                 personaKey: typeof raw.personaKey === 'string' ? raw.personaKey : null,
                 apiKey: typeof raw.apiKey === 'string' && raw.apiKey.length > 0 ? raw.apiKey : undefined,
+                projects: normalizeAiHubProjectList(Array.isArray(raw.projects) ? raw.projects : [], projectPath),
             };
         }
         catch {
@@ -47,6 +132,20 @@ class AiHubPreferencesStore {
         fs_1.default.mkdirSync(path_1.default.dirname(this.stateFilePath), { recursive: true });
         fs_1.default.writeFileSync(this.stateFilePath, JSON.stringify(preferences, null, 2));
     }
+    saveProjects(projectPath, projects) {
+        const normalizedProjectPath = normalizeProjectPath(projectPath);
+        const preferences = this.load(normalizedProjectPath);
+        const nextProjects = normalizeAiHubProjectList(projects, normalizedProjectPath);
+        this.save({ ...preferences, projectPath: normalizedProjectPath, projects: nextProjects });
+        return nextProjects;
+    }
+    mergeProjects(projectPath, projects) {
+        const normalizedProjectPath = normalizeProjectPath(projectPath);
+        const preferences = this.load(normalizedProjectPath);
+        const nextProjects = normalizeAiHubProjectList([...(preferences.projects || []), ...projects], normalizedProjectPath);
+        this.save({ ...preferences, projectPath: normalizedProjectPath, projects: nextProjects });
+        return nextProjects;
+    }
     remember(preferences, jobId, instructions) {
         const recentJobIds = jobId
             ? [jobId, ...preferences.recentJobIds.filter((value) => value !== jobId)].slice(0, 8)

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

@@ -1009,6 +1009,22 @@ function ensureDirectoryPath(projectPath) {
     }
     return resolved;
 }
+function normalizedDirectoryPath(projectPath) {
+    const resolved = path_1.default.resolve(projectPath);
+    return process.platform === 'win32' ? resolved.toLowerCase() : resolved;
+}
+function sameDirectoryPath(left, right) {
+    return normalizedDirectoryPath(left) === normalizedDirectoryPath(right);
+}
+function deploymentProjectFilter(rawProjectPath, fallbackProjectPath) {
+    return ensureDirectoryPath(typeof rawProjectPath === 'string' && rawProjectPath.trim() ? rawProjectPath : fallbackProjectPath);
+}
+function deploymentBelongsToProject(deployment, projectPath, fallbackProjectPath) {
+    const deploymentProjectPath = typeof deployment.projectPath === 'string' && deployment.projectPath.trim()
+        ? deployment.projectPath
+        : fallbackProjectPath;
+    return sameDirectoryPath(deploymentProjectPath, projectPath);
+}
 // ---------------------------------------------------------------------------
 // Issue #512 (S3) — Hub bootstrap projection helpers.
 // ---------------------------------------------------------------------------
@@ -1373,6 +1389,19 @@ class AiHubServer {
         }
     }
     getHttpsPort() { return this.httpsPort; }
+    knownProjects(projectPath, extras = []) {
+        const normalizedProjectPath = path_1.default.resolve(projectPath || this.projectPath);
+        const preferences = this.preferencesStore.load(normalizedProjectPath);
+        const conversationProjects = this.conversationStore.listProjectPaths().map((folderPath) => ({ folderPath }));
+        return (0, preferences_1.normalizeAiHubProjectList)([
+            ...(preferences.projects || []),
+            ...conversationProjects,
+            ...extras,
+        ], normalizedProjectPath);
+    }
+    saveKnownProjects(projectPath, projects) {
+        return this.preferencesStore.saveProjects(path_1.default.resolve(projectPath || this.projectPath), this.knownProjects(projectPath, projects));
+    }
     async bootstrapResponse(projectPath, apiKey) {
         const normalizedProjectPath = path_1.default.resolve(projectPath || this.projectPath);
         const employees = this.hostRuntime.detectEmployees();
@@ -1402,6 +1431,9 @@ class AiHubServer {
         const managerTemplates = (0, catalog_1.discoverManagerTemplates)(normalizedProjectPath, catalogOptions);
         const { personas, subscriptionActive, workspaceId, userKey } = await this.computePersonas(apiKey || preferences.apiKey);
         const managerTeam = await this.computeManagerTeam(workspaceId, userKey);
+        const projects = this.knownProjects(normalizedProjectPath);
+        preferences = { ...preferences, projectPath: normalizedProjectPath, projects };
+        this.preferencesStore.save(preferences);
         // Issue #347: enrich the activeRun the same way GET /runs/:id does
         // so the bootstrap surface (used on first paint) carries stages and
         // live totals — not just the raw run state.
@@ -1418,6 +1450,7 @@ class AiHubServer {
             personas,
             subscriptionActive,
             activeRun,
+            projects,
             // Issue #512 (S3) — additive manager-flow projections.
             firstRun: this.computeFirstRun(normalizedProjectPath, jobs.length, personas),
             teamContext: this.computeTeamContext(normalizedProjectPath),
@@ -1818,12 +1851,9 @@ class AiHubServer {
         if (!resolvedJobId) {
             throw new Error('Choose a FRAIM job before starting a run, or start with /fraim <job-id>.');
         }
-        // #521: `display` is what the manager's conversation bubble shows — only their own
-        // words. The FRAIM invocation (`$fraim <job>`), the stub path, and the shared-
-        // browser / communication-style notes are system context for the AGENT, kept out
-        // of the bubble so the thread isn't cluttered with machinery. `message` (with all
-        // of it) is what the agent actually receives.
-        const display = (explicit?.remainder || instructions || '').trim();
+        // #696: `display` is the manager conversation bubble. Keep the full generated
+        // turn in `message`, but show only the host-specific FRAIM invocation.
+        const display = (0, manager_turns_1.fraimInvocationFor)(hostId, resolvedJobId) || (explicit?.remainder || instructions || '').trim();
         // #521: the shared-browser guidance is injected HERE, at the Hub layer — never
         // baked into the registry job/skill. It only appears when a shared browser is
         // available (env published at boot).
@@ -1852,13 +1882,12 @@ class AiHubServer {
         // as the target of the FRAIM invocation. The server picks the correct
         // invocation prefix ($fraim / /fraim) based on run.hostId — the UI never
         // passes raw invocation syntax.
-        const effectiveJobId = coachingJobId || run.jobId;
-        // #521: `display` = the manager's own words for the conversation bubble. When the
-        // manager typed nothing (a quick-coach button), fall back to the bare invocation
-        // so the bubble still shows what was triggered — but never the style note.
         const explicit = (0, manager_turns_1.extractExplicitFraimInvocation)(instructions);
+        const effectiveJobId = explicit?.jobId || coachingJobId || run.jobId;
+        // #696: the thread shows the invocation that the Hub sent, while the employee
+        // still receives the full manager turn plus the style note.
         const userText = (explicit?.remainder || instructions || '').trim();
-        const display = userText || (0, manager_turns_1.buildManagerMessage)(run.hostId, effectiveJobId, 'continue', '');
+        const display = (0, manager_turns_1.fraimInvocationFor)(run.hostId, effectiveJobId) || userText || (0, manager_turns_1.buildManagerMessage)(run.hostId, effectiveJobId, 'continue', '');
         return {
             message: (0, manager_turns_1.buildManagerMessage)(run.hostId, effectiveJobId, 'continue', instructions) + (0, manager_turns_1.buildCommunicationStyleNote)(),
             display,
@@ -2183,6 +2212,26 @@ class AiHubServer {
                 return res.status(400).json({ error: error instanceof Error ? error.message : 'Could not persist conversation.' });
             }
         });
+        this.app.get('/api/ai-hub/projects', (req, res) => {
+            const projectPath = typeof req.query.projectPath === 'string' && req.query.projectPath.length > 0
+                ? path_1.default.resolve(req.query.projectPath)
+                : this.projectPath;
+            return res.json({ projectPath, projects: this.knownProjects(projectPath), source: 'disk' });
+        });
+        this.app.put('/api/ai-hub/projects', (req, res) => {
+            try {
+                const body = (req.body ?? {});
+                const projectPath = ensureDirectoryPath(body.projectPath || this.projectPath);
+                if (!Array.isArray(body.projects)) {
+                    return res.status(400).json({ error: 'projects array required' });
+                }
+                const projects = this.saveKnownProjects(projectPath, body.projects);
+                return res.json({ projectPath, projects, source: 'disk' });
+            }
+            catch (error) {
+                return res.status(400).json({ error: error instanceof Error ? error.message : 'Could not persist projects.' });
+            }
+        });
         this.app.post('/api/ai-hub/api-key', (req, res) => {
             const { apiKey } = req.body;
             if (!apiKey || typeof apiKey !== 'string')
@@ -2925,9 +2974,15 @@ class AiHubServer {
             this.scheduleDeployment(deployment);
             return res.status(201).json(deployment);
         });
-        // GET /api/ai-hub/schedules — list all scheduled deployments.
-        this.app.get('/api/ai-hub/schedules', (_req, res) => {
-            return res.json(this.deploymentStore.load().filter((d) => d.type === 'scheduled'));
+        // GET /api/ai-hub/schedules — list scheduled deployments for one project.
+        this.app.get('/api/ai-hub/schedules', (req, res) => {
+            try {
+                const projectPath = deploymentProjectFilter(req.query.projectPath, this.projectPath);
+                return res.json(this.deploymentStore.load().filter((d) => d.type === 'scheduled' && deploymentBelongsToProject(d, projectPath, this.projectPath)));
+            }
+            catch (err) {
+                return res.status(400).json({ error: err instanceof Error ? err.message : 'Invalid project path.' });
+            }
         });
         // DELETE /api/ai-hub/schedules/:id — remove a scheduled deployment.
         this.app.delete('/api/ai-hub/schedules/:id', (req, res) => {
@@ -2945,7 +3000,7 @@ class AiHubServer {
         // PUT /api/ai-hub/schedules/:id — update an existing scheduled deployment.
         this.app.put('/api/ai-hub/schedules/:id', (req, res) => {
             const { id } = req.params;
-            const { label, jobId, cronExpr, hostId, instructions, allowConcurrent } = req.body ?? {};
+            const { label, jobId, projectPath, cronExpr, hostId, instructions, allowConcurrent } = req.body ?? {};
             if (cronExpr !== undefined) {
                 // eslint-disable-next-line @typescript-eslint/no-var-requires
                 const cronLib = require('node-cron');
@@ -2953,6 +3008,14 @@ class AiHubServer {
                     return res.status(400).json({ error: 'Invalid cron expression.' });
                 }
             }
+            let resolvedProjectPath;
+            try {
+                if (projectPath !== undefined)
+                    resolvedProjectPath = ensureDirectoryPath(projectPath || this.projectPath);
+            }
+            catch (err) {
+                return res.status(400).json({ error: err instanceof Error ? err.message : 'Invalid project path.' });
+            }
             const validEmployees = VALID_EMPLOYEE_IDS;
             let updated = null;
             const ok = this.deploymentStore.update(id, (dep) => {
@@ -2960,6 +3023,8 @@ class AiHubServer {
                     dep.label = label;
                 if (jobId !== undefined)
                     dep.jobId = jobId;
+                if (resolvedProjectPath !== undefined)
+                    dep.projectPath = resolvedProjectPath;
                 if (cronExpr !== undefined)
                     dep.cronExpr = cronExpr;
                 if (hostId !== undefined && validEmployees.includes(hostId))
@@ -3006,12 +3071,18 @@ class AiHubServer {
             this.deploymentStore.create(deployment);
             return res.status(201).json({ ...deployment, inboundUrl: `${this.hubBase}/api/ai-hub/webhooks/${deployment.id}/inbound` });
         });
-        // GET /api/ai-hub/webhooks — list all webhook deployments.
-        this.app.get('/api/ai-hub/webhooks', (_req, res) => {
+        // GET /api/ai-hub/webhooks — list webhook deployments for one project.
+        this.app.get('/api/ai-hub/webhooks', (req, res) => {
             const hubBase = this.hubBase;
-            return res.json(this.deploymentStore.load()
-                .filter((d) => d.type === 'webhook')
-                .map((d) => ({ ...d, inboundUrl: `${hubBase}/api/ai-hub/webhooks/${d.id}/inbound` })));
+            try {
+                const projectPath = deploymentProjectFilter(req.query.projectPath, this.projectPath);
+                return res.json(this.deploymentStore.load()
+                    .filter((d) => d.type === 'webhook' && deploymentBelongsToProject(d, projectPath, this.projectPath))
+                    .map((d) => ({ ...d, inboundUrl: `${hubBase}/api/ai-hub/webhooks/${d.id}/inbound` })));
+            }
+            catch (err) {
+                return res.status(400).json({ error: err instanceof Error ? err.message : 'Invalid project path.' });
+            }
         });
         // DELETE /api/ai-hub/webhooks/:id — remove a webhook deployment.
         this.app.delete('/api/ai-hub/webhooks/:id', (req, res) => {
@@ -3023,7 +3094,15 @@ class AiHubServer {
         // PUT /api/ai-hub/webhooks/:id — update an existing webhook deployment.
         this.app.put('/api/ai-hub/webhooks/:id', (req, res) => {
             const { id } = req.params;
-            const { label, jobId, hostId, instructions, allowConcurrent } = req.body ?? {};
+            const { label, jobId, projectPath, hostId, instructions, allowConcurrent } = req.body ?? {};
+            let resolvedProjectPath;
+            try {
+                if (projectPath !== undefined)
+                    resolvedProjectPath = ensureDirectoryPath(projectPath || this.projectPath);
+            }
+            catch (err) {
+                return res.status(400).json({ error: err instanceof Error ? err.message : 'Invalid project path.' });
+            }
             const validEmployees = VALID_EMPLOYEE_IDS;
             let updated = null;
             const ok = this.deploymentStore.update(id, (dep) => {
@@ -3031,6 +3110,8 @@ class AiHubServer {
                     dep.label = label;
                 if (jobId !== undefined)
                     dep.jobId = jobId;
+                if (resolvedProjectPath !== undefined)
+                    dep.projectPath = resolvedProjectPath;
                 if (hostId !== undefined && validEmployees.includes(hostId))
                     dep.hostId = hostId;
                 if (instructions !== undefined)

package/dist/src/cli/distribution/marketplace-bundles.js

@@ -95,11 +95,6 @@ function asArray(value) {
 function stringValue(value) {
     return typeof value === 'string' && value.trim() ? value : null;
 }
-function readPackageVersion(repoRoot, result) {
-    const relPath = 'package.json';
-    const packageJson = readJsonObject(repoRoot, relPath, result);
-    return packageJson ? stringValue(packageJson.version) : null;
-}
 function requireHttpsUrl(value, relPath, field, result) {
     const url = stringValue(value);
     if (!url) {
@@ -202,7 +197,7 @@ function validateTargetMatrix(repoRoot, result) {
     const relPath = path_1.default.join(TARGET_ROOT, 'marketplace-targets.json');
     const targetMatrix = readJsonObject(repoRoot, relPath, result);
     if (!targetMatrix) {
-        return { remoteMcpUrl: null, oauthAuthorizationServer: null, productVersion: null };
+        return { remoteMcpUrl: null, oauthAuthorizationServer: null, contactEmail: null };
     }
     assertEqual(targetMatrix.schema, 'fraim-marketplace-targets-v1', relPath, 'schema', result);
     assertEqual(targetMatrix.issue, 674, relPath, 'issue', result);
@@ -214,13 +209,12 @@ function validateTargetMatrix(repoRoot, result) {
     if (!remoteMcp) {
         addIssue(result.errors, relPath, 'remoteMcp must be an object');
     }
-    const productVersion = product ? stringValue(product.packageVersion) : null;
-    if (!productVersion) {
-        addIssue(result.errors, relPath, 'product.packageVersion must be set');
+    const contactEmail = product ? stringValue(product.contactEmail) : null;
+    if (!contactEmail) {
+        addIssue(result.errors, relPath, 'product.contactEmail must be set');
     }
-    const packageVersion = readPackageVersion(repoRoot, result);
-    if (productVersion && packageVersion) {
-        assertEqual(productVersion, packageVersion, relPath, 'product.packageVersion', result);
+    if (contactEmail && product) {
+        assertEqual(product.support, contactEmail, relPath, 'product.support', result);
     }
     const remoteMcpUrl = remoteMcp
         ? requireHttpsUrl(remoteMcp.url, relPath, 'remoteMcp.url', result)
@@ -229,7 +223,7 @@ function validateTargetMatrix(repoRoot, result) {
         ? requireHttpsUrl(remoteMcp.oauthAuthorizationServer, relPath, 'remoteMcp.oauthAuthorizationServer', result)
         : null;
     validateTargetEntries(repoRoot, relPath, asArray(targetMatrix.targets), result);
-    return { remoteMcpUrl, oauthAuthorizationServer, productVersion };
+    return { remoteMcpUrl, oauthAuthorizationServer, contactEmail };
 }
 function validateOpenAiAssets(repoRoot, openAiRoot, result) {
     assertFile(repoRoot, path_1.default.join(openAiRoot, 'README.md'), result);
@@ -254,6 +248,7 @@ function validateOpenAiPacketFields(packet, relPath, targetDetails, result) {
     else {
         assertEqual(app.name, 'FRAIM', relPath, 'app.name', result);
         requireHttpsUrl(app.website, relPath, 'app.website', result);
+        assertEqual(app.support, targetDetails.contactEmail, relPath, 'app.support', result);
         requireHttpsUrl(app.privacyPolicy, relPath, 'app.privacyPolicy', result);
         requireHttpsUrl(app.termsOfService, relPath, 'app.termsOfService', result);
     }
@@ -288,7 +283,7 @@ function validateOpenAiPacket(repoRoot, result, targetDetails) {
     assertEqual(packet.schema, 'fraim-openai-app-submission-packet-v1', relPath, 'schema', result);
     validateOpenAiPacketFields(packet, relPath, targetDetails, result);
 }
-function validatePolicyPages(repoRoot, result) {
+function validatePolicyPages(repoRoot, targetDetails, result) {
     for (const relPath of POLICY_PAGE_PATHS) {
         if (!assertFile(repoRoot, relPath, result)) {
             continue;
@@ -297,7 +292,7 @@ function validatePolicyPages(repoRoot, result) {
         if (!content.includes('FRAIM')) {
             addIssue(result.errors, relPath, 'policy page must identify FRAIM');
         }
-        if (!content.includes('support@fraimworks.ai')) {
+        if (targetDetails.contactEmail && !content.includes(targetDetails.contactEmail)) {
             addIssue(result.errors, relPath, 'policy page must include support contact');
         }
     }
@@ -337,11 +332,14 @@ function validateCodexManifestInterface(repoRoot, pluginRoot, manifestRelPath, m
         assertRelativeAsset(repoRoot, pluginRoot, screenshot, manifestRelPath, `interface.screenshots[${index}]`, result);
     }
 }
-function validateCodexManifest(repoRoot, pluginRoot, manifest, manifestRelPath, productVersion, result) {
+function validateCodexManifest(repoRoot, pluginRoot, manifest, manifestRelPath, contactEmail, result) {
     if (!manifest)
         return;
     assertEqual(manifest.name, 'fraim', manifestRelPath, 'name', result);
-    assertEqual(manifest.version, productVersion, manifestRelPath, 'version', result);
+    if (!stringValue(manifest.version)) {
+        addIssue(result.errors, manifestRelPath, 'version must be a non-empty string');
+    }
+    assertEqual(asObject(manifest.author)?.email, contactEmail, manifestRelPath, 'author.email', result);
     assertEqual(manifest.skills, './skills/', manifestRelPath, 'skills', result);
     assertEqual(manifest.mcpServers, './.mcp.json', manifestRelPath, 'mcpServers', result);
     const manifestInterface = asObject(manifest.interface);
@@ -400,17 +398,21 @@ function validateCodexPackage(repoRoot, result, targetDetails) {
     const manifest = readJsonObject(repoRoot, manifestRelPath, result);
     const mcpConfig = readJsonObject(repoRoot, mcpRelPath, result);
     validateCodexMarketplace(marketplace, marketplaceRelPath, result);
-    validateCodexManifest(repoRoot, pluginRoot, manifest, manifestRelPath, targetDetails.productVersion, result);
+    validateCodexManifest(repoRoot, pluginRoot, manifest, manifestRelPath, targetDetails.contactEmail, result);
     validateCodexMcpConfig(mcpConfig, mcpRelPath, targetDetails.remoteMcpUrl, result);
     validateCodexSkill(repoRoot, skillRelPath, result);
 }
-function validateSimpleMarketplaceManifest(marketplace, marketplaceRelPath, expectedName, expectedSource, productVersion, result) {
+function validateSimpleMarketplaceManifest(marketplace, marketplaceRelPath, expectedName, expectedSource, contactEmail, result) {
     if (!marketplace)
         return;
     assertEqual(marketplace.name, expectedName, marketplaceRelPath, 'name', result);
-    if (!asObject(marketplace.owner)) {
+    const owner = asObject(marketplace.owner);
+    if (!owner) {
         addIssue(result.errors, marketplaceRelPath, 'owner must be an object');
     }
+    else {
+        assertEqual(owner.email, contactEmail, marketplaceRelPath, 'owner.email', result);
+    }
     const entries = asArray(marketplace.plugins);
     const fraimEntry = entries
         .map((entry) => asObject(entry))
@@ -420,7 +422,13 @@ function validateSimpleMarketplaceManifest(marketplace, marketplaceRelPath, expe
         return;
     }
     assertEqual(fraimEntry.source, expectedSource, marketplaceRelPath, 'fraim.source', result);
-    assertEqual(fraimEntry.version, productVersion, marketplaceRelPath, 'fraim.version', result);
+    if (!stringValue(fraimEntry.version)) {
+        addIssue(result.errors, marketplaceRelPath, 'fraim.version must be a non-empty string');
+    }
+    const author = asObject(fraimEntry.author);
+    if (author) {
+        assertEqual(author.email, contactEmail, marketplaceRelPath, 'fraim.author.email', result);
+    }
 }
 function validateMcpRegistryPackage(repoRoot, result, targetDetails) {
     const registryRoot = path_1.default.join(TARGET_ROOT, 'mcp-registry');
@@ -436,7 +444,9 @@ function validateMcpRegistryPackage(repoRoot, result, targetDetails) {
     if (!description || description.length > 100) {
         addIssue(result.errors, serverRelPath, 'description must be a non-empty string of at most 100 characters');
     }
-    assertEqual(serverJson.version, targetDetails.productVersion, serverRelPath, 'version', result);
+    if (!stringValue(serverJson.version)) {
+        addIssue(result.errors, serverRelPath, 'version must be a non-empty string');
+    }
     requireHttpsUrl(serverJson.websiteUrl, serverRelPath, 'websiteUrl', result);
     const repository = asObject(serverJson.repository);
     assertEqual(repository?.url, 'https://github.com/mathursrus/FRAIM', serverRelPath, 'repository.url', result);
@@ -467,11 +477,14 @@ function validateCursorPackage(repoRoot, result, targetDetails) {
     const mcpConfig = readJsonObject(repoRoot, mcpRelPath, result);
     assertFile(repoRoot, path_1.default.join(cursorRoot, 'README.md'), result);
     assertFile(repoRoot, path_1.default.join(pluginRoot, 'README.md'), result);
-    validateSimpleMarketplaceManifest(rootMarketplace, ROOT_CURSOR_MARKETPLACE_PATH, 'fraim-marketplace', 'marketplaces/fraim/cursor/plugins/fraim', targetDetails.productVersion, result);
-    validateSimpleMarketplaceManifest(targetMarketplace, targetMarketplaceRelPath, 'fraim-marketplace', 'plugins/fraim', targetDetails.productVersion, result);
+    validateSimpleMarketplaceManifest(rootMarketplace, ROOT_CURSOR_MARKETPLACE_PATH, 'fraim-marketplace', 'marketplaces/fraim/cursor/plugins/fraim', targetDetails.contactEmail, result);
+    validateSimpleMarketplaceManifest(targetMarketplace, targetMarketplaceRelPath, 'fraim-marketplace', 'plugins/fraim', targetDetails.contactEmail, result);
     if (manifest) {
         assertEqual(manifest.name, 'fraim', manifestRelPath, 'name', result);
-        assertEqual(manifest.version, targetDetails.productVersion, manifestRelPath, 'version', result);
+        if (!stringValue(manifest.version)) {
+            addIssue(result.errors, manifestRelPath, 'version must be a non-empty string');
+        }
+        assertEqual(asObject(manifest.author)?.email, targetDetails.contactEmail, manifestRelPath, 'author.email', result);
         assertEqual(manifest.rules, 'rules/', manifestRelPath, 'rules', result);
         assertEqual(manifest.skills, 'skills/', manifestRelPath, 'skills', result);
         assertEqual(manifest.commands, 'commands/', manifestRelPath, 'commands', result);
@@ -514,10 +527,13 @@ function validateCopilotPackage(repoRoot, result, targetDetails) {
     const mcpConfig = readJsonObject(repoRoot, mcpRelPath, result);
     assertFile(repoRoot, path_1.default.join(vscodeRoot, 'README.md'), result);
     assertFile(repoRoot, path_1.default.join(pluginRoot, 'README.md'), result);
-    validateSimpleMarketplaceManifest(rootMarketplace, ROOT_COPILOT_MARKETPLACE_PATH, 'fraim-copilot-marketplace', 'marketplaces/fraim/vscode/plugins/fraim', targetDetails.productVersion, result);
+    validateSimpleMarketplaceManifest(rootMarketplace, ROOT_COPILOT_MARKETPLACE_PATH, 'fraim-copilot-marketplace', 'marketplaces/fraim/vscode/plugins/fraim', targetDetails.contactEmail, result);
     if (manifest) {
         assertEqual(manifest.name, 'fraim', manifestRelPath, 'name', result);
-        assertEqual(manifest.version, targetDetails.productVersion, manifestRelPath, 'version', result);
+        if (!stringValue(manifest.version)) {
+            addIssue(result.errors, manifestRelPath, 'version must be a non-empty string');
+        }
+        assertEqual(asObject(manifest.author)?.email, targetDetails.contactEmail, manifestRelPath, 'author.email', result);
         assertEqual(manifest.skills, 'skills/', manifestRelPath, 'skills', result);
         assertEqual(manifest.commands, 'commands/', manifestRelPath, 'commands', result);
         assertEqual(manifest.mcpServers, '.mcp.json', manifestRelPath, 'mcpServers', result);
@@ -540,7 +556,9 @@ function validateGeminiPackage(repoRoot, result, targetDetails) {
     if (!manifest)
         return;
     assertEqual(manifest.name, 'fraim', manifestRelPath, 'name', result);
-    assertEqual(manifest.version, targetDetails.productVersion, manifestRelPath, 'version', result);
+    if (!stringValue(manifest.version)) {
+        addIssue(result.errors, manifestRelPath, 'version must be a non-empty string');
+    }
     assertEqual(manifest.contextFileName, 'GEMINI.md', manifestRelPath, 'contextFileName', result);
     const servers = asObject(manifest.mcpServers);
     const fraimServer = asObject(servers?.fraim);
@@ -559,7 +577,7 @@ function validateMarketplaceBundles(repoRoot = process.cwd()) {
     assertFile(repoRoot, ACCEPTANCE_EVIDENCE_PATH, result);
     const targetDetails = validateTargetMatrix(repoRoot, result);
     validateOpenAiPacket(repoRoot, result, targetDetails);
-    validatePolicyPages(repoRoot, result);
+    validatePolicyPages(repoRoot, targetDetails, result);
     validateCodexPackage(repoRoot, result, targetDetails);
     validateMcpRegistryPackage(repoRoot, result, targetDetails);
     validateCursorPackage(repoRoot, result, targetDetails);