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

package/dist/index.js

@@ -8,7 +8,7 @@ import {
   normalizeLocale,
   resolveFabricLocale,
   zhCNMessages
-} from "./chunk-7TZ2PMVH.js";
+} from "./chunk-QSD4PN4W.js";
 import {
   FabExtractKnowledgeInputSchema,
   FabExtractKnowledgeInputShape,
@@ -56,7 +56,7 @@ import {
   recallInputSchema,
   recallOutputSchema,
   structuredWarningSchema
-} from "./chunk-JEXTOQVV.js";
+} from "./chunk-355LUDLW.js";
 import {
   BOOTSTRAP_CANONICAL,
   BOOTSTRAP_MARKER_BEGIN,
@@ -65,7 +65,7 @@ import {
   LEGACY_KB_MARKER_BEGIN,
   LEGACY_KB_MARKER_END,
   LEGACY_KB_REGEX
-} from "./chunk-TX2XZ7AW.js";
+} from "./chunk-AFT7DB4P.js";
 
 // src/schemas/agents-meta.ts
 import { z } from "zod";
@@ -601,6 +601,30 @@ var fabricConfigSchema = z6.object({
   // high-contract-criticality projects. Other strategies (time-based,
   // token-budget) deferred to rc.35 per plan locked-decisions 2026-05-26.
   cite_evict_interval: z6.number().int().min(0).optional().default(0),
+  // v2.1 ⑤ cite-redesign (P5): recall-based cite-accounting hook config. The
+  // rc.34 cite_evict_interval turn-counter above is superseded by the
+  // PreToolUse(Edit/Write) recall-aware nudge in cite-policy-evict.cjs; the old
+  // key is retained for back-compat (inert now that the hook moved off
+  // UserPromptSubmit). `cite_recall_nudge` is the master switch (default true =
+  // ON); set false to silence the "改前先 fab_recall" nudge entirely (mirrors
+  // the cite_evict_interval=0 opt-out convention). `cite_recall_window_minutes`
+  // bounds how far back an in-session fab_recall counts as "informing" the edit
+  // (default 30; 0 = unbounded).
+  cite_recall_nudge: z6.boolean().optional().default(true),
+  cite_recall_window_minutes: z6.number().int().min(0).optional().default(30),
+  // F2: glob exemptions for the cite nudge (cite-policy-evict.cjs). Edit paths
+  // matching any glob skip the "改前先 fab_recall" nudge — meta/orchestration
+  // files (e.g. `.workflow/` scratchpads) are not source the cite policy
+  // governs. MERGED with the hook's built-in [".workflow/**"] default; an
+  // omitted/empty value keeps just that default. `*` = within a path segment,
+  // `**` = across segments.
+  cite_nudge_ignore_globs: z6.array(z6.string()).optional(),
+  // v2.1 ④ conflict-detection (P4): bm25 content-similarity threshold (0..1)
+  // for the knowledge-conflict lint (`fabric doctor --lint-conflicts`). A
+  // same-(type,layer) pair whose normalized bm25 similarity reaches this floor
+  // is surfaced as a candidate (possible duplicate OR conflict). Conservative
+  // default 0.5 — raise to reduce noise, lower to catch looser pairs.
+  conflict_lint_similarity_threshold: z6.number().min(0).max(1).optional().default(0.5),
   // v2.0.0-rc.22 Scope A T3: sliding-window retention (in days) for the
   // event ledger rotation primitive (`rotateEventLedgerIfNeeded`). Lines
   // whose `ts` is older than `now - fabric_event_retention_days * 86_400_000`
@@ -703,13 +727,25 @@ var fabricConfigSchema = z6.object({
   // 0..168 (one week).
   hint_narrow_cooldown_hours: z6.number().int().min(0).max(168).optional().default(0),
   // v2.0.0-rc.33 W4-B3 (T5 P2): per-maturity inactivity thresholds (days)
-  // driving orphan_demote. Hardcoded at stable=90/endorsed=30/draft=14 in
+  // driving orphan_demote. Hardcoded at proven=90/verified=30/draft=14 in
   // rc.32; chatty workspaces want them tighter, slow ones want them looser.
   // Each field optional; absent → defaults inside doctor.ts apply. Ranges
   // chosen so a typo can't accidentally disable the lint (min 1).
+  //
+  // v2.2 W3-T5 (F-MATURITY-ENDORSED): the canonical maturity enum is
+  // draft/verified/proven (KT-DEC-0005), but these threshold keys historically
+  // used the legacy stable/endorsed vocabulary — a config authored with the
+  // canonical names could never tune the proven/verified tiers. The canonical
+  // keys below are the preferred form; the legacy keys are retained for
+  // backward-compat (a config written before this fix keeps working). The
+  // loader maps stable→proven / endorsed→verified, canonical taking precedence.
+  orphan_demote_proven_days: z6.number().int().min(1).max(3650).optional(),
+  orphan_demote_verified_days: z6.number().int().min(1).max(3650).optional(),
+  orphan_demote_draft_days: z6.number().int().min(1).max(3650).optional(),
+  // Legacy aliases (deprecated; map to proven/verified). Kept so existing
+  // configs do not silently lose their tuning.
   orphan_demote_stable_days: z6.number().int().min(1).max(3650).optional(),
   orphan_demote_endorsed_days: z6.number().int().min(1).max(3650).optional(),
-  orphan_demote_draft_days: z6.number().int().min(1).max(3650).optional(),
   // v2.0.0-rc.33 W4-A3 (T4 P2): per-entry summary truncation length used by
   // knowledge-hint-{broad,narrow}.cjs. Hard-coded at 80 chars in rc.32 — too
   // short for entries with parameterized summaries (e.g. "Use bcrypt with
@@ -766,7 +802,25 @@ var fabricConfigSchema = z6.object({
   // ENFORCES the "vectors supplement, never override lexical relevance"
   // invariant in the schema rather than leaving it to a comment (W2-REVIEW codex
   // MED-4). Range 0..49; default 30.
-  embed_weight: z6.number().int().min(0).max(49).optional().default(30)
+  embed_weight: z6.number().int().min(0).max(49).optional().default(30),
+  // v2.1 ③ vector-chinese-model (P3): which fastembed model to load. The prior
+  // code pinned fastembed's English default (bge-small-en-v1.5) — wrong for the
+  // Chinese-heavy zh-CN-hybrid KB. Values are the fastembed@2.x EmbeddingModel
+  // enum strings. Default `fast-bge-small-zh-v1.5` (BGESmallZH): light, fast,
+  // Chinese-capable (bm25 already covers English/code tokens; the vector term
+  // supplements Chinese semantics). `fast-multilingual-e5-large` (MLE5Large) is
+  // available for full multilingual recall at a ~1GB download + slower CPU cost.
+  // (V1 research: fastembed@2.1.0 has NO multilingual-e5-SMALL — the originally
+  // planned pin — so bge-small-zh is the light Chinese choice.)
+  embed_model: z6.enum([
+    "fast-bge-small-zh-v1.5",
+    "fast-multilingual-e5-large",
+    "fast-bge-small-en-v1.5",
+    "fast-bge-small-en",
+    "fast-bge-base-en-v1.5",
+    "fast-bge-base-en",
+    "fast-all-MiniLM-L6-v2"
+  ]).optional().default("fast-bge-small-zh-v1.5")
 });
 
 // src/schemas/fabric-config-introspect.ts
@@ -1503,6 +1557,76 @@ function aggregatePendingAcrossStores(stores) {
   );
 }
 
+// src/store/global-config-io.ts
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
+import { homedir } from "os";
+import { join as join3 } from "path";
+function resolveGlobalRoot() {
+  return join3(process.env.FABRIC_HOME ?? homedir(), ".fabric");
+}
+function globalConfigPath(globalRoot = resolveGlobalRoot()) {
+  return join3(globalRoot, "fabric-global.json");
+}
+function loadGlobalConfig(globalRoot = resolveGlobalRoot()) {
+  const path = globalConfigPath(globalRoot);
+  if (!existsSync3(path)) {
+    return null;
+  }
+  return globalConfigSchema.parse(JSON.parse(readFileSync2(path, "utf8")));
+}
+function saveGlobalConfig(config, globalRoot = resolveGlobalRoot()) {
+  const validated = globalConfigSchema.parse(config);
+  mkdirSync2(globalRoot, { recursive: true });
+  writeFileSync2(globalConfigPath(globalRoot), `${JSON.stringify(validated, null, 2)}
+`, "utf8");
+}
+
+// src/store/project-config-io.ts
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
+import { join as join4 } from "path";
+function projectConfigPath(projectRoot) {
+  return join4(projectRoot, ".fabric", "fabric-config.json");
+}
+function loadProjectConfig(projectRoot) {
+  const path = projectConfigPath(projectRoot);
+  if (!existsSync4(path)) {
+    return null;
+  }
+  return fabricConfigSchema.parse(JSON.parse(readFileSync3(path, "utf8")));
+}
+function saveProjectConfig(config, projectRoot) {
+  const validated = fabricConfigSchema.parse(config);
+  mkdirSync3(join4(projectRoot, ".fabric"), { recursive: true });
+  writeFileSync3(projectConfigPath(projectRoot), `${JSON.stringify(validated, null, 2)}
+`, "utf8");
+}
+
+// src/store/resolve-input.ts
+function buildStoreResolveInput(projectRoot, globalRoot = resolveGlobalRoot()) {
+  const global = loadGlobalConfig(globalRoot);
+  if (global === null) {
+    return null;
+  }
+  const project = loadProjectConfig(projectRoot);
+  return {
+    uid: global.uid,
+    mountedStores: global.stores.map((s) => ({
+      store_uuid: s.store_uuid,
+      alias: s.alias,
+      ...s.remote === void 0 ? {} : { remote: s.remote },
+      writable: s.writable ?? true,
+      personal: s.personal ?? false
+    })),
+    requiredStores: (project?.required_stores ?? []).map(
+      (r) => ({
+        id: r.id,
+        ...r.suggested_remote === void 0 ? {} : { suggested_remote: r.suggested_remote }
+      })
+    ),
+    ...project?.active_write_store === void 0 ? {} : { activeWriteAlias: project.active_write_store }
+  };
+}
+
 // src/store/secret-scan.ts
 var SECRET_RULES = [
   { rule: "aws-access-key-id", re: /\bAKIA[0-9A-Z]{16}\b/ },
@@ -1540,6 +1664,10 @@ function redactSecrets(content) {
   return out;
 }
 function scrubRemoteUrl(remote) {
+  const httpStripped = remote.replace(/^(https?:\/\/)[^/@]+@/i, "$1");
+  if (httpStripped !== remote) {
+    return httpStripped;
+  }
   return remote.replace(
     /^([a-zA-Z][a-zA-Z0-9+.-]*:\/\/)[^/@]*:[^/@]*@/,
     "$1"
@@ -1719,10 +1847,24 @@ var resolvedBindingsSnapshotSchema = z14.object({
 }).strict();
 
 // src/store/bindings.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
-import { join as join3 } from "path";
+import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "fs";
+import { join as join5, resolve, sep } from "path";
+var SAFE_PROJECT_ID = /^[A-Za-z0-9._-]+$/;
+function assertSafeProjectId(projectId) {
+  if (!SAFE_PROJECT_ID.test(projectId) || projectId.includes("..")) {
+    throw new Error(
+      `bindingsSnapshotPath: refusing unsafe project_id ${JSON.stringify(projectId)} (must match ${SAFE_PROJECT_ID} and contain no "..")`
+    );
+  }
+}
 function bindingsSnapshotPath(globalRoot, projectId) {
-  return join3(globalRoot, GLOBAL_STATE_DIR, GLOBAL_BINDINGS_DIR, `${projectId}_resolved.json`);
+  assertSafeProjectId(projectId);
+  const bindingsDir = resolve(join5(globalRoot, GLOBAL_STATE_DIR, GLOBAL_BINDINGS_DIR));
+  const path = resolve(join5(bindingsDir, `${projectId}_resolved.json`));
+  if (path !== bindingsDir && !path.startsWith(bindingsDir + sep)) {
+    throw new Error(`bindingsSnapshotPath: resolved path escapes bindings dir for ${JSON.stringify(projectId)}`);
+  }
+  return path;
 }
 function writeBindingsSnapshot(options) {
   const resolver = createStoreResolver();
@@ -1736,18 +1878,18 @@ function writeBindingsSnapshot(options) {
     write_target: target
   });
   const path = bindingsSnapshotPath(options.globalRoot, options.projectId);
-  mkdirSync2(join3(path, ".."), { recursive: true });
-  writeFileSync2(path, `${JSON.stringify(snapshot, null, 2)}
+  mkdirSync4(join5(path, ".."), { recursive: true });
+  writeFileSync4(path, `${JSON.stringify(snapshot, null, 2)}
 `, "utf8");
   return snapshot;
 }
 function readBindingsSnapshot(globalRoot, projectId) {
   const path = bindingsSnapshotPath(globalRoot, projectId);
-  if (!existsSync3(path)) {
+  if (!existsSync5(path)) {
     return null;
   }
   try {
-    const parsed = resolvedBindingsSnapshotSchema.safeParse(JSON.parse(readFileSync2(path, "utf8")));
+    const parsed = resolvedBindingsSnapshotSchema.safeParse(JSON.parse(readFileSync4(path, "utf8")));
     return parsed.success ? parsed.data : null;
   } catch {
     return null;
@@ -2438,6 +2580,15 @@ var assistantTurnObservedEventSchema = z18.object({
       skip_reason: z18.string().nullable()
     })
   ).default([]),
+  // lifecycle-refactor W3-T4 (§2 store 轴 / store-qualified 观测): per-cite store
+  // qualifier, index-aligned with cite_ids. Mirrors the cite-line-parser's
+  // `cite_stores` output (`<alias-or-uuid>:<id>` → the qualifier; a bare id →
+  // null). Persists the store provenance the parser already extracts so
+  // doctor --cite-coverage can break compliance down per store WITHOUT joining
+  // against the store registry. Additive `.optional()` (NOT `.default([])`) so
+  // existing inline event constructors stay valid without supplying it — pre-W3-T4
+  // events parse with the field absent and bucket under the project-local default.
+  cite_stores: z18.array(z18.string().nullable()).optional(),
   client: z18.enum(["cc", "codex", "cursor"]).optional(),
   turn_id: z18.string(),
   envelope_index: z18.number().int().nonnegative().optional(),
@@ -2580,6 +2731,29 @@ var clientCapabilitySnapshotEventSchema = z18.object({
   capabilities: z18.array(z18.string()),
   version: z18.string()
 });
+var sessionEndedEventSchema = z18.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z18.literal("session_ended")
+});
+var fileMutatedEventSchema = z18.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z18.literal("file_mutated"),
+  path: z18.string(),
+  tool_call_id: z18.string(),
+  tool_name: z18.string().optional(),
+  source_event_id: z18.string().optional(),
+  store_id: z18.string().optional()
+});
+var precompactObservedEventSchema = z18.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z18.literal("precompact_observed")
+});
+var graphEdgeCandidateRequestedEventSchema = z18.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z18.literal("graph_edge_candidate_requested"),
+  stable_id: z18.string(),
+  store: z18.string().optional()
+});
 var eventLedgerEventSchema = z18.discriminatedUnion("event_type", [
   knowledgeContextPlannedEventSchema,
   knowledgeSelectionEventSchema,
@@ -2672,7 +2846,12 @@ var eventLedgerEventSchema = z18.discriminatedUnion("event_type", [
   skillPhaseTransitionEventSchema,
   skillTriggerCandidateEventSchema,
   llmJudgeRunEventSchema,
-  clientCapabilitySnapshotEventSchema
+  clientCapabilitySnapshotEventSchema,
+  // lifecycle-refactor Wave 2 — dormant-hook activation markers.
+  sessionEndedEventSchema,
+  fileMutatedEventSchema,
+  precompactObservedEventSchema,
+  graphEdgeCandidateRequestedEventSchema
 ]);
 
 // src/text-tokenize.ts
@@ -2813,6 +2992,7 @@ export {
   buildDebugBundle,
   buildFailureTrace,
   buildScanRecommendations,
+  buildStoreResolveInput,
   candidateFileEntrySchema,
   citeContractMetricsSchema,
   citeContractPolicyActivatedEventSchema,
@@ -2850,6 +3030,7 @@ export {
   fabricConfigSchema,
   fabricEventSchema,
   fabricLanguageSchema,
+  fileMutatedEventSchema,
   findMountedStore,
   findStoreExecutableViolations,
   forensicAssertionCoverageSchema,
@@ -2866,8 +3047,10 @@ export {
   formatKnowledgeId,
   getPanelFieldByKey,
   getPanelFields,
+  globalConfigPath,
   globalConfigSchema,
   globalRefSchema,
+  graphEdgeCandidateRequestedEventSchema,
   hasSecrets,
   historyStateQuerySchema,
   hookSignalEmittedEventSchema,
@@ -2926,6 +3109,8 @@ export {
   lintCrossStoreReferences,
   listStoreKnowledge,
   llmJudgeRunEventSchema,
+  loadGlobalConfig,
+  loadProjectConfig,
   localKnowledgeIdSchema,
   lockApprovedEventSchema,
   lockDriftEventSchema,
@@ -2956,6 +3141,8 @@ export {
   planContextInputSchema,
   planContextOutputSchema,
   planContextTopKSchema,
+  precompactObservedEventSchema,
+  projectConfigPath,
   projectRootGoldenCaseSchema,
   projectRootGoldenFileSchema,
   projectRootResolutionSchema,
@@ -2977,12 +3164,15 @@ export {
   requiredStoreEntrySchema,
   resolveCandidates,
   resolveFabricLocale,
+  resolveGlobalRoot,
   resolveRetrievalBudget,
   resolveStoreQualifiedId,
   resolvedBindingsSnapshotSchema,
   retrievalBudgetProfile,
   ruleDescriptionIndexItemSchema,
   ruleDescriptionSchema,
+  saveGlobalConfig,
+  saveProjectConfig,
   scanForSecrets,
   scopeCoordinateSchema,
   scopeRoot,
@@ -2990,6 +3180,7 @@ export {
   selectionTokenTtlMsSchema,
   serveLockClearedEventSchema,
   sessionArchiveAttemptedEventSchema,
+  sessionEndedEventSchema,
   skillInvocationCompletedEventSchema,
   skillInvocationStartedEventSchema,
   skillPhaseTransitionEventSchema,

package/dist/node/atomic-write.js

@@ -1,6 +1,7 @@
 // src/node/atomic-write.ts
-import { appendFile, mkdir, open, rename, stat, unlink, writeFile } from "fs/promises";
+import { appendFile, mkdir, open, readFile, rename, stat, unlink, writeFile } from "fs/promises";
 import { dirname } from "path";
+import { randomUUID } from "crypto";
 function makeTmpSuffix() {
   const rand = Math.floor(Math.random() * 65535).toString(16).padStart(4, "0");
   return `.${process.pid}.${Date.now()}.${rand}.tmp`;
@@ -44,6 +45,7 @@ async function withFileLock(lockPath, fn, opts = {}) {
   const retryDelayMs = opts.retryDelayMs ?? 20;
   const maxWaitMs = opts.maxWaitMs ?? 1e4;
   await mkdir(dirname(lockPath), { recursive: true });
+  const token = `${process.pid}.${randomUUID()}`;
   const start = Date.now();
   for (; ; ) {
     let handle;
@@ -54,7 +56,10 @@ async function withFileLock(lockPath, fn, opts = {}) {
       try {
         const st = await stat(lockPath);
         if (Date.now() - st.mtimeMs > staleMs) {
-          await unlink(lockPath).catch(() => void 0);
+          const staleToken = await readFile(lockPath, "utf8").catch(() => null);
+          if (staleToken !== null) {
+            await unlinkIfToken(lockPath, staleToken);
+          }
           continue;
         }
       } catch {
@@ -67,11 +72,21 @@ async function withFileLock(lockPath, fn, opts = {}) {
       continue;
     }
     try {
+      await handle.writeFile(token, "utf8");
       await handle.close();
       return await fn();
     } finally {
+      await unlinkIfToken(lockPath, token);
+    }
+  }
+}
+async function unlinkIfToken(lockPath, expected) {
+  try {
+    const current = await readFile(lockPath, "utf8");
+    if (current === expected) {
       await unlink(lockPath).catch(() => void 0);
     }
+  } catch {
   }
 }
 function createLedgerWriteQueue() {

package/dist/node/mcp-payload-guard.js

@@ -1,6 +1,6 @@
 import {
   MCPError
-} from "../chunk-3SZRB42B.js";
+} from "../chunk-VW5QGPIN.js";
 
 // src/node/mcp-payload-guard.ts
 var McpPayloadTooLargeError = class extends MCPError {