@fenglimg/fabric-shared 2.3.0-rc.1 → 2.3.0-rc.3

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   BOOTSTRAP_REGEX,
   matchBootstrapCanonicalLocale,
   resolveBootstrapCanonical
-} from "./chunk-SQKWD7X6.js";
+} from "./chunk-KFFBQRL5.js";
 import "./chunk-LXNCAKJZ.js";
 import {
   PROTECTED_TOKENS,
@@ -16,7 +16,7 @@ import {
   enMessages,
   resolveFabricLocale,
   zhCNMessages
-} from "./chunk-IFMFEX3V.js";
+} from "./chunk-UPYKUYHN.js";
 import {
   GLOBAL_BINDINGS_DIR,
   GLOBAL_STATE_DIR,
@@ -51,7 +51,7 @@ import {
   storeRelativePath,
   storeRelativePathForMount,
   storeUuidSchema
-} from "./chunk-2GLIAZ5M.js";
+} from "./chunk-ASS2KBB7.js";
 import {
   atomicWriteJson,
   withFileLock
@@ -116,7 +116,7 @@ import {
   scopeCoordinateSchema,
   scopeRoot,
   structuredWarningSchema
-} from "./chunk-D7HUHWBI.js";
+} from "./chunk-7PS7LB5T.js";
 
 // src/schemas/agents-meta.ts
 import { z } from "zod";
@@ -355,6 +355,32 @@ var humanLockFileSchema = z4.object({
 
 // src/schemas/fabric-config.ts
 import { z as z5 } from "zod";
+function isNonPersonalRequiredStore(entry) {
+  return entry.id !== PERSONAL_STORE_SENTINEL;
+}
+function refineMaxOneTeamStore(entries, ctx) {
+  const teamCount = entries.filter(isNonPersonalRequiredStore).length;
+  if (teamCount > 1) {
+    ctx.addIssue({
+      code: z5.ZodIssueCode.custom,
+      message: `a project may bind at most one team store (found ${teamCount}); run \`fabric install\` to migrate to the single team slot`
+    });
+  }
+}
+function migrateRequiredStores(config) {
+  const declared = config.required_stores;
+  if (declared === void 0) {
+    return config;
+  }
+  const team = declared.filter(isNonPersonalRequiredStore);
+  if (team.length <= 1) {
+    return config;
+  }
+  const personal = declared.filter((entry) => !isNonPersonalRequiredStore(entry));
+  const active = config.active_write_store;
+  const kept = (active !== void 0 ? team.find((entry) => entry.id === active) : void 0) ?? team[0];
+  return { ...config, required_stores: [...personal, kept] };
+}
 var auditModeSchema = z5.enum(["strict", "warn", "off"]);
 var clientPathsSchema = z5.object({
   claudeCodeCLI: z5.string().optional(),
@@ -401,7 +427,9 @@ var fabricConfigSchema = z5.object({
   // `$personal` sentinel). Drives the read-set (required_stores ∪ implicit
   // personal, S11/S54) and `clone`'s missing-store onboarding (S51). Optional
   // + absent → read-set is just the implicit personal store.
-  required_stores: z5.array(requiredStoreEntrySchema).optional(),
+  // W2 dual-slot (TASK-002 / R6): at most ONE non-personal (team-type) store —
+  // the two-slot model. >1 fails parse and is migrated by `migrateRequiredStores`.
+  required_stores: z5.array(requiredStoreEntrySchema).superRefine(refineMaxOneTeamStore).optional(),
   // v2.1.0-rc.1 P3 (S60 / `store switch-write`): alias of the store that
   // non-personal-scope writes land in for this project. Set by
   // `fabric store switch-write <alias>`; consumed as the resolver's
@@ -706,10 +734,13 @@ var fabricConfigSchema = z5.object({
   // sole retrieval knob (plan_context_top_k above); payload limits pass through
   // explicit `mcpPayloadLimits`, else the fixed PAYLOAD_LIMIT_DEFAULT_* guardrail.
   // v2.2 C2-vector (W2-T7): OPTIONAL dense-embedding semantic retrieval, layered
-  // as a recall supplement after BM25. Default OFF (`--no-embed` is the baseline);
-  // requires the operator to install the optional `fastembed` package — absent →
-  // text-only fallback. Never grows the default install footprint.
-  embed_enabled: z5.boolean().optional().default(false),
+  // as a recall supplement after BM25. P1 recall-engine-refactor (TASK-004):
+  // Default ON — `fastembed` is now an optionalDependency (auto-installed; absent →
+  // degrade-safe text-only fallback), so CJK semantic recall is on out of the box.
+  // OFF only when set explicitly to false. This default mirrors the runtime read in
+  // config-loader.ts (`embed_enabled !== false`); keep the two in sync so config
+  // introspection never reports a default that contradicts runtime behavior.
+  embed_enabled: z5.boolean().optional().default(true),
   // Weight applied to the 0..1 cosine similarity before it joins the additive
   // score. Capped at 49 — strictly BELOW BM25_WEIGHT (50) — so a perfect vector
   // match (weight × 1) can never outscore a single strong BM25 term match. This
@@ -734,8 +765,25 @@ var fabricConfigSchema = z5.object({
     "fast-bge-base-en-v1.5",
     "fast-bge-base-en",
     "fast-all-MiniLM-L6-v2"
-  ]).optional().default("fast-bge-small-zh-v1.5")
-});
+  ]).optional().default("fast-bge-small-zh-v1.5"),
+  // P1 recall-engine-refactor (TASK-003 + follow-up): content-channel fusion
+  // strategy. 'additive' = the weighted-sum path (BM25_WEIGHT·bm25 + vectorWeight·
+  // vector + structural); the vector term is structurally minor (cosine·30 vs an
+  // unbounded BM25), so additive is effectively BM25-led. 'rrf' = Reciprocal Rank
+  // Fusion over the two CONTENT channels (bm25_rank, vector_rank, equal footing)
+  // + a re-scaled structural tiebreaker — lets semantic recall actually matter.
+  // 'auto' (DEFAULT) = adaptive: use 'rrf' WHEN the vector channel is actually
+  // producing scores (embeddings installed + model warm), else fall back to
+  // 'additive'. This is the safe default — real-store shadow showed single-channel
+  // rrf (no vectors) is strictly worse than additive, so auto never lets that
+  // happen. no-query ranking is byte-identical under every value.
+  fusion: z5.enum(["additive", "rrf", "auto"]).optional().default("auto")
+});
+var fabricConfigLoadSchema = fabricConfigSchema.merge(
+  z5.object({
+    required_stores: z5.array(requiredStoreEntrySchema).optional()
+  })
+);
 
 // src/schemas/fabric-config-introspect.ts
 import { z as z6 } from "zod";
@@ -900,9 +948,15 @@ var PANEL_FIELDS = [
   // nudge_mode — the master switch for the human-visible nudge experience
   // (the most user-facing runtime knob, previously JSON-only). embed_enabled —
   // vector semantic recall, panel-editable now that config lives in `.fabric`
-  // (A1); enabling also needs the host-side `fabric install --enable-embed`.
+  // (A1). TASK-004: default ON (fastembed is an optionalDependency, degrade-safe
+  // when absent) — this introspection default mirrors the runtime read in
+  // config-loader.ts so the panel never shows a default that contradicts behavior.
   makeEnumField("nudge_mode", "D_behavior", nudgeModeSchema.options, "normal"),
-  makeBooleanField("embed_enabled", false)
+  makeBooleanField("embed_enabled", true),
+  // P1 recall-engine-refactor (follow-up): the content-channel fusion strategy,
+  // panel-editable so it sits next to embed_enabled (the two go together — rrf
+  // only pays off when embeddings are on). 'auto' is the safe adaptive default.
+  makeEnumField("fusion", "D_behavior", ["additive", "rrf", "auto"], "auto")
 ];
 
 // src/schemas/store-stable-id.ts
@@ -1069,6 +1123,13 @@ var storeResolveInputSchema = z9.object({
   ),
   // Alias selected as the active write store for non-personal scopes, if any.
   activeWriteAlias: z9.string().min(1).optional(),
+  // Alias/UUID of the ACTIVE personal store among possibly-many mounted
+  // `personal:true` stores (语义 A: singleton-at-a-time). Drives the SINGLE
+  // personal choke point (findPersonal) → both read-set inclusion and the
+  // personal-scope write-target. Absent or dangling ⇒ the resolver falls back
+  // to the first mounted personal, so legacy single-personal configs are
+  // unchanged. Sourced from `~/.fabric/fabric-global.json` → active_personal_store.
+  activePersonalAlias: z9.string().min(1).optional(),
   // Scope-aware write routes. Exact scope wins first, then longest prefix route.
   writeRoutes: z9.array(
     z9.object({
@@ -1131,7 +1192,16 @@ function createProjectRootResolver() {
 
 // src/resolver/store-resolver.ts
 function findPersonal(input) {
-  return input.mountedStores.find((s) => s.personal);
+  const actives = input.mountedStores.filter((s) => s.personal);
+  if (input.activePersonalAlias !== void 0) {
+    const picked = actives.find(
+      (s) => s.alias === input.activePersonalAlias || s.store_uuid === input.activePersonalAlias
+    );
+    if (picked !== void 0) {
+      return picked;
+    }
+  }
+  return actives[0];
 }
 function personalEntry(input) {
   const p = findPersonal(input);
@@ -1720,7 +1790,12 @@ function loadProjectConfig(projectRoot) {
   if (!existsSync3(path)) {
     return null;
   }
-  return fabricConfigSchema.parse(JSON.parse(readFileSync3(path, "utf8")));
+  const raw = JSON.parse(readFileSync3(path, "utf8"));
+  const parsed = fabricConfigSchema.safeParse(raw);
+  if (parsed.success) {
+    return parsed.data;
+  }
+  return fabricConfigLoadSchema.parse(raw);
 }
 function saveProjectConfig(config, projectRoot) {
   const validated = fabricConfigSchema.parse(config);
@@ -1753,6 +1828,7 @@ function buildStoreResolveInput(projectRoot, globalRoot = resolveGlobalRoot()) {
       })
     ),
     ...project?.active_write_store === void 0 ? {} : { activeWriteAlias: project.active_write_store },
+    ...global.active_personal_store === void 0 ? {} : { activePersonalAlias: global.active_personal_store },
     writeRoutes: project?.write_routes ?? [],
     ...project?.default_write_store === void 0 ? {} : { defaultWriteAlias: project.default_write_store }
   };
@@ -3339,6 +3415,7 @@ export {
   fabExtractKnowledgeAnnotations,
   fabPendingAnnotations,
   fabReviewAnnotations,
+  fabricConfigLoadSchema,
   fabricConfigSchema,
   fabricEventSchema,
   fabricLanguageSchema,
@@ -3383,6 +3460,7 @@ export {
   initStore,
   installDiffAppliedEventSchema,
   isKnowledgeStableId,
+  isNonPersonalRequiredStore,
   isPersonalLeakIntoSharedStore,
   isPersonalScope,
   knowledgeArchiveAttemptedEventSchema,
@@ -3435,6 +3513,7 @@ export {
   metaReconciledEventSchema,
   metaReconciledOnStartupEventSchema,
   metaUpdatedEventSchema,
+  migrateRequiredStores,
   mountedStoreSchema,
   normalizeCiteTag,
   normalizeLocale,

package/dist/schemas/api-contracts.d.ts

@@ -666,6 +666,35 @@ declare const recallOutputSchema: z.ZodObject<{
             alias: string;
         }>>;
         body_in_context: z.ZodOptional<z.ZodBoolean>;
+        score: z.ZodOptional<z.ZodNumber>;
+        score_breakdown: z.ZodOptional<z.ZodObject<{
+            final: z.ZodNumber;
+            bm25: z.ZodOptional<z.ZodNumber>;
+            bm25_rank: z.ZodOptional<z.ZodNumber>;
+            vector: z.ZodOptional<z.ZodNumber>;
+            vector_rank: z.ZodOptional<z.ZodNumber>;
+            salience: z.ZodNumber;
+            recency: z.ZodNumber;
+            locality: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            final: number;
+            salience: number;
+            recency: number;
+            locality: number;
+            bm25?: number | undefined;
+            bm25_rank?: number | undefined;
+            vector?: number | undefined;
+            vector_rank?: number | undefined;
+        }, {
+            final: number;
+            salience: number;
+            recency: number;
+            locality: number;
+            bm25?: number | undefined;
+            bm25_rank?: number | undefined;
+            vector?: number | undefined;
+            vector_rank?: number | undefined;
+        }>>;
     }, "strip", z.ZodTypeAny, {
         description: {
             summary: string;
@@ -692,6 +721,17 @@ declare const recallOutputSchema: z.ZodObject<{
         } | undefined;
         read_path?: string | undefined;
         body_in_context?: boolean | undefined;
+        score?: number | undefined;
+        score_breakdown?: {
+            final: number;
+            salience: number;
+            recency: number;
+            locality: number;
+            bm25?: number | undefined;
+            bm25_rank?: number | undefined;
+            vector?: number | undefined;
+            vector_rank?: number | undefined;
+        } | undefined;
     }, {
         description: {
             summary: string;
@@ -718,6 +758,17 @@ declare const recallOutputSchema: z.ZodObject<{
         } | undefined;
         read_path?: string | undefined;
         body_in_context?: boolean | undefined;
+        score?: number | undefined;
+        score_breakdown?: {
+            final: number;
+            salience: number;
+            recency: number;
+            locality: number;
+            bm25?: number | undefined;
+            bm25_rank?: number | undefined;
+            vector?: number | undefined;
+            vector_rank?: number | undefined;
+        } | undefined;
     }>, "many">;
     intent: z.ZodOptional<z.ZodString>;
     dropped: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -801,6 +852,17 @@ declare const recallOutputSchema: z.ZodObject<{
         } | undefined;
         read_path?: string | undefined;
         body_in_context?: boolean | undefined;
+        score?: number | undefined;
+        score_breakdown?: {
+            final: number;
+            salience: number;
+            recency: number;
+            locality: number;
+            bm25?: number | undefined;
+            bm25_rank?: number | undefined;
+            vector?: number | undefined;
+            vector_rank?: number | undefined;
+        } | undefined;
     }[];
     stale: boolean;
     revision_hash: string;
@@ -856,6 +918,17 @@ declare const recallOutputSchema: z.ZodObject<{
         } | undefined;
         read_path?: string | undefined;
         body_in_context?: boolean | undefined;
+        score?: number | undefined;
+        score_breakdown?: {
+            final: number;
+            salience: number;
+            recency: number;
+            locality: number;
+            bm25?: number | undefined;
+            bm25_rank?: number | undefined;
+            vector?: number | undefined;
+            vector_rank?: number | undefined;
+        } | undefined;
     }[];
     stale: boolean;
     revision_hash: string;

package/dist/schemas/api-contracts.js

@@ -47,7 +47,7 @@ import {
   recallInputSchema,
   recallOutputSchema,
   structuredWarningSchema
-} from "../chunk-D7HUHWBI.js";
+} from "../chunk-7PS7LB5T.js";
 export {
   FabExtractKnowledgeInputSchema,
   FabExtractKnowledgeInputShape,

package/dist/templates/bootstrap-canonical.js

@@ -7,8 +7,8 @@ import {
   BOOTSTRAP_REGEX,
   matchBootstrapCanonicalLocale,
   resolveBootstrapCanonical
-} from "../chunk-SQKWD7X6.js";
-import "../chunk-2GLIAZ5M.js";
+} from "../chunk-KFFBQRL5.js";
+import "../chunk-ASS2KBB7.js";
 export {
   BOOTSTRAP_CANONICAL_BY_LOCALE,
   BOOTSTRAP_CANONICAL_EN,

package/dist/theme.d.ts

@@ -23,6 +23,7 @@ declare const SYMBOL_ASCII: {
 };
 declare function symbol(kind: keyof typeof SYMBOL_ASCII, colorOn?: boolean): string;
 declare function sectionBar(title: string, colorOn?: boolean): string;
+declare function headerRule(title: string, colorOn?: boolean): string;
 declare const SCOPE_BADGE_TOKEN: {
     readonly team: "drift";
     readonly project: "ai";
@@ -30,4 +31,4 @@ declare const SCOPE_BADGE_TOKEN: {
 };
 declare function scopeBadge(scope: keyof typeof SCOPE_BADGE_TOKEN, colorOn?: boolean): string;
 
-export { ANSI, PALETTE, SYMBOL_ASCII, type ThemeToken, isColorEnabled, paint, scopeBadge, sectionBar, symbol };
+export { ANSI, PALETTE, SYMBOL_ASCII, type ThemeToken, headerRule, isColorEnabled, paint, scopeBadge, sectionBar, symbol };

package/dist/theme.js

@@ -40,6 +40,12 @@ function symbol(kind, colorOn = isColorEnabled()) {
 function sectionBar(title, colorOn = isColorEnabled()) {
   return colorOn ? `${ANSI.bold}${PALETTE.accent}\u258C ${title}${ANSI.reset}` : `# ${title}`;
 }
+function headerRule(title, colorOn = isColorEnabled()) {
+  const head = colorOn ? `${ANSI.bold}${PALETTE.accent}${title}${ANSI.reset}` : title;
+  const rule = paint("muted", (colorOn ? "\u2500" : "-").repeat(40), colorOn);
+  return `${head}
+${rule}`;
+}
 var SCOPE_BADGE_TOKEN = { team: "drift", project: "ai", personal: "human" };
 function scopeBadge(scope, colorOn = isColorEnabled()) {
   const text = `[${scope}]`;
@@ -49,6 +55,7 @@ export {
   ANSI,
   PALETTE,
   SYMBOL_ASCII,
+  headerRule,
   isColorEnabled,
   paint,
   scopeBadge,

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export { a as AgentsIdentitySource, c as AgentsMeta, d as AgentsMetaCountersEnvelope, e as AgentsMetaKnowledgeTypeCounters, A as AgentsMetaNode, b as AgentsTopologyType, g as AiLedgerEntry, h as AuditMode, C as ClientPaths, D as DefaultLayerFilter, F as FabricConfig, i as FabricLanguage, j as HumanLedgerEntry, H as HumanLockEntry, L as LedgerEntry, M as McpPayloadLimits, R as RuleDescription, k as RuleDescriptionIndexItem } from '../index-BqsM1bzx.js';
+export { a as AgentsIdentitySource, d as AgentsMeta, e as AgentsMetaCountersEnvelope, g as AgentsMetaKnowledgeTypeCounters, A as AgentsMetaNode, b as AgentsTopologyType, h as AiLedgerEntry, i as AuditMode, C as ClientPaths, D as DefaultLayerFilter, F as FabricConfig, j as FabricLanguage, m as HumanLedgerEntry, H as HumanLockEntry, L as LedgerEntry, n as McpPayloadLimits, o as RecallScore, p as RecallScoreBreakdown, q as RuleDescription, r as RuleDescriptionIndexItem } from '../index-C0cijMSw.js';
 import 'zod';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fenglimg/fabric-shared",
-  "version": "2.3.0-rc.1",
+  "version": "2.3.0-rc.3",
   "description": "Fabric shared types — Zod schemas, i18n, atomic-write helpers, MCP payload guard, error classes. Consumed by @fenglimg/fabric-server + @fenglimg/fabric-cli.",
   "license": "MIT",
   "author": "wangzhichao <fenglimg90@gmail.com>",