fraim-hub 2.0.341 → 2.0.342

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

@@ -27,7 +27,7 @@ const HEADER_FIELDS = [
     'runId', 'status', 'pauseReason', 'createdAt', 'lastUpdatedAt', 'issueNumber',
     'sourceTrigger', 'blocked', 'stopped', 'reviewApproved', 'compareMode', 'compareRunId',
     'managedByRunId', 'managedByPersonaKey', 'managedReviewStatus', 'delegationTaskId',
-    'humanCoachingDisabled', 'personaSnapshot', 'reviewHandoff',
+    'humanCoachingDisabled', 'personaSnapshot', 'reviewHandoff', 'proposalSet',
 ];
 const HEADER_FIELD_SET = new Set([...HEADER_FIELDS, 'personaSnapshot', 'delegation', 'reviewHandoff']);
 /**
@@ -571,7 +571,7 @@ class AiHubConversationStore {
         try {
             const parsed = JSON.parse(fs_1.default.readFileSync(this.indexPath(bucketDir), 'utf8'));
             if (Array.isArray(parsed.headers)) {
-                return { activeId: parsed.activeId ?? null, headers: parsed.headers };
+                return { version: parsed.version, activeId: parsed.activeId ?? null, headers: parsed.headers };
             }
         }
         catch {
@@ -583,12 +583,12 @@ class AiHubConversationStore {
     // source of truth) and persist it best-effort.
     loadIndex(bucketDir, bucketKey) {
         const existing = this.readIndex(bucketDir);
-        if (existing) {
+        if (existing && existing.version === 3) {
             const sanitized = sanitizeBucketIndex(existing);
             if (sanitized.changed) {
                 try {
                     (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), {
-                        version: 2,
+                        version: 3,
                         bucketKey,
                         activeId: sanitized.index.activeId,
                         headers: sanitized.index.headers,
@@ -601,10 +601,13 @@ class AiHubConversationStore {
             return sanitized.index;
         }
         const headers = this.readAllConversations(bucketDir, bucketKey).map(toHeader).sort(newestFirst);
-        const rebuilt = { activeId: null, headers };
+        // Older indexes predate proposalSet in headers. Rebuild from canonical shards
+        // once so pending reviews are visible immediately after upgrading.
+        const activeId = existing?.activeId && headers.some((header) => header.id === existing.activeId) ? existing.activeId : null;
+        const rebuilt = { activeId, headers };
         if (headers.length > 0) {
             try {
-                (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 2, bucketKey, activeId: null, headers });
+                (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 3, bucketKey, activeId, headers });
             }
             catch {
                 /* best-effort */
@@ -623,7 +626,7 @@ class AiHubConversationStore {
     writeIndex(bucketDir, bucketKey, activeId, conversations) {
         const headers = conversations.map(toHeader).sort(newestFirst);
         const validActive = activeId && headers.some((h) => h.id === activeId) ? activeId : null;
-        (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 2, bucketKey, activeId: validActive, headers });
+        (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 3, bucketKey, activeId: validActive, headers });
     }
     // Author a whole bucket to exactly `conversations` (used by migration and replaceProject).
     writeBucket(bucketKey, state) {
@@ -872,7 +875,7 @@ class AiHubConversationStore {
         const state = (0, conversation_store_lock_1.withBucketLock)(this.lockPath(bucketDir), () => {
             const idx = this.loadIndex(bucketDir, key);
             const valid = activeId && idx.headers.some((h) => h.id === activeId) ? activeId : null;
-            (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 2, bucketKey: key, activeId: valid, headers: idx.headers });
+            (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 3, bucketKey: key, activeId: valid, headers: idx.headers });
             return normalizeProjectState(key, { activeId: valid, conversations: idx.headers });
         });
         if (!bucketAlreadyExisted)
@@ -937,7 +940,7 @@ class AiHubConversationStore {
             if (!conversationExists) {
                 (0, conversation_search_projection_1.deleteConversationSearchEntry)(bucketDir, conversationId);
                 if (headers.length !== index.headers.length || activeId !== index.activeId) {
-                    (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 2, bucketKey: key, activeId, headers });
+                    (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 3, bucketKey: key, activeId, headers });
                 }
                 return { removed: false, activeId };
             }
@@ -947,7 +950,7 @@ class AiHubConversationStore {
             (0, conversation_search_projection_1.deleteConversationSearchEntry)(bucketDir, conversationId);
             fs_1.default.rmSync(this.indexPath(bucketDir), { force: true });
             fs_1.default.rmSync(conversationPath, { force: true });
-            (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 2, bucketKey: key, activeId, headers });
+            (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 3, bucketKey: key, activeId, headers });
             return { removed: true, activeId };
         });
     }
@@ -960,7 +963,7 @@ class AiHubConversationStore {
         let nextActive = activeId === undefined ? idx.activeId : activeId;
         if (nextActive && !headers.some((h) => h.id === nextActive))
             nextActive = null;
-        (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 2, bucketKey, activeId: nextActive, headers });
+        (0, atomic_json_file_1.writeJsonAtomic)(this.indexPath(bucketDir), { version: 3, bucketKey, activeId: nextActive, headers });
         return normalizeProjectState(bucketKey, { activeId: nextActive, conversations: headers });
     }
     stateFromIndex(bucketDir, bucketKey) {

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

@@ -69,7 +69,7 @@ ${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.
+   If local FRAIM job stubs are present in the workspace, read that jobs directory's \`INDEX.md\` first (it lists every job's name, one-line intent, and category) and match the request against it; open an individual stub only to confirm a shortlisted candidate, or fall back to scanning the stubs directly if no \`INDEX.md\` is present. Also check \`fraim/personalized-employee/jobs/\` (and its own \`INDEX.md\`, if present) 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.
 
 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, call \`get_fraim_job({ job: "adhoc-prompt" })\` directly and execute it with the user's instructions as the task input — no confirmation question, and do not pick the nearest catalog job.

package/dist/src/core/utils/local-registry-resolver.js

@@ -520,33 +520,60 @@ class LocalRegistryResolver {
             // publish or sync and resolves at all under `single-machine`).
             const managerLocalContent = this.readManagerLocalOverlayFile(path);
             if (managerLocalContent !== null) {
+                // Issue #1867: apply inheritance so an extends-based override merges with its parent.
+                let resolvedManagerLocal;
+                try {
+                    resolvedManagerLocal = await this.resolveInheritance(managerLocalContent, path);
+                }
+                catch {
+                    resolvedManagerLocal = { content: managerLocalContent, imports: [] };
+                }
                 return {
-                    content: managerLocalContent,
+                    content: resolvedManagerLocal.content,
                     source: 'local',
                     personalized: true,
-                    inherited: false,
+                    inherited: resolvedManagerLocal.imports.length > 0,
+                    imports: resolvedManagerLocal.imports.length > 0 ? resolvedManagerLocal.imports : undefined,
                     scope: 'manager'
                 };
             }
             // Issue #869: manager overlay (precedence 3 — the synced cross-machine copy)
             const managerOverlayContent = this.readManagerOverlayFile(path);
             if (managerOverlayContent !== null) {
+                // Issue #1867: apply inheritance so an extends-based override merges with its parent.
+                let resolvedManagerOverlay;
+                try {
+                    resolvedManagerOverlay = await this.resolveInheritance(managerOverlayContent, path);
+                }
+                catch {
+                    resolvedManagerOverlay = { content: managerOverlayContent, imports: [] };
+                }
                 return {
-                    content: managerOverlayContent,
+                    content: resolvedManagerOverlay.content,
                     source: 'local',
                     personalized: true,
-                    inherited: false,
+                    inherited: resolvedManagerOverlay.imports.length > 0,
+                    imports: resolvedManagerOverlay.imports.length > 0 ? resolvedManagerOverlay.imports : undefined,
                     scope: 'manager'
                 };
             }
             // Issue #869 Phase 2: org overlay (precedence 3 — after manager, before synced baseline)
             const orgOverlayContent = this.readOrgOverlayFile(path);
             if (orgOverlayContent !== null) {
+                // Issue #1867: apply inheritance so an extends-based override merges with its parent.
+                let resolvedOrgOverlay;
+                try {
+                    resolvedOrgOverlay = await this.resolveInheritance(orgOverlayContent, path);
+                }
+                catch {
+                    resolvedOrgOverlay = { content: orgOverlayContent, imports: [] };
+                }
                 return {
-                    content: orgOverlayContent,
+                    content: resolvedOrgOverlay.content,
                     source: 'local',
                     personalized: true,
-                    inherited: false,
+                    inherited: resolvedOrgOverlay.imports.length > 0,
+                    imports: resolvedOrgOverlay.imports.length > 0 ? resolvedOrgOverlay.imports : undefined,
                     scope: 'org'
                 };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim-hub",
-  "version": "2.0.341",
+  "version": "2.0.342",
   "description": "FRAIM Hub local companion package.",
   "author": "Sid Mathur <sid.mathur@gmail.com>",
   "homepage": "https://github.com/mathursrus/FRAIM#readme",
@@ -231,7 +231,7 @@
     "electron-updater": "^6.8.9",
     "express": "^5.2.1",
     "extract-zip": "^2.0.1",
-    "fraim": "2.0.341",
+    "fraim": "2.0.342",
     "mongodb": "^7.0.0",
     "node-cron": "4.2.1",
     "node-edge-tts": "^1.2.10",

package/public/ai-hub/review.css

@@ -362,6 +362,8 @@
 .learn-prop .lp-skip.on {
   background: var(--danger, #a24747); color: #fff; border-color: transparent;
 }
+:root[data-theme="dark"] .learn-prop .lp-promote.on,
+:root[data-theme="dark"] .learn-prop .lp-skip.on { color: var(--bg); }
 .learn-prop .lp-reason { font-size: 11.5px; color: var(--muted); line-height: 1.5; }
 .learn-prop .lp-reason b { color: var(--text); font-weight: 600; }
 .learn-prop .lp-why { display: flex; flex-direction: column; gap: 5px; margin-top: 2px; }
@@ -387,9 +389,8 @@
    gets its own slightly darker text rather than restyling every managed-disabled
    control on surfaces this change did not validate. */
 .review-actions.learn-batch .rb-approve.managed-disabled { color: #5f5f5f; }
-/* A skipped row's level choice is moot: no level reads as chosen, and the whole
-   picker recedes so the row's one live state is the skip. */
-.learn-prop .lp-level-pick.lp-moot { opacity: 0.55; }
+/* Choosing a level restores a skipped proposal, so these controls stay readable. */
+.learn-prop .lp-level-pick.lp-moot { opacity: 1; }
 :root[data-theme="dark"] .review-actions.learn-batch .rb-approve.managed-disabled { color: #cfcfcf; }
 
 /* ── R10: Reverse mentoring items (Got it / Dismiss) ── */

package/public/ai-hub/script.js

@@ -9366,6 +9366,7 @@ function foldRunIntoConversation(conv, run) {
     conv.hostSessions = { ...(conv.hostSessions || {}), ...run.hostSessions };
   }
   const runHandoff = normalizeReviewHandoff(run.reviewHandoff);
+  conv.proposalSet = run.proposalSet || null;
   if (runHandoff) {
     conv.reviewHandoff = runHandoff;
   } else if (run.reviewHandoff) {