@fenglimg/fabric-shared 2.1.0-rc.2 → 2.2.0-rc.10

package/dist/index.js

@@ -1,22 +1,16 @@
-import {
-  BOOTSTRAP_CANONICAL,
-  BOOTSTRAP_MARKER_BEGIN,
-  BOOTSTRAP_MARKER_END,
-  BOOTSTRAP_REGEX,
-  LEGACY_KB_MARKER_BEGIN,
-  LEGACY_KB_MARKER_END,
-  LEGACY_KB_REGEX
-} from "./chunk-MDWTGOAY.js";
+import "./chunk-LXNCAKJZ.js";
 import {
   PROTECTED_TOKENS,
   createTranslator,
   defaultMessages,
-  detectNodeLocale,
   enMessages,
-  normalizeLocale,
   resolveFabricLocale,
   zhCNMessages
-} from "./chunk-R2J7DAED.js";
+} from "./chunk-AQMDXC6J.js";
+import {
+  atomicWriteJson,
+  withFileLock
+} from "./chunk-C7WZPYZE.js";
 import {
   FabExtractKnowledgeInputSchema,
   FabExtractKnowledgeInputShape,
@@ -26,14 +20,17 @@ import {
   FabReviewOutputSchema,
   FabReviewOutputShape,
   KNOWLEDGE_TYPE_CODES,
+  KNOWN_SCOPE_PREFIXES,
   KnowledgeEntryFrontmatterSchema,
   KnowledgeTypeSchema,
   LayerSchema,
   MaturitySchema,
   ONBOARD_SLOT_NAMES,
   ONBOARD_SLOT_TOTAL,
-  PROPOSED_REASON_DESCRIPTIONS,
+  PERSONAL_SCOPE,
+  PROPOSED_REASON_DESCRIPTIONS_BY_LOCALE,
   ProposedReasonSchema,
+  SCOPE_COORDINATE_PATTERN,
   StableIdSchema,
   annotateIntentRequestSchema,
   archiveScanAnnotations,
@@ -42,12 +39,14 @@ import {
   citeContractMetricsSchema,
   citeCoverageReportSchema,
   citeLayerTypeBreakdownSchema,
+  entryScopeMetadataSchema,
   fabExtractKnowledgeAnnotations,
   fabReviewAnnotations,
   formatKnowledgeId,
   historyStateQuerySchema,
   humanLockApproveRequestSchema,
   humanLockFileParamsSchema,
+  isPersonalScope,
   knowledgeSectionsAnnotations,
   knowledgeSectionsInputSchema,
   knowledgeSectionsOutputSchema,
@@ -63,9 +62,55 @@ import {
   recallAnnotations,
   recallInputSchema,
   recallOutputSchema,
+  scopeCoordinateSchema,
+  scopeRoot,
   structuredWarningSchema
-} from "./chunk-WVPDH4BF.js";
-import "./chunk-LXNCAKJZ.js";
+} from "./chunk-5AKCRBKJ.js";
+import {
+  BOOTSTRAP_CANONICAL_BY_LOCALE,
+  BOOTSTRAP_CANONICAL_EN,
+  BOOTSTRAP_CANONICAL_ZH,
+  BOOTSTRAP_MARKER_BEGIN,
+  BOOTSTRAP_MARKER_END,
+  BOOTSTRAP_REGEX,
+  matchBootstrapCanonicalLocale,
+  resolveBootstrapCanonical
+} from "./chunk-BDJQIOQO.js";
+import {
+  GLOBAL_BINDINGS_DIR,
+  GLOBAL_STATE_DIR,
+  PERSONAL_STORE_SENTINEL,
+  STORES_ROOT_DIR,
+  STORE_ALIAS_PATTERN,
+  STORE_KNOWLEDGE_TYPE_DIRS,
+  STORE_LAYOUT,
+  STORE_MOUNT_GROUPS,
+  STORE_MOUNT_NAME_PATTERN,
+  STORE_PROJECT_ID_PATTERN,
+  STORE_UUID_PATTERN,
+  deriveMountLabel,
+  detectNodeLocale,
+  globalConfigPath,
+  globalConfigSchema,
+  loadGlobalConfig,
+  mountedStoreSchema,
+  normalizeLocale,
+  requiredStoreEntrySchema,
+  resolveGlobalLocale,
+  resolveGlobalRoot,
+  saveGlobalConfig,
+  storeAliasSchema,
+  storeIdentitySchema,
+  storeKnowledgeTypeDir,
+  storeMountGroup,
+  storeMountNameSchema,
+  storeMountSubPath,
+  storeProjectSchema,
+  storeProjectsFileSchema,
+  storeRelativePath,
+  storeRelativePathForMount,
+  storeUuidSchema
+} from "./chunk-2GLIAZ5M.js";
 
 // src/schemas/agents-meta.ts
 import { z } from "zod";
@@ -77,10 +122,8 @@ var KNOWLEDGE_TYPE_SINGULAR_TO_PLURAL = {
   pitfall: "pitfalls",
   process: "processes"
 };
-var AGENTS_META_LAYERS = ["L0", "L1", "L2"];
 var AGENTS_META_TOPOLOGY_TYPES = ["mirror", "cross-cutting", "domain", "local", "global"];
 var AGENTS_META_IDENTITY_SOURCES = ["declared", "derived"];
-var agentsLayerSchema = z.enum(AGENTS_META_LAYERS);
 var agentsTopologyTypeSchema = z.enum(AGENTS_META_TOPOLOGY_TYPES);
 var agentsIdentitySourceSchema = z.enum(AGENTS_META_IDENTITY_SOURCES);
 var ruleDescriptionSchema = z.object({
@@ -112,13 +155,18 @@ var ruleDescriptionSchema = z.object({
   //   relevance_scope → 'broad'   (always-surface, safe default)
   //   relevance_paths → []        (no path anchors)
   relevance_scope: z.enum(["narrow", "broad"]).default("broad"),
-  relevance_paths: z.array(z.string()).default([])
+  relevance_paths: z.array(z.string()).default([]),
+  // v2.2 H2-related (W1-T7): explicit graph edges to related KB entries by
+  // stable_id. Authored in frontmatter (`related: [KT-DEC-0001, KT-PIT-0002]`)
+  // or written by the fabric-connect skill (SK2); read by fab_recall's
+  // include_related packaging (MC1). Optional + default [] so the field is a
+  // pure additive — every pre-v2.2 entry parses unchanged. The schema is
+  // .strict(), so this MUST be declared or `related:` frontmatter would be
+  // rejected at parse time.
+  related: z.array(z.string()).default([]).optional()
 }).strict();
 var ruleDescriptionIndexItemSchema = z.object({
   stable_id: z.string(),
-  level: agentsLayerSchema,
-  required: z.boolean(),
-  selectable: z.boolean(),
   description: ruleDescriptionSchema
 }).strict();
 var agentsMetaNodeBaseSchema = z.object({
@@ -128,10 +176,6 @@ var agentsMetaNodeBaseSchema = z.object({
   hash: z.string(),
   stable_id: z.string().optional(),
   identity_source: agentsIdentitySourceSchema.optional(),
-  activation: z.object({
-    tier: z.enum(["always", "path", "description"]),
-    description: z.string().optional()
-  }).optional(),
   description: ruleDescriptionSchema.optional(),
   sections: z.array(z.string()).optional()
 }).passthrough();
@@ -170,7 +214,6 @@ function withDerivedAgentsMetaNodeDefaults(node) {
   const identitySource = isKnowledgeEntry ? "declared" : deriveAgentsMetaIdentitySource(node);
   return {
     ...node,
-    level: node.level ?? deriveAgentsMetaLayer(node.file),
     topology_type: node.topology_type ?? deriveAgentsMetaTopologyType(node.file),
     stable_id: stableId,
     identity_source: identitySource
@@ -214,34 +257,12 @@ function deriveAgentsMetaIdentitySource(node) {
   const derivedStableId = deriveAgentsMetaStableId(node.file);
   return node.stable_id !== void 0 && node.stable_id !== derivedStableId ? "declared" : "derived";
 }
-function deriveAgentsMetaLayer(file) {
-  const normalized = normalizePath(file);
-  if (normalized === "AGENTS.md") {
-    return "L0";
-  }
-  if (hasCrossCuttingSegment(normalized)) {
-    return "L1";
-  }
-  const depthSource = getDepthSource(normalized);
-  const directoryDepth = getDirectoryDepth(depthSource);
-  if (directoryDepth === 0) {
-    return "L0";
-  }
-  if (directoryDepth <= 2) {
-    return "L1";
-  }
-  return "L2";
-}
 function deriveAgentsMetaTopologyType(file) {
   return hasCrossCuttingSegment(normalizePath(file)) ? "cross-cutting" : "mirror";
 }
 function getDepthSource(file) {
   return file.startsWith(FABRIC_AGENTS_PREFIX) ? file.slice(FABRIC_AGENTS_PREFIX.length) : file;
 }
-function getDirectoryDepth(file) {
-  const segments = file.split("/").filter(Boolean);
-  return Math.max(segments.length - 1, 0);
-}
 function hasCrossCuttingSegment(file) {
   return file.split("/").includes("_cross");
 }
@@ -327,104 +348,35 @@ var humanLockFileSchema = z4.object({
 });
 
 // src/schemas/fabric-config.ts
-import { z as z6 } from "zod";
-
-// src/schemas/store.ts
 import { z as z5 } from "zod";
-var STORE_UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/u;
-var storeUuidSchema = z5.string().regex(STORE_UUID_PATTERN, "store_uuid must be a canonical lowercase UUID");
-var PERSONAL_STORE_SENTINEL = "$personal";
-var storeIdentitySchema = z5.object({
-  // Intrinsic, immutable once minted. Read from store.json, never recomputed.
-  store_uuid: storeUuidSchema,
-  // ISO-8601. When the store was first initialized.
-  created_at: z5.string(),
-  // Optional human-facing canonical alias baked into the store (e.g. the
-  // team picks "platform-kb"). Local per-machine aliases are resolved by the
-  // StoreResolver from config and may differ; this is the suggested default.
-  canonical_alias: z5.string().optional(),
-  // Optional one-line description surfaced in `store list` / onboarding.
-  description: z5.string().optional(),
-  // The semantic scopes this store is *allowed* to hold. A shared (team)
-  // store MUST NOT list "personal" (R5#3 privacy boundary, enforced at write
-  // time in P2). Open coordinate strings — see schemas/scope.ts.
-  allowed_scopes: z5.array(z5.string()).optional()
-}).strict();
-var requiredStoreEntrySchema = z5.object({
-  id: z5.string().min(1),
-  suggested_remote: z5.union([z5.string().min(1), z5.literal(PERSONAL_STORE_SENTINEL)]).optional()
+var auditModeSchema = z5.enum(["strict", "warn", "off"]);
+var clientPathsSchema = z5.object({
+  claudeCodeCLI: z5.string().optional(),
+  claudeCodeDesktop: z5.string().optional(),
+  codexCLI: z5.string().optional()
 }).strict();
-var STORE_KNOWLEDGE_TYPE_DIRS = [
-  "models",
-  "decisions",
-  "guidelines",
-  "pitfalls",
-  "processes"
-];
-var STORE_LAYOUT = {
-  identityFile: "store.json",
-  knowledgeDir: "knowledge",
-  bindingsDir: "bindings",
-  stateDir: "state"
-};
-var STORES_ROOT_DIR = "stores";
-var GLOBAL_STATE_DIR = "state";
-var GLOBAL_BINDINGS_DIR = "bindings";
-function storeKnowledgeTypeDir(type) {
-  return `${STORE_LAYOUT.knowledgeDir}/${type}`;
-}
-function storeRelativePath(storeUuid) {
-  return `${STORES_ROOT_DIR}/${storeUuid}`;
-}
-var mountedStoreSchema = z5.object({
-  // Intrinsic identity of the mounted store (matches its store.json).
-  store_uuid: storeUuidSchema,
-  // Local per-machine alias the user references this store by (resolver maps
-  // alias → uuid). May differ from the store's canonical_alias.
-  alias: z5.string().min(1),
-  // Git remote locator for this clone, if any. Absent = local-only store
-  // (valid; doctor nudges to add a remote for backup — R5#5, P6).
-  remote: z5.string().min(1).optional(),
-  // v2.1.0-rc.1 P3: marks the implicit personal store (the one minted by
-  // `install --global`). Exactly one mounted store carries personal=true; it
-  // is the write target for personal-scope entries (R5#3) and always in the
-  // read-set (S11). Optional (no default) so the output type stays a plain
-  // optional — consumers coalesce `?? false` when building resolver input.
-  personal: z5.boolean().optional(),
-  // Whether writes are accepted into this store from this machine. Optional;
-  // consumers coalesce `?? true`. Shared stores cloned read-only set false.
-  writable: z5.boolean().optional()
+var mcpPayloadLimitsSchema = z5.object({
+  warnBytes: z5.number().int().positive().optional(),
+  hardBytes: z5.number().int().positive().optional()
+}).optional();
+var selectionTokenTtlMsSchema = z5.number().int().min(3e4).max(36e5);
+var planContextTopKSchema = z5.number().int().min(1).max(200);
+var fabricLanguageSchema = z5.enum(["zh-CN", "en"]);
+var defaultLayerFilterSchema = z5.enum(["team", "personal", "both"]);
+var nudgeModeSchema = z5.enum(["silent", "minimal", "normal", "verbose"]);
+var observeConfigSchema = z5.object({
+  session_start: z5.boolean().optional(),
+  pre_tool_use: z5.boolean().optional(),
+  stop: z5.boolean().optional()
 }).strict();
-var globalConfigSchema = z5.object({
-  // Machine/account identity. Personal-knowledge id namespace (S33/S27).
-  uid: z5.string().min(1),
-  // All stores mounted on this machine. The implicit personal store is
-  // included here once initialized. Default empty so a fresh global config
-  // (before `install --global`) parses cleanly.
-  stores: z5.array(mountedStoreSchema).optional().default([])
-}).passthrough();
-
-// src/schemas/fabric-config.ts
-var auditModeSchema = z6.enum(["strict", "warn", "off"]);
-var clientPathsSchema = z6.object({
-  claudeCodeCLI: z6.string().optional(),
-  claudeCodeDesktop: z6.string().optional(),
-  cursor: z6.string().optional(),
-  codexCLI: z6.string().optional()
+var writeRouteSchema = z5.object({
+  scope: z5.string().regex(
+    SCOPE_COORDINATE_PATTERN,
+    "write route scope must be ':'-joined lowercase [a-z0-9_-] segments"
+  ),
+  store: z5.string().min(1)
 }).strict();
-var mcpPayloadLimitsSchema = z6.object({
-  warnBytes: z6.number().int().positive().optional(),
-  hardBytes: z6.number().int().positive().optional()
-}).optional();
-var selectionTokenTtlMsSchema = z6.number().int().min(3e4).max(36e5);
-var fabricLanguageSchema = z6.enum([
-  "match-existing",
-  "zh-CN",
-  "en",
-  "zh-CN-hybrid"
-]);
-var defaultLayerFilterSchema = z6.enum(["team", "personal", "both"]);
-var fabricConfigSchema = z6.object({
+var fabricConfigSchema = z5.object({
   clientPaths: clientPathsSchema.optional(),
   // v2.1.0-rc.1 P0 (S13-projectid): the project's stable identity. A UUID
   // bound at `fabric install` time; a remote-derived hash is only a SUGGESTED
@@ -433,19 +385,37 @@ var fabricConfigSchema = z6.object({
   // fabric-config.json files simply lack it and the ProjectRootResolver mints
   // one on next install. `.fabric/fabric-config.json` carrying this field is
   // also the upward marker the ProjectRootResolver searches for (S15/S32).
-  project_id: z6.string().optional(),
+  project_id: z5.string().optional(),
+  // Store-only runtime binding identity. Defaults to project_id when omitted,
+  // but worktrees / sandboxes can set this to isolate hook/runtime state while
+  // keeping the same committed project identity.
+  workspace_binding_id: z5.string().optional(),
   // v2.1.0-rc.1 P0 (S59/B3): the stores this repo expects mounted. Each entry
   // names a store by alias/UUID with an optional suggested_remote (or the
   // `$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: z6.array(requiredStoreEntrySchema).optional(),
+  required_stores: z5.array(requiredStoreEntrySchema).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
   // activeWriteAlias. Absent → no active write store yet. Personal-scope
   // writes always target the implicit personal store regardless (R5#3).
-  active_write_store: z6.string().optional(),
+  active_write_store: z5.string().optional(),
+  // v2.1 global-refactor (W1/A2 — store project registry): the project this repo
+  // currently participates in, as the SINGLE scope segment forming the
+  // `project:<id>` coordinate (schemas/scope.ts). Set by `store bind --project
+  // <id>` (validated against the bound store's projects.json). Drives:
+  //   - write: project-scoped writes get `semantic_scope: project:<active_project>`.
+  //   - recall: keep `project:<active_project>` + non-project coords, drop other
+  //     `project:*` entries (G-FILTER).
+  // Absent → the repo has no project binding; recall does not project-filter.
+  active_project: z5.string().optional(),
+  // Global Store Topology: scope-aware write routing for multi shared/org stores.
+  // Personal scope ignores these routes and always resolves to the implicit
+  // personal store. `active_write_store` remains a backward-compatible fallback.
+  write_routes: z5.array(writeRouteSchema).optional(),
+  default_write_store: z5.string().optional(),
   // rc.17 (R-cut): the dev/test fixture-path config field was removed
   // end-to-end. The `EXTERNAL_FIXTURE_PATH` env var is now the sole source
   // consumed by `resolveDevMode()`. No z.preprocess alias — pre-rc.17
@@ -453,14 +423,23 @@ var fabricConfigSchema = z6.object({
   // the lenient root parser (no .strict() at root). Pre-user clean-slate per
   // memory/feedback_clean_slate.md; mirrors the rc.12 hard-rename precedent
   // documented above.
-  scanIgnores: z6.array(z6.string()).optional(),
+  scanIgnores: z5.array(z5.string()).optional(),
   audit_mode: auditModeSchema.optional(),
   mcpPayloadLimits: mcpPayloadLimitsSchema,
-  // Backward-compat: both fields are optional with defaults so existing
-  // fabric-config.json files (pre-grill-followup) parse unchanged. The default
-  // values themselves are load-bearing — see docs/data-schema.md.
-  fabric_language: fabricLanguageSchema.optional().default("match-existing"),
+  // grill-6fixes (D1): `fabric_language` is no longer a per-project field —
+  // language is a single machine-wide tone in `~/.fabric/fabric-global.json`.
+  // The root parser is lenient (no .strict()), so any stale `fabric_language`
+  // key left in an existing project config is silently dropped.
   default_layer_filter: defaultLayerFilterSchema.optional().default("both"),
+  // v2.2 dual-sink (Goal A / D4): human-output preset. See nudgeModeSchema for
+  // the level semantics + the flow ⊥ observation invariant (nudge_mode never
+  // touches the AI additionalContext sink). Default "normal" preserves the
+  // pre-dual-sink human visibility so existing dogfood repos see no regression.
+  nudge_mode: nudgeModeSchema.optional().default("normal"),
+  // v2.2 dual-sink (Goal A / D4): per-event human-output overrides. A set value
+  // wins over the nudge_mode preset for that event; absent events fall back to
+  // the preset. AI sink unaffected (same invariant as nudge_mode).
+  observe: observeConfigSchema.optional(),
   // Cooldown for the fabric-hint Stop hook (formerly archive-hint, renamed in
   // rc.5 TASK-010). After ANY of the three signals (archive / review / import)
   // fires, that signal stays silent for this many hours regardless of state
@@ -468,7 +447,7 @@ var fabricConfigSchema = z6.object({
   // day if the user keeps ignoring it." Set to 24 to align with the archive
   // trigger threshold. The legacy `archive_hint_` key is retained for backward
   // compat with existing user fabric-config.json files.
-  archive_hint_cooldown_hours: z6.number().int().positive().optional().default(12),
+  archive_hint_cooldown_hours: z5.number().int().positive().optional().default(12),
   // Underseed-node threshold for the fabric-hint Stop hook's import signal
   // (rc.5 TASK-010). When the canonical knowledge node count is strictly less
   // than this value AND a successful `init_scan_completed` event happened at
@@ -477,7 +456,7 @@ var fabricConfigSchema = z6.object({
   // the rule-of-thumb that a workspace with fewer than ten knowledge entries
   // is below the floor for plan_context retrieval to be meaningful. Also
   // consumed by `doctor` lint #22 (knowledge_underseeded).
-  underseed_node_threshold: z6.number().int().positive().optional().default(10),
+  underseed_node_threshold: z5.number().int().positive().optional().default(10),
   // Edit-count threshold for the fabric-hint Stop hook's Signal A
   // (rc.6 TASK-022 / E5). Signal A fires when EITHER (a) >=24h have elapsed
   // since the last `knowledge_proposed` event, OR (b) >=archive_edit_threshold
@@ -488,102 +467,102 @@ var fabricConfigSchema = z6.object({
   // there is probably something worth archiving"; lowered values nag more
   // aggressively, higher values rely on the 24h fallback. Missing or absent
   // edit-counter file degrades safely to the 24h-only path.
-  archive_edit_threshold: z6.number().int().positive().optional().default(20),
+  archive_edit_threshold: z5.number().int().positive().optional().default(20),
   // rc.7 T7: hours-since-last-knowledge_proposed cutoff for Signal A's
   // time branch. Was hardcoded as 24 in fabric-hint.cjs's THRESHOLD_HOURS;
   // externalized so chatty workspaces can lower the bar and quiet ones can
   // raise it. Default 24 preserves rc.6 behavior. See docs/configuration.md.
-  archive_hint_hours: z6.number().int().positive().optional().default(24),
+  archive_hint_hours: z5.number().int().positive().optional().default(24),
   // rc.7 T7: pending-count cutoff for Signal B (review skill). Was
   // hardcoded as 10 in fabric-hint.cjs's THRESHOLD_PENDING_COUNT.
   // Default 10 preserves rc.6 behavior. See docs/configuration.md for
   // small/medium/large repo recommendations.
-  review_hint_pending_count: z6.number().int().positive().optional().default(10),
+  review_hint_pending_count: z5.number().int().positive().optional().default(10),
   // rc.7 T7: pending-age cutoff (in days) for Signal B (review skill).
   // Was hardcoded as 7 in fabric-hint.cjs's THRESHOLD_PENDING_AGE_DAYS.
   // Default 7 preserves rc.6 behavior. See docs/configuration.md.
-  review_hint_pending_age_days: z6.number().int().positive().optional().default(7),
+  review_hint_pending_age_days: z5.number().int().positive().optional().default(7),
   // rc.7 T7 + T10 pre-wiring: days-since-last-doctor cutoff for the future
   // Signal D (maintenance hint). T10 will consume this to decide when the
   // fabric-hint Stop hook surfaces a "run `fabric doctor`" reminder.
   // Default 14 reflects a fortnightly cadence — long enough to avoid nag,
   // short enough to catch index drift before it compounds.
-  maintenance_hint_days: z6.number().int().positive().optional().default(14),
+  maintenance_hint_days: z5.number().int().positive().optional().default(14),
   // rc.7 T7 + T10 pre-wiring: cooldown between Signal D reminders, in
   // days. Once Signal D fires, it stays silent for this many days even if
   // the user doesn't run doctor. Default 7 keeps the reminder weekly at
   // worst — pairing 14d trigger + 7d cooldown means at most ~2 reminders
   // per month for a workspace that ignores them.
-  maintenance_hint_cooldown_days: z6.number().int().positive().optional().default(7),
+  maintenance_hint_cooldown_days: z5.number().int().positive().optional().default(7),
   // rc.9+ (skill-contract-fix B1): first-run import window in months. The
   // `fabric-import` skill scans this many months of git history on the very
   // first invocation (when no prior `import_run_completed` event exists).
   // Default 60 (~5 years) captures the bulk of a mature repo's signal in
   // one pass; small / fresh repos can lower to 12-24 with no loss.
-  import_window_first_run_months: z6.number().int().min(1).optional().default(60),
+  import_window_first_run_months: z5.number().int().min(1).optional().default(60),
   // rc.9+ (skill-contract-fix B1): rerun import window in months. After
   // the first successful import, subsequent runs only scan this many
   // recent months — assumed everything older has already been crystallized
   // into pending or canonical knowledge. Default 2 keeps incremental cost
   // low; raise to 6 if the workspace pauses fabric-import for long stretches.
-  import_window_rerun_months: z6.number().int().min(1).optional().default(2),
+  import_window_rerun_months: z5.number().int().min(1).optional().default(2),
   // rc.9+ (skill-contract-fix B1): hard cap on pending entries produced
   // per fabric-import invocation. Prevents one run from dumping hundreds
   // of proposals when a backfill window is wide open. Default 10 matches
   // the rule-of-thumb "human can triage ~10 pending entries in one
   // review pass." Range 1-50.
-  import_max_pending_per_run: z6.number().int().min(1).max(50).optional().default(10),
+  import_max_pending_per_run: z5.number().int().min(1).max(50).optional().default(10),
   // rc.9+ (skill-contract-fix B1): hard cap on commits scanned per
   // fabric-import invocation. Bounds runtime on monorepos with high
   // commit velocity. Default 500 covers ~2 months of typical churn;
   // range 50-2000. Hitting the cap mid-window is logged but non-fatal.
-  import_max_commits_scan: z6.number().int().min(50).max(2e3).optional().default(500),
+  import_max_commits_scan: z5.number().int().min(50).max(2e3).optional().default(500),
   // rc.9+ (skill-contract-fix B1): canonical-node count above which
   // fabric-import's pre-flight should warn / suggest review instead of
   // proceeding. A workspace with 50+ canonical entries usually benefits
   // more from `fabric-review` to consolidate than from importing more.
   // Default 50; raise to 100+ for large polyglot repos.
-  import_skip_canonical_threshold: z6.number().int().positive().optional().default(50),
+  import_skip_canonical_threshold: z5.number().int().positive().optional().default(50),
   // rc.9+ (skill-contract-fix B1): max candidate entries surfaced per
   // fabric-archive batch (one invocation of the skill). Pagination knob
   // for the archive UI flow. Default 8 keeps each batch reviewable in
   // one sitting; raise for large repos with high archive throughput.
-  archive_max_candidates_per_batch: z6.number().int().positive().optional().default(8),
+  archive_max_candidates_per_batch: z5.number().int().positive().optional().default(8),
   // rc.9+ (skill-contract-fix B1): max recently-touched paths included
   // in fabric-archive's "relevant context" lookup. Limits the size of
   // the path-relevance digest the skill emits when ranking candidates.
   // Default 20; large repos with deep directory fan-out can raise to
   // 50+ if archive candidates feel under-contextualized.
-  archive_max_recent_paths: z6.number().int().positive().optional().default(20),
+  archive_max_recent_paths: z5.number().int().positive().optional().default(20),
   // rc.9+ (skill-contract-fix B1): max prior fabric-archive sessions
   // summarised in the digest the skill loads on start. Prevents the
   // digest from ballooning past the model context budget on workspaces
   // that have archived repeatedly. Default 10; lower if context pressure
   // bites, raise if you want longer-range archive trend visibility.
-  archive_digest_max_sessions: z6.number().int().positive().optional().default(10),
+  archive_digest_max_sessions: z5.number().int().positive().optional().default(10),
   // rc.9+ (skill-contract-fix B1): max review results returned per
   // topic when `fabric-review` clusters pending entries. Pagination
   // knob analogous to archive_max_candidates_per_batch but scoped to
   // each topic cluster. Default 8; raise to 15-20 for large repos
   // where each topic legitimately groups many pending entries.
-  review_topic_result_cap: z6.number().int().positive().optional().default(8),
+  review_topic_result_cap: z5.number().int().positive().optional().default(8),
   // rc.9+ (skill-contract-fix B1): age threshold (in days) above which
   // a pending entry is considered "stale" by fabric-review and surfaced
   // for explicit resolve-or-drop decision. Default 14; tighter than the
   // 7d Signal-B trigger because review specifically targets the long
   // tail. Large repos with slower cadence can raise to 30.
-  review_stale_pending_days: z6.number().int().positive().optional().default(14),
+  review_stale_pending_days: z5.number().int().positive().optional().default(14),
   // v2.0.0-rc.34 TASK-05: reverse-unarchive opt-in. When true, callers of the
   // `unarchiveKnowledge` primitive (and any future doctor auto-detect lint built
   // on top) will execute the file move + ledger emit. When false (default),
   // the same callers MUST short-circuit before any mutation — the primitive is
   // shipped but inert until explicitly enabled. Opt-in posture mirrors the
   // archive-flow precedent: destructive-ish file moves stay behind a flag.
-  reverse_unarchive_enabled: z6.boolean().optional().default(false),
+  reverse_unarchive_enabled: z5.boolean().optional().default(false),
   // v2.0.0-rc.34 TASK-05: forces `unarchiveKnowledge` into dry-run mode even
   // when called with `options.dryRun=false`. Lets operators preview a
   // restoration pass before flipping `reverse_unarchive_enabled` to true.
-  reverse_unarchive_dry_run: z6.boolean().optional().default(false),
+  reverse_unarchive_dry_run: z5.boolean().optional().default(false),
   // v2.0.0-rc.34 TASK-06: long-session cite-policy evict window in user-prompt
   // turns. UserPromptSubmit hook (Claude Code only) maintains a per-session
   // counter and re-injects the cite contract reminder via
@@ -591,7 +570,31 @@ var fabricConfigSchema = z6.object({
   // Default 0 = OFF (opt-in). Recommend 10-20 for active sessions; 5 for
   // 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),
+  cite_evict_interval: z5.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: z5.boolean().optional().default(true),
+  cite_recall_window_minutes: z5.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: z5.array(z5.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: z5.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`
@@ -604,7 +607,7 @@ var fabricConfigSchema = z6.object({
   // Mirrors cite-policy precedent of locking enum-style numeric tunables
   // to a small literal set (vs free `.positive()`) to prevent fat-finger
   // misconfig.
-  fabric_event_retention_days: z6.union([z6.literal(7), z6.literal(30), z6.literal(90)]).optional(),
+  fabric_event_retention_days: z5.union([z5.literal(7), z5.literal(30), z5.literal(90)]).optional(),
   // v2.0.0-rc.23 TASK-014 (F8c): onboard slot opt-out list. Tracks slot
   // names the user explicitly dismissed during fabric-archive's first-run
   // onboard phase (or via `fabric config dismiss-slot <slot>`). Dismissed
@@ -621,7 +624,7 @@ var fabricConfigSchema = z6.object({
   //
   // Default `[]` keeps the field optional on existing configs — fresh
   // installs land with no opt-outs.
-  onboard_slots_opted_out: z6.array(z6.string()).optional().default([]),
+  onboard_slots_opted_out: z5.array(z5.string()).optional().default([]),
   // v2.0.0-rc.33 W2-1 (P0-9): TopK upper bound for the broad SessionStart hint
   // banner emitted by knowledge-hint-broad.cjs. After plan-context-hint returns
   // its full broad-scoped index, the hook slices the entries to this many
@@ -633,20 +636,45 @@ var fabricConfigSchema = z6.object({
   // Range 1..50; values above 20 effectively disable the cap because the
   // TRUNCATION_THRESHOLD=12 grouped-render kicks in. Mirrors the rc.7 T7 +
   // archive_max_* pattern of externalizing previously-hardcoded thresholds.
-  hint_broad_top_k: z6.number().int().min(1).max(50).optional().default(8),
+  hint_broad_top_k: z5.number().int().min(1).max(50).optional().default(8),
+  // KT-DEC-0036: the SessionStart broad-menu is now index-only (title + summary
+  // per always-active entry, no eager body), so the former `hint_broad_budget_chars`
+  // body char-budget knob was retired — there is no rendered body left to bound.
+  // W4-1 (KT-DEC-0028 / KT-MOD-0001): scale backstop for the FULL broad index.
+  // After W2-1 retired the hint_broad_top_k hard cap, the broad banner shows
+  // every broad entry (completeness); this is the only guard — once a store's
+  // rendered broad index exceeds this many lines the overflow tail folds into a
+  // single drift marker. The doctor `broad-index-drift` lint (W4-2) warns at 80%
+  // of this value per store so the corpus can be pruned (fabric-audit) BEFORE the
+  // banner silently truncates. Default 50; range 20..500 (read inline by
+  // knowledge-hint-broad.cjs#readBroadIndexBackstop with the same bounds).
+  broad_index_backstop: z5.number().int().min(20).max(500).optional().default(50),
   // v2.0.0-rc.37 NEW-16: durable per-signal dismiss for the fabric-hint Stop
   // hook nudges. Any signal type listed here is suppressed at emit time across
   // all sessions (the session-scoped sibling lives in a .fabric/.cache sidecar
   // written on request). Mirrors the cite_evict_interval=0 opt-out convention —
   // a knob for an existing surface, not a new feature. Unknown types ignored.
-  hint_dismiss_signals: z6.array(z6.enum(["archive", "review", "import", "maintenance"])).optional(),
+  hint_dismiss_signals: z5.array(z5.enum(["archive", "review", "import", "maintenance"])).optional(),
+  // v2.1 ADJ-NEWN-4: user-override escape hatches for the two strong behavioral
+  // policies (cite-before-edit + self-archive). The strong policies can make an
+  // agent feel like a "stubborn parrot" (D2 user-in-control red line); these
+  // flags let a user durably turn either off via fabric-config.json (or the
+  // `fabric config` panel) without editing bootstrap/AGENTS.md. Default true
+  // preserves rc.x behavior (policies ON); set false to opt a project out.
+  // The bootstrap behavior layer references these so the AGENTS.md rules degrade
+  // from "MUST" to "optional" when disabled — a config knob for an existing
+  // surface, mirroring the cite_evict_interval=0 / hint_dismiss_signals opt-out
+  // convention, NOT a new feature. Wave3 J32 will quantify the friction these
+  // relieve; until then they ship as inert-safe opt-outs.
+  cite_policy_enabled: z5.boolean().optional().default(true),
+  self_archive_policy_enabled: z5.boolean().optional().default(true),
   // v2.0.0-rc.33 W2-1 (P0-9): TopK upper bound for the narrow PreToolUse hint
   // emitted by knowledge-hint-narrow.cjs. After filtering to entries whose
   // `relevance_scope === "narrow"` (rc.27 TASK-005 audit §2.5 fix), the hook
   // slices to this many before the E3 emit-gate / renderSummary pipeline.
   // Default 5 keeps each per-Edit hint terse — five lines max so the agent's
   // working memory is not displaced by an unwieldy banner. Range 1..20.
-  hint_narrow_top_k: z6.number().int().min(1).max(20).optional().default(5),
+  hint_narrow_top_k: z5.number().int().min(1).max(20).optional().default(5),
   // v2.0.0-rc.33 W2-1 (P0-9): per-file dedup window (in PreToolUse turns) for
   // the narrow hint. Same (file_path, stable_id) tuple stays silent for this
   // many turns even when the E3 cross-session cache would otherwise re-emit.
@@ -656,7 +684,7 @@ var fabricConfigSchema = z6.object({
   // Storage: .fabric/.cache/narrow-dedup-window.json — distinct from session-
   // hints cache so a window-only suppression does not poison cross-session
   // dedupe semantics.
-  hint_narrow_dedup_window_turns: z6.number().int().min(1).max(50).optional().default(5),
+  hint_narrow_dedup_window_turns: z5.number().int().min(1).max(50).optional().default(5),
   // v2.0.0-rc.33 W2-5 (P1-8): cooldown between broad SessionStart hint emits,
   // in hours. Distinct from the archive_hint_cooldown_hours that gates the
   // fabric-hint Stop hook — knowledge-hint-broad re-fires on every
@@ -665,29 +693,34 @@ var fabricConfigSchema = z6.object({
   // menu at most once per hour"; 0 means "no cooldown, current behavior."
   // Range 0..168 (one week). Stored alongside fabric-hint's cooldown cache
   // under a distinct knowledge-hint-broad key.
-  hint_broad_cooldown_hours: z6.number().int().min(0).max(168).optional().default(0),
+  hint_broad_cooldown_hours: z5.number().int().min(0).max(168).optional().default(0),
   // v2.0.0-rc.33 W2-5 (P1-8): cooldown for the narrow PreToolUse hint.
   // Same shape as hint_broad_cooldown_hours but applies to per-Edit hint
   // re-emission across the cooldown window — independent of E3 session-
   // hints dedupe. Default 0 preserves rc.32 behavior; set to e.g. 1 to
   // throttle hint frequency during rapid-fire editing sprints. Range
   // 0..168 (one week).
-  hint_narrow_cooldown_hours: z6.number().int().min(0).max(168).optional().default(0),
+  hint_narrow_cooldown_hours: z5.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).
-  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.2 W3-T5 (F-MATURITY-ENDORSED): the canonical maturity enum is
+  // draft/verified/proven (KT-DEC-0005). These threshold keys use the canonical
+  // vocabulary; the loader maps proven→stable / verified→endorsed onto the
+  // doctor's internal orphan_demote ladder.
+  orphan_demote_proven_days: z5.number().int().min(1).max(3650).optional(),
+  orphan_demote_verified_days: z5.number().int().min(1).max(3650).optional(),
+  orphan_demote_draft_days: z5.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
   // cost=12 for password hashing"), too long for terse pitfalls. Range 40..240;
   // default 80 preserves rc.32 behavior. Both hooks read the same key so the
   // banner styling stays consistent across SessionStart + PreToolUse.
-  hint_summary_max_len: z6.number().int().min(40).max(240).optional().default(80),
+  hint_summary_max_len: z5.number().int().min(40).max(240).optional().default(80),
   // v2.0.0-rc.33 W2-6 (P0-7 + P0-8): when true, knowledge-hint hooks emit
   // their banners as `hookSpecificOutput.additionalContext` JSON on stdout
   // (per Claude Code PreToolUse hook contract — see
@@ -697,7 +730,7 @@ var fabricConfigSchema = z6.object({
   // coverage focus (rc.32 baseline 3.1% → primary cause: reminders never
   // entered model context). Set false to revert to legacy stderr-only mode
   // for hosts that don't honor the JSON contract.
-  hint_reminder_to_context: z6.boolean().optional().default(true),
+  hint_reminder_to_context: z5.boolean().optional().default(true),
   // v2.0.0-rc.29 TASK-008 (BUG-F3): selection-token TTL override. The
   // `fab_plan_context` MCP tool hands clients a `selection_token` whose default
   // 5-minute lifetime (`SELECTION_TOKEN_TTL_MS` at
@@ -713,12 +746,56 @@ var fabricConfigSchema = z6.object({
   // so the server-side per-field reader can validate without re-running the
   // whole fabricConfigSchema on every plan_context call — that lets a corrupt
   // unrelated field stay isolated from the hot read path.
-  selection_token_ttl_ms: selectionTokenTtlMsSchema.optional()
+  selection_token_ttl_ms: selectionTokenTtlMsSchema.optional(),
+  // v2.2 A-INFRA-3 (W1-T3-TOPK): bound on `fab_plan_context` candidate count,
+  // applied after BM25 ranking. Absent → library default (24). See
+  // planContextTopKSchema for the range/calibration rationale.
+  plan_context_top_k: planContextTopKSchema.optional(),
+  // KT-DEC-0038: ratio-to-top relevance floor (α) for recall / plan_context.
+  // After ranking, keep only candidates whose fused score >= α × the top
+  // candidate's score — self-normalizing against the current query's max, so it
+  // is immune to BM25's uncalibrated cross-query scale. top_k is a pure safety
+  // cap above this. Range 0..1; absent → library default (0.25). 0 disables the
+  // floor (keep all up to top_k).
+  recall_relevance_ratio: z5.number().min(0).max(1).optional(),
+  // KT-DEC-0037: the `retrieval_budget_profile` enum was deleted. top_k is the
+  // 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),
+  // 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
+  // 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: z5.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: z5.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
-import { z as z7 } from "zod";
-var positiveIntSchema = z7.coerce.number().int().positive();
+import { z as z6 } from "zod";
+var positiveIntSchema = z6.coerce.number().int().positive();
 function makePositiveIntField(key, defaultValue) {
   return {
     key,
@@ -774,6 +851,28 @@ function makeEnumField(key, group, enumValues, defaultValue) {
     }
   };
 }
+function makeBooleanField(key, defaultValue) {
+  return {
+    key,
+    group: "D_behavior",
+    widget: "select",
+    label_i18n_key: `cli.config.fields.${key}.label`,
+    description_i18n_key: `cli.config.fields.${key}.description`,
+    default: String(defaultValue),
+    enum_values: ["true", "false"],
+    validate(raw) {
+      const trimmed = raw.trim();
+      if (trimmed === "true") return { ok: true, value: true };
+      if (trimmed === "false") return { ok: true, value: false };
+      return { ok: false, error: "Must be one of: true, false." };
+    },
+    format_for_display(value) {
+      if (typeof value === "boolean") return String(value);
+      if (value === void 0 || value === null) return String(defaultValue);
+      return String(value);
+    }
+  };
+}
 var SCHEMA_DEFAULTS = fabricConfigSchema.parse({});
 function pickNumberDefault(key) {
   const v = SCHEMA_DEFAULTS[key];
@@ -802,12 +901,13 @@ function getPanelFieldByKey(key) {
 }
 var PANEL_FIELDS = [
   // --- Group A: Locale (2) ---
-  makeEnumField(
-    "fabric_language",
-    "A_locale",
-    fabricLanguageSchema.options,
-    pickStringDefault("fabric_language")
-  ),
+  // grill-6fixes (D1): `fabric_language` is no longer a project-config field —
+  // it is the single machine-wide tone in `~/.fabric/fabric-global.json`. The
+  // panel still surfaces it (the `fabric config` language entry), but config.ts
+  // special-cases this key to read/write the GLOBAL config instead of the
+  // project file. Default is a literal "en" since there is no project-schema
+  // default to derive from.
+  makeEnumField("fabric_language", "A_locale", fabricLanguageSchema.options, "en"),
   makeEnumField(
     "default_layer_filter",
     "A_locale",
@@ -851,39 +951,23 @@ var PANEL_FIELDS = [
     "C_audit",
     auditModeSchema.options,
     AUDIT_MODE_PANEL_DEFAULT
-  )
+  ),
+  // --- Group D: Behavior / features (2) ---
+  // 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`.
+  makeEnumField("nudge_mode", "D_behavior", nudgeModeSchema.options, "normal"),
+  makeBooleanField("embed_enabled", false)
 ];
 
-// src/schemas/scope.ts
-import { z as z8 } from "zod";
-var PERSONAL_SCOPE = "personal";
-var KNOWN_SCOPE_PREFIXES = ["personal", "team", "project", "org"];
-var SCOPE_COORDINATE_PATTERN = /^[a-z0-9_-]+(:[a-z0-9_-]+)*$/u;
-var scopeCoordinateSchema = z8.string().min(1).regex(
-  SCOPE_COORDINATE_PATTERN,
-  "scope coordinate must be ':'-joined lowercase [a-z0-9_-] segments"
-);
-function scopeRoot(coordinate) {
-  const colon = coordinate.indexOf(":");
-  return colon === -1 ? coordinate : coordinate.slice(0, colon);
-}
-function isPersonalScope(coordinate) {
-  return scopeRoot(coordinate) === PERSONAL_SCOPE;
-}
-var entryScopeMetadataSchema = z8.object({
-  semantic_scope: scopeCoordinateSchema,
-  // Store alias or UUID. Validated as a non-empty string here; the resolver
-  // (P0.6) maps alias→UUID and verifies the store is in the read-set.
-  visibility_store: z8.string().min(1)
-}).strict();
-
 // src/schemas/store-stable-id.ts
-import { z as z9 } from "zod";
+import { z as z7 } from "zod";
 var localKnowledgeIdSchema = StableIdSchema;
 var UID_SEGMENT_PATTERN = /^[a-z0-9-]+$/u;
-var uidSchema = z9.string().min(1).regex(UID_SEGMENT_PATTERN, "uid must be lowercase [a-z0-9-] segments");
+var uidSchema = z7.string().min(1).regex(UID_SEGMENT_PATTERN, "uid must be lowercase [a-z0-9-] segments");
 var GLOBAL_REF_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(:[a-z0-9-]+)?:K[PT]-(MOD|DEC|GLD|PIT|PRO)-\d{4,}$/u;
-var globalRefSchema = z9.string().regex(GLOBAL_REF_PATTERN, "global_ref must be <store_uuid>[:<uid>]:<local_id>");
+var globalRefSchema = z7.string().regex(GLOBAL_REF_PATTERN, "global_ref must be <store_uuid>[:<uid>]:<local_id>");
 function formatGlobalRef(parts) {
   const { store_uuid, uid, local_id } = parts;
   return uid === void 0 ? `${store_uuid}:${local_id}` : `${store_uuid}:${uid}:${local_id}`;
@@ -908,14 +992,14 @@ function parseGlobalRef(ref) {
     local_id
   };
 }
-var storeKnowledgeTypeCountersSchema = z9.object({
-  MOD: z9.number().int().nonnegative().default(0),
-  DEC: z9.number().int().nonnegative().default(0),
-  GLD: z9.number().int().nonnegative().default(0),
-  PIT: z9.number().int().nonnegative().default(0),
-  PRO: z9.number().int().nonnegative().default(0)
+var storeKnowledgeTypeCountersSchema = z7.object({
+  MOD: z7.number().int().nonnegative().default(0),
+  DEC: z7.number().int().nonnegative().default(0),
+  GLD: z7.number().int().nonnegative().default(0),
+  PIT: z7.number().int().nonnegative().default(0),
+  PRO: z7.number().int().nonnegative().default(0)
 }).default({ MOD: 0, DEC: 0, GLD: 0, PIT: 0, PRO: 0 });
-var storeCountersSchema = z9.object({
+var storeCountersSchema = z7.object({
   KP: storeKnowledgeTypeCountersSchema,
   KT: storeKnowledgeTypeCountersSchema
 }).default({
@@ -924,64 +1008,63 @@ var storeCountersSchema = z9.object({
 });
 
 // src/schemas/parity-matrix.ts
-import { z as z10 } from "zod";
-var PARITY_CLIENTS = ["claudeCode", "codexCLI", "cursor"];
-var parityClientSchema = z10.enum(PARITY_CLIENTS);
+import { z as z8 } from "zod";
+var PARITY_CLIENTS = ["claudeCode", "codexCLI"];
+var parityClientSchema = z8.enum(PARITY_CLIENTS);
 var PARITY_SURFACES = ["skill", "hook", "mcp", "render"];
-var paritySurfaceSchema = z10.enum(PARITY_SURFACES);
-var parityClientExpectationSchema = z10.object({
-  supported: z10.boolean(),
-  mechanism: z10.string().optional(),
-  notes: z10.string().optional()
+var paritySurfaceSchema = z8.enum(PARITY_SURFACES);
+var parityClientExpectationSchema = z8.object({
+  supported: z8.boolean(),
+  mechanism: z8.string().optional(),
+  notes: z8.string().optional()
 }).strict();
-var parityCapabilitySchema = z10.object({
-  id: z10.string().min(1),
+var parityCapabilitySchema = z8.object({
+  id: z8.string().min(1),
   surface: paritySurfaceSchema,
-  description: z10.string().min(1),
-  clients: z10.object({
+  description: z8.string().min(1),
+  clients: z8.object({
     claudeCode: parityClientExpectationSchema,
-    codexCLI: parityClientExpectationSchema,
-    cursor: parityClientExpectationSchema
+    codexCLI: parityClientExpectationSchema
   }).strict()
 }).strict();
-var parityMatrixSchema = z10.object({
+var parityMatrixSchema = z8.object({
   // Schema/version tag of the matrix document itself.
-  version: z10.string().min(1),
+  version: z8.string().min(1),
   // Free-form note on what release/milestone this matrix targets.
-  generated_for: z10.string().min(1),
-  capabilities: z10.array(parityCapabilitySchema).min(1)
+  generated_for: z8.string().min(1),
+  capabilities: z8.array(parityCapabilitySchema).min(1)
 }).strict();
 
 // src/resolver/contracts.ts
-import { z as z11 } from "zod";
+import { z as z9 } from "zod";
 var PROJECT_ROOT_SIGNALS = ["env", "marker", "cwd", "repo"];
-var projectRootSignalSchema = z11.enum(PROJECT_ROOT_SIGNALS);
-var projectRootSignalsSchema = z11.object({
+var projectRootSignalSchema = z9.enum(PROJECT_ROOT_SIGNALS);
+var projectRootSignalsSchema = z9.object({
   // FABRIC_PROJECT_ROOT, if set.
-  env: z11.string().optional(),
+  env: z9.string().optional(),
   // Nearest directory AT-OR-ABOVE cwd holding `.fabric/fabric-config.json`,
   // if any (the upward marker search result; may equal cwd).
-  markerDir: z11.string().optional(),
+  markerDir: z9.string().optional(),
   // Always present — the process cwd.
-  cwd: z11.string().min(1),
+  cwd: z9.string().min(1),
   // git repo root, if inside a repo.
-  repoRoot: z11.string().optional(),
+  repoRoot: z9.string().optional(),
   // The `project_id` read from the winning root's fabric-config.json during
   // (fs) signal collection. The pure resolver echoes it — it cannot invent a
   // UUID. Worktrees of one repo share the committed config, hence the same
   // project_id (S45 merge). Absent when no .fabric config exists at the root
   // yet (fresh repo-fallback) → resolution still yields the root with a null
   // projectId so the caller can mint+persist one at install time.
-  discoveredProjectId: z11.string().optional()
+  discoveredProjectId: z9.string().optional()
 }).strict();
-var projectRootResolutionSchema = z11.object({
+var projectRootResolutionSchema = z9.object({
   // Absolute project root directory.
-  projectRoot: z11.string().min(1),
+  projectRoot: z9.string().min(1),
   // Stable project identity. One repo = one .fabric = one project_id (S32);
   // git worktrees of the same repo resolve to the SAME project_id (S45).
   // Null when the resolved root has no fabric-config.json yet (fresh
   // repo-fallback) — the caller mints + persists a UUID at install time.
-  projectId: z11.string().min(1).nullable(),
+  projectId: z9.string().min(1).nullable(),
   // Which signal won.
   signalUsed: projectRootSignalSchema
 }).strict();
@@ -990,91 +1073,96 @@ var STORE_RESOLVER_WARNING_CODES = [
   // required_stores entry has no matching mounted store (S51)
   "local_only_no_remote",
   // mounted but local-only (R5#5 nudge, non-fatal)
-  "alias_unresolved"
+  "alias_unresolved",
   // referenced alias maps to no mounted store
+  "missing_write_route"
+  // multi/shared write requires an explicit route
 ];
-var storeResolverWarningCodeSchema = z11.enum(STORE_RESOLVER_WARNING_CODES);
-var storeResolverWarningSchema = z11.object({
+var storeResolverWarningCodeSchema = z9.enum(STORE_RESOLVER_WARNING_CODES);
+var storeResolverWarningSchema = z9.object({
   code: storeResolverWarningCodeSchema,
   // The alias/UUID/id the warning concerns.
-  ref: z11.string().min(1),
-  message: z11.string().min(1)
+  ref: z9.string().min(1),
+  message: z9.string().min(1)
 }).strict();
-var readSetEntrySchema = z11.object({
-  store_uuid: z11.string().min(1),
-  alias: z11.string().min(1),
-  remote: z11.string().min(1).optional(),
+var readSetEntrySchema = z9.object({
+  store_uuid: z9.string().min(1),
+  alias: z9.string().min(1),
+  remote: z9.string().min(1).optional(),
   // Whether this store accepts writes from the current context. Personal
   // store is writable; shared stores writable iff mounted with write intent.
-  writable: z11.boolean()
+  writable: z9.boolean()
 }).strict();
-var storeReadSetSchema = z11.object({
-  stores: z11.array(readSetEntrySchema),
-  warnings: z11.array(storeResolverWarningSchema)
+var storeReadSetSchema = z9.object({
+  stores: z9.array(readSetEntrySchema),
+  warnings: z9.array(storeResolverWarningSchema)
 }).strict();
-var writeTargetSchema = z11.object({
-  store_uuid: z11.string().min(1),
-  alias: z11.string().min(1)
+var writeTargetSchema = z9.object({
+  store_uuid: z9.string().min(1),
+  alias: z9.string().min(1)
 }).strict();
-var storeResolveInputSchema = z11.object({
+var storeResolveInputSchema = z9.object({
   // Machine identity (S33) — namespaces personal ids; identifies personal store.
-  uid: z11.string().min(1),
+  uid: z9.string().min(1),
   // Stores mounted on this machine (from global config).
-  mountedStores: z11.array(
-    z11.object({
-      store_uuid: z11.string().min(1),
-      alias: z11.string().min(1),
-      remote: z11.string().min(1).optional(),
-      writable: z11.boolean().default(true),
+  mountedStores: z9.array(
+    z9.object({
+      store_uuid: z9.string().min(1),
+      alias: z9.string().min(1),
+      mount_name: z9.string().min(1).optional(),
+      remote: z9.string().min(1).optional(),
+      writable: z9.boolean().default(true),
       // Marks the implicit personal store.
-      personal: z11.boolean().default(false)
+      personal: z9.boolean().default(false)
     }).strict()
   ),
   // The project's declared required_stores (ids/aliases + optional remote).
-  requiredStores: z11.array(
-    z11.object({
-      id: z11.string().min(1),
-      suggested_remote: z11.string().min(1).optional()
+  requiredStores: z9.array(
+    z9.object({
+      id: z9.string().min(1),
+      suggested_remote: z9.string().min(1).optional()
     }).strict()
   ),
   // Alias selected as the active write store for non-personal scopes, if any.
-  activeWriteAlias: z11.string().min(1).optional()
+  activeWriteAlias: z9.string().min(1).optional(),
+  // Scope-aware write routes. Exact scope wins first, then longest prefix route.
+  writeRoutes: z9.array(
+    z9.object({
+      scope: z9.string().min(1),
+      store: z9.string().min(1)
+    }).strict()
+  ).optional().default([]),
+  defaultWriteAlias: z9.string().min(1).optional()
 }).strict();
-var projectRootGoldenCaseSchema = z11.object({
-  name: z11.string().min(1),
-  note: z11.string().optional(),
+var projectRootGoldenCaseSchema = z9.object({
+  name: z9.string().min(1),
+  note: z9.string().optional(),
   signals: projectRootSignalsSchema,
   // null expected = resolver should return no root for these signals.
   expected: projectRootResolutionSchema.nullable()
 }).strict();
-var projectRootGoldenFileSchema = z11.object({
-  contract: z11.literal("project-root.golden"),
-  cases: z11.array(projectRootGoldenCaseSchema).min(1)
+var projectRootGoldenFileSchema = z9.object({
+  contract: z9.literal("project-root.golden"),
+  cases: z9.array(projectRootGoldenCaseSchema).min(1)
 }).strict();
-var readSetGoldenCaseSchema = z11.object({
-  name: z11.string().min(1),
-  note: z11.string().optional(),
+var readSetGoldenCaseSchema = z9.object({
+  name: z9.string().min(1),
+  note: z9.string().optional(),
   input: storeResolveInputSchema,
   // Scope under test for the write-target expectation.
-  writeScope: z11.string().min(1),
-  expected: z11.object({
+  writeScope: z9.string().min(1),
+  expected: z9.object({
     readSet: storeReadSetSchema,
     writeTarget: writeTargetSchema.nullable(),
-    writeWarnings: z11.array(storeResolverWarningSchema)
+    writeWarnings: z9.array(storeResolverWarningSchema)
   }).strict()
 }).strict();
-var readSetGoldenFileSchema = z11.object({
-  contract: z11.literal("read-set.golden"),
-  cases: z11.array(readSetGoldenCaseSchema).min(1)
+var readSetGoldenFileSchema = z9.object({
+  contract: z9.literal("read-set.golden"),
+  cases: z9.array(readSetGoldenCaseSchema).min(1)
 }).strict();
 
 // src/resolver/project-root-resolver.ts
-var ResolverNotImplementedError = class extends Error {
-  constructor(what) {
-    super(`${what} is not implemented yet (TDD target)`);
-    this.name = "ResolverNotImplementedError";
-  }
-};
 function createProjectRootResolver() {
   return {
     resolve(signals) {
@@ -1112,12 +1200,65 @@ function personalEntry(input) {
   }
   return entry;
 }
+function readSetEntryFromMounted(store) {
+  const entry = {
+    store_uuid: store.store_uuid,
+    alias: store.alias,
+    writable: store.writable
+  };
+  if (store.remote !== void 0) {
+    entry.remote = store.remote;
+    return { entry };
+  }
+  return {
+    entry,
+    warning: {
+      code: "local_only_no_remote",
+      ref: store.alias,
+      message: `store '${store.alias}' is local-only; add a git remote to back it up (\`fabric store ... \` / doctor nudge)`
+    }
+  };
+}
+function isMountedPersonal(input, storeUuid) {
+  return input.mountedStores.some((store) => store.store_uuid === storeUuid && store.personal);
+}
+function routeMatches(routeScope, scope) {
+  return scope === routeScope || scope.startsWith(`${routeScope}:`);
+}
+function resolveRouteAlias(input, scope) {
+  const routes = input.writeRoutes ?? [];
+  const exact = routes.find((route) => route.scope === scope);
+  if (exact !== void 0) {
+    return exact.store;
+  }
+  const prefix = routes.filter((route) => routeMatches(route.scope, scope)).sort((a, b) => b.scope.length - a.scope.length)[0];
+  return prefix?.store ?? input.defaultWriteAlias ?? input.activeWriteAlias;
+}
+function hasMultipleSharedStores(input, readSet) {
+  return readSet.stores.filter((store) => !isMountedPersonal(input, store.store_uuid)).length > 1;
+}
+function hasExplicitRouteOrDefault(input, scope) {
+  const routes = input.writeRoutes ?? [];
+  return routes.some((route) => routeMatches(route.scope, scope)) || input.defaultWriteAlias !== void 0;
+}
 function createStoreResolver() {
   return {
     resolveReadSet(input) {
       const stores = [];
       const warnings = [];
+      const seenStoreUuids = /* @__PURE__ */ new Set();
       for (const req of input.requiredStores) {
+        if (req.suggested_remote === "$personal") {
+          const personal2 = findPersonal(input);
+          if (personal2 === void 0) {
+            warnings.push({
+              code: "missing_store",
+              ref: req.id,
+              message: `required store '${req.id}' is not mounted; run \`fabric store add\` (suggested remote: $personal)`
+            });
+          }
+          continue;
+        }
         const matched = input.mountedStores.find(
           (m) => !m.personal && (m.alias === req.id || m.store_uuid === req.id)
         );
@@ -1130,25 +1271,20 @@ function createStoreResolver() {
           });
           continue;
         }
-        const entry = {
-          store_uuid: matched.store_uuid,
-          alias: matched.alias,
-          writable: matched.writable
-        };
-        if (matched.remote !== void 0) {
-          entry.remote = matched.remote;
-        } else {
-          warnings.push({
-            code: "local_only_no_remote",
-            ref: matched.alias,
-            message: `store '${matched.alias}' is local-only; add a git remote to back it up (\`fabric store ... \` / doctor nudge)`
-          });
+        if (seenStoreUuids.has(matched.store_uuid)) {
+          continue;
+        }
+        const { entry, warning } = readSetEntryFromMounted(matched);
+        if (warning !== void 0) {
+          warnings.push(warning);
         }
         stores.push(entry);
+        seenStoreUuids.add(matched.store_uuid);
       }
       const personal = personalEntry(input);
-      if (personal !== void 0) {
+      if (personal !== void 0 && !seenStoreUuids.has(personal.store_uuid)) {
         stores.push(personal);
+        seenStoreUuids.add(personal.store_uuid);
       }
       return { stores, warnings };
     },
@@ -1169,15 +1305,31 @@ function createStoreResolver() {
         }
         return { target: { store_uuid: p.store_uuid, alias: p.alias }, warnings: [] };
       }
-      const active = input.activeWriteAlias === void 0 ? void 0 : input.mountedStores.find((m) => m.writable && m.alias === input.activeWriteAlias);
+      const readSet = this.resolveReadSet(input);
+      if (hasMultipleSharedStores(input, readSet) && !hasExplicitRouteOrDefault(input, scope)) {
+        return {
+          target: null,
+          warnings: [
+            {
+              code: "missing_write_route",
+              ref: scope,
+              message: `scope '${scope}' has no explicit write route; set \`fabric store route-write ${scope} <alias>\``
+            }
+          ]
+        };
+      }
+      const routeAlias = resolveRouteAlias(input, scope);
+      const active = routeAlias === void 0 ? void 0 : readSet.stores.find(
+        (store) => store.writable && !isMountedPersonal(input, store.store_uuid) && (store.alias === routeAlias || store.store_uuid === routeAlias)
+      );
       if (active === void 0) {
         return {
           target: null,
           warnings: [
             {
               code: "alias_unresolved",
-              ref: input.activeWriteAlias ?? scope,
-              message: `no writable store for scope '${scope}'; set an active write store with \`fabric store switch-write\``
+              ref: routeAlias ?? scope,
+              message: `no writable store for scope '${scope}'; set a write route or default write store`
             }
           ]
         };
@@ -1191,7 +1343,8 @@ function createStoreResolver() {
 }
 
 // src/resolver/store-disk-reader.ts
-import { existsSync, readdirSync, readFileSync, statSync } from "fs";
+import { existsSync, lstatSync, readdirSync, readFileSync } from "fs";
+import { readFile } from "fs/promises";
 import { join } from "path";
 function readStoreIdentity(absDir) {
   const identityFile = join(absDir, STORE_LAYOUT.identityFile);
@@ -1207,6 +1360,17 @@ function readStoreIdentity(absDir) {
   const parsed = storeIdentitySchema.safeParse(raw);
   return parsed.success ? parsed.data : null;
 }
+async function readStoreIdentityAsync(absDir) {
+  const identityFile = join(absDir, STORE_LAYOUT.identityFile);
+  let raw;
+  try {
+    raw = JSON.parse(await readFile(identityFile, "utf8"));
+  } catch {
+    return null;
+  }
+  const parsed = storeIdentitySchema.safeParse(raw);
+  return parsed.success ? parsed.data : null;
+}
 function recognizeStoreDir(absDir) {
   return readStoreIdentity(absDir) !== null;
 }
@@ -1226,9 +1390,23 @@ function hasScriptExtension(name) {
   const dot = name.lastIndexOf(".");
   return dot !== -1 && SCRIPT_EXTENSIONS.has(name.slice(dot).toLowerCase());
 }
-function findStoreExecutableViolations(absDir) {
+var STORE_SCAN_MAX_DEPTH = 32;
+var STORE_SCAN_MAX_ENTRIES = 1e5;
+function findStoreExecutableViolations(absDir, options = {}) {
+  const maxDepth = options.maxDepth ?? STORE_SCAN_MAX_DEPTH;
+  const maxEntries = options.maxEntries ?? STORE_SCAN_MAX_ENTRIES;
   const violations = [];
-  const walk = (dir, rel) => {
+  let entriesScanned = 0;
+  let bounded = false;
+  const walk = (dir, rel, depth) => {
+    if (bounded) {
+      return;
+    }
+    if (depth > maxDepth) {
+      violations.push(`<scan-bounded: depth > ${maxDepth} at ${rel === "" ? "." : rel}>`);
+      bounded = true;
+      return;
+    }
     let entries;
     try {
       entries = readdirSync(dir);
@@ -1236,19 +1414,32 @@ function findStoreExecutableViolations(absDir) {
       return;
     }
     for (const entry of entries) {
+      if (bounded) {
+        return;
+      }
       if (rel === "" && entry === ".git") {
         continue;
       }
+      entriesScanned += 1;
+      if (entriesScanned > maxEntries) {
+        violations.push(`<scan-bounded: entries > ${maxEntries}>`);
+        bounded = true;
+        return;
+      }
       const abs = join(dir, entry);
       const relPath = rel === "" ? entry : `${rel}/${entry}`;
       let stat;
       try {
-        stat = statSync(abs);
+        stat = lstatSync(abs);
       } catch {
         continue;
       }
+      if (stat.isSymbolicLink()) {
+        violations.push(relPath);
+        continue;
+      }
       if (stat.isDirectory()) {
-        walk(abs, relPath);
+        walk(abs, relPath, depth + 1);
         continue;
       }
       if ((stat.mode & 73) !== 0 || hasScriptExtension(entry)) {
@@ -1256,7 +1447,7 @@ function findStoreExecutableViolations(absDir) {
       }
     }
   };
-  walk(absDir, "");
+  walk(absDir, "", 0);
   return violations;
 }
 
@@ -1360,9 +1551,10 @@ function resolveCandidates(candidates, options = {}) {
 }
 
 // src/store/core.ts
-import { execFileSync } from "child_process";
-import { existsSync as existsSync2, mkdirSync, readdirSync as readdirSync2, writeFileSync } from "fs";
+import { execFile } from "child_process";
+import { access, mkdir, readdir, readFile as readFile2, writeFile } from "fs/promises";
 import { join as join2 } from "path";
+import { promisify } from "util";
 var STORE_PENDING_DIR = "pending";
 var STORE_GITIGNORE = [
   "# v2.1 store \u2014 volatile / derived data is never committed",
@@ -1371,74 +1563,288 @@ var STORE_GITIGNORE = [
   ".cache/",
   ""
 ].join("\n");
-function git(cwd, args) {
-  execFileSync("git", args, { cwd, stdio: ["ignore", "ignore", "pipe"] });
+var execFileAsync = promisify(execFile);
+async function git(cwd, args) {
+  await execFileAsync("git", args, { cwd });
 }
-function initStore(absDir, identity, options = {}) {
+async function initStore(absDir, identity, options = {}) {
   const parsed = storeIdentitySchema.parse(identity);
   const identityFile = join2(absDir, STORE_LAYOUT.identityFile);
-  if (existsSync2(identityFile)) {
+  try {
+    await access(identityFile);
     throw new Error(`store already initialized at ${absDir} (store.json exists)`);
+  } catch (err) {
+    if (err instanceof Error && err.message.includes("already initialized")) {
+      throw err;
+    }
   }
   for (const type of STORE_KNOWLEDGE_TYPE_DIRS) {
-    mkdirSync(join2(absDir, STORE_LAYOUT.knowledgeDir, type), { recursive: true });
+    const typeDir = join2(absDir, STORE_LAYOUT.knowledgeDir, type);
+    await mkdir(typeDir, { recursive: true });
+    await writeFile(join2(typeDir, ".gitkeep"), "", "utf8");
   }
-  mkdirSync(join2(absDir, STORE_LAYOUT.knowledgeDir, STORE_PENDING_DIR), { recursive: true });
-  mkdirSync(join2(absDir, STORE_LAYOUT.bindingsDir), { recursive: true });
-  mkdirSync(join2(absDir, STORE_LAYOUT.stateDir), { recursive: true });
-  writeFileSync(identityFile, `${JSON.stringify(parsed, null, 2)}
+  await mkdir(join2(absDir, STORE_LAYOUT.knowledgeDir, STORE_PENDING_DIR), { recursive: true });
+  await mkdir(join2(absDir, STORE_LAYOUT.bindingsDir), { recursive: true });
+  await mkdir(join2(absDir, STORE_LAYOUT.stateDir), { recursive: true });
+  await writeFile(identityFile, `${JSON.stringify(parsed, null, 2)}
 `, "utf8");
-  writeFileSync(join2(absDir, ".gitignore"), STORE_GITIGNORE, "utf8");
+  await writeFile(join2(absDir, ".gitignore"), STORE_GITIGNORE, "utf8");
   if (options.git !== false) {
-    git(absDir, ["init", "-b", "main"]);
+    await git(absDir, ["init", "-b", "main"]);
   }
-  const readBack = readStoreIdentity(absDir);
+  const readBack = await readStoreIdentityAsync(absDir);
   if (readBack === null) {
     throw new Error(`store init wrote an unrecognizable store.json at ${absDir}`);
   }
   return readBack;
 }
-function listMarkdown(dir) {
-  if (!existsSync2(dir)) {
+async function listMarkdown(dir) {
+  let entries;
+  try {
+    entries = await readdir(dir);
+  } catch {
     return [];
   }
-  return readdirSync2(dir).filter((name) => name.endsWith(".md")).sort().map((name) => join2(dir, name));
+  return entries.filter((name) => name.endsWith(".md")).sort().map((name) => join2(dir, name));
 }
-function listStoreKnowledge(store) {
+async function listStoreKnowledge(store) {
   const refs = [];
   for (const type of STORE_KNOWLEDGE_TYPE_DIRS) {
-    for (const file of listMarkdown(join2(store.dir, STORE_LAYOUT.knowledgeDir, type))) {
+    for (const file of await listMarkdown(join2(store.dir, STORE_LAYOUT.knowledgeDir, type))) {
       refs.push({ store_uuid: store.store_uuid, alias: store.alias, type, file });
     }
   }
   return refs;
 }
-function readKnowledgeAcrossStores(stores) {
-  return stores.flatMap((store) => listStoreKnowledge(store));
+async function readKnowledgeAcrossStores(stores) {
+  const lists = await Promise.all(stores.map((store) => listStoreKnowledge(store)));
+  return lists.flat();
+}
+function storeProjectsPath(storeDir) {
+  return join2(storeDir, STORE_LAYOUT.projectsFile);
 }
-function aggregatePendingAcrossStores(stores) {
-  return stores.flatMap(
-    (store) => listMarkdown(join2(store.dir, STORE_LAYOUT.knowledgeDir, STORE_PENDING_DIR)).map((file) => ({
+async function readStoreProjects(storeDir) {
+  const path = storeProjectsPath(storeDir);
+  let raw;
+  try {
+    raw = JSON.parse(await readFile2(path, "utf8"));
+  } catch {
+    return [];
+  }
+  const parsed = storeProjectsFileSchema.safeParse(raw);
+  return parsed.success ? parsed.data.projects : [];
+}
+async function storeHasProject(storeDir, id) {
+  return (await readStoreProjects(storeDir)).some((p) => p.id === id);
+}
+async function addStoreProject(storeDir, project) {
+  const parsed = storeProjectSchema.parse(project);
+  const existing = await readStoreProjects(storeDir);
+  if (existing.some((p) => p.id === parsed.id)) {
+    throw new Error(`project '${parsed.id}' already exists in store at ${storeDir}`);
+  }
+  const next = [...existing, parsed];
+  const validated = storeProjectsFileSchema.parse({ projects: next });
+  await writeFile(storeProjectsPath(storeDir), `${JSON.stringify(validated, null, 2)}
+`, "utf8");
+  return validated.projects;
+}
+async function aggregatePendingAcrossStores(stores) {
+  const lists = await Promise.all(stores.map(
+    async (store) => (await listMarkdown(join2(store.dir, STORE_LAYOUT.knowledgeDir, STORE_PENDING_DIR))).map((file) => ({
       store_uuid: store.store_uuid,
       alias: store.alias,
       type: STORE_PENDING_DIR,
       file
     }))
-  );
+  ));
+  return lists.flat();
+}
+
+// src/store/store-counters.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2, readdirSync as readdirSync2, writeFileSync } from "fs";
+import { join as join3 } from "path";
+function storeCountersPath(storeDir) {
+  return join3(storeDir, STORE_LAYOUT.countersFile);
+}
+function readStoreCounters(storeDir) {
+  let raw;
+  try {
+    raw = readFileSync2(storeCountersPath(storeDir), "utf8");
+  } catch {
+    return defaultAgentsMetaCounters();
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return defaultAgentsMetaCounters();
+  }
+  const result = AgentsMetaCountersSchema.safeParse(parsed);
+  return result.success ? result.data : defaultAgentsMetaCounters();
+}
+function preserveCorruptCounters(path, raw) {
+  const corruptedPath = `${path}.corrupted.${Date.now()}`;
+  writeFileSync(corruptedPath, raw, "utf8");
+  return corruptedPath;
+}
+function readStoreCountersForAllocation(storeDir) {
+  const path = storeCountersPath(storeDir);
+  if (!existsSync2(path)) {
+    return defaultAgentsMetaCounters();
+  }
+  const raw = readFileSync2(path, "utf8");
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (error) {
+    const corruptedPath = preserveCorruptCounters(path, raw);
+    throw new Error(
+      `store counters.json is corrupt; forensic copy saved to ${corruptedPath}. Run doctor --fix or reconcileStoreCounters before allocating a new stable_id. Parse error: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  const result = AgentsMetaCountersSchema.safeParse(parsed);
+  if (!result.success) {
+    const corruptedPath = preserveCorruptCounters(path, raw);
+    throw new Error(
+      `store counters.json is schema-invalid; forensic copy saved to ${corruptedPath}. Run doctor --fix or reconcileStoreCounters before allocating a new stable_id.`
+    );
+  }
+  return result.data;
+}
+async function allocateStoreKnowledgeId(layer, type, storeDir) {
+  const countersPath = storeCountersPath(storeDir);
+  return withFileLock(`${countersPath}.lock`, async () => {
+    const counters = readStoreCountersForAllocation(storeDir);
+    const { id, nextCounters } = allocateKnowledgeId(layer, type, counters);
+    await atomicWriteJson(countersPath, nextCounters, { indent: 2 });
+    return id;
+  });
+}
+function readEntryId(file) {
+  let content;
+  try {
+    content = readFileSync2(file, "utf8");
+  } catch {
+    return null;
+  }
+  const match = content.match(/^id:\s*(\S+)\s*$/mu);
+  if (match) {
+    return match[1] ?? null;
+  }
+  const stem = file.slice(file.lastIndexOf("/") + 1).replace(/\.md$/u, "");
+  const idPart = stem.split("--")[0];
+  return idPart.length > 0 ? idPart : null;
+}
+function reconcileStoreCounters(storeDir) {
+  const current = readStoreCounters(storeDir);
+  const next = {
+    KP: { ...current.KP },
+    KT: { ...current.KT }
+  };
+  for (const type of STORE_KNOWLEDGE_TYPE_DIRS) {
+    const dir = join3(storeDir, STORE_LAYOUT.knowledgeDir, type);
+    if (!existsSync2(dir)) {
+      continue;
+    }
+    for (const name of readdirSync2(dir)) {
+      if (!name.endsWith(".md")) {
+        continue;
+      }
+      const parsed = parseKnowledgeId(readEntryId(join3(dir, name)) ?? "");
+      if (parsed === null) {
+        continue;
+      }
+      const layerKey = parsed.layer === "personal" ? "KP" : "KT";
+      const typeCode = KNOWLEDGE_TYPE_CODES[parsed.type];
+      next[layerKey][typeCode] = Math.max(next[layerKey][typeCode], parsed.counter);
+    }
+  }
+  writeFileSync(storeCountersPath(storeDir), `${JSON.stringify(next, null, 2)}
+`, "utf8");
+  return next;
+}
+
+// src/store/project-config-io.ts
+import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } 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 (!existsSync3(path)) {
+    return null;
+  }
+  return fabricConfigSchema.parse(JSON.parse(readFileSync3(path, "utf8")));
+}
+function saveProjectConfig(config, projectRoot) {
+  const validated = fabricConfigSchema.parse(config);
+  mkdirSync(join4(projectRoot, ".fabric"), { recursive: true });
+  writeFileSync2(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.mount_name === void 0 ? {} : { mount_name: s.mount_name },
+      ...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 },
+    writeRoutes: project?.write_routes ?? [],
+    ...project?.default_write_store === void 0 ? {} : { defaultWriteAlias: project.default_write_store }
+  };
 }
 
 // src/store/secret-scan.ts
-var SECRET_RULES = [
-  { rule: "aws-access-key-id", re: /\bAKIA[0-9A-Z]{16}\b/ },
-  { rule: "private-key-block", re: /-----BEGIN (?:RSA |EC |OPENSSH |DSA |PGP )?PRIVATE KEY-----/ },
-  { rule: "openai-api-key", re: /\bsk-[A-Za-z0-9]{20,}\b/ },
-  { rule: "github-token", re: /\bgh[pousr]_[A-Za-z0-9]{20,}\b/ },
-  { rule: "slack-token", re: /\bxox[baprs]-[A-Za-z0-9-]{10,}\b/ },
+var CREDENTIAL_RULES = [
+  { rule: "aws-access-key-id", re: /\bAKIA[0-9A-Z]{16}\b/, category: "credential" },
+  { rule: "private-key-block", re: /-----BEGIN (?:RSA |EC |OPENSSH |DSA |PGP )?PRIVATE KEY-----/, category: "credential" },
+  { rule: "openai-api-key", re: /\bsk-[A-Za-z0-9]{20,}\b/, category: "credential" },
+  { rule: "github-token", re: /\bgh[pousr]_[A-Za-z0-9]{20,}\b/, category: "credential" },
+  { rule: "slack-token", re: /\bxox[baprs]-[A-Za-z0-9-]{10,}\b/, category: "credential" },
   {
     rule: "credential-assignment",
-    re: /(?:password|passwd|secret|api[_-]?key|access[_-]?token|token)\s*[:=]\s*['"][^'"\s]{8,}['"]/i
+    re: /(?:password|passwd|secret|api[_-]?key|access[_-]?token|token)\s*[:=]\s*(?:"[^'"\s]{8,}"|'[^'"\s]{8,}'|[A-Za-z0-9_./+=:@-]{8,})/i,
+    category: "credential"
+  }
+];
+var PII_RULES = [
+  {
+    rule: "email-address",
+    re: /\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b/i,
+    category: "pii"
+  },
+  {
+    rule: "ipv4-address",
+    re: /\b(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\b/,
+    category: "pii"
+  },
+  {
+    rule: "phone-number",
+    re: /(?<!\d)(?:\+?1[-.\s]?)?(?:\(?\d{3}\)?[-.\s]?)\d{3}[-.\s]?\d{4}(?!\d)/,
+    category: "pii"
   }
 ];
+var SECRET_RULES = [...CREDENTIAL_RULES, ...PII_RULES];
 function scanForSecrets(content) {
   const findings = [];
   const lines = content.split(/\r?\n/u);
@@ -1452,17 +1858,76 @@ function scanForSecrets(content) {
   return findings;
 }
 function hasSecrets(content) {
-  return scanForSecrets(content).length > 0;
+  const lines = content.split(/\r?\n/u);
+  for (const line of lines) {
+    for (const { re } of CREDENTIAL_RULES) {
+      if (re.test(line)) {
+        return true;
+      }
+    }
+  }
+  return false;
 }
 var REDACTION_PLACEHOLDER_PREFIX = "[REDACTED:";
 function redactSecrets(content) {
+  return redactByRules(content, SECRET_RULES);
+}
+function redactPii(content) {
+  return redactByRules(content, PII_RULES);
+}
+function redactByRules(content, rules) {
   let out = content;
-  for (const { rule, re } of SECRET_RULES) {
+  for (const { rule, re } of rules) {
     const flags = re.flags.includes("i") ? "gi" : "g";
     out = out.replace(new RegExp(re.source, flags), `${REDACTION_PLACEHOLDER_PREFIX}${rule}]`);
   }
   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"
+  );
+}
+
+// src/scanner/scan-recommendations.ts
+function buildScanRecommendations(input, t) {
+  const recs = [];
+  if (input.hasExistingFabric === false) {
+    recs.push(t("scan.rec.install"));
+  }
+  if (input.readmeOk === false) {
+    recs.push(t("scan.rec.readme"));
+  }
+  if (input.hasContributing === false) {
+    recs.push(t("scan.rec.contributing"));
+  }
+  switch (input.frameworkKind) {
+    case "cocos-creator":
+      recs.push(t("scan.rec.cocos.lifecycle"));
+      recs.push(t("scan.rec.cocos.human-protect"));
+      if (input.hasMeta === true) {
+        recs.push(t("scan.rec.cocos.meta-lock"));
+      }
+      break;
+    case "next":
+      recs.push(t("scan.rec.next"));
+      break;
+    case "vite":
+      recs.push(t("scan.rec.vite"));
+      break;
+    case "unknown":
+      recs.push(t("scan.rec.unknown"));
+      break;
+    default:
+      recs.push(t("scan.rec.generic", { kind: input.frameworkKind }));
+  }
+  return recs;
+}
 
 // src/store/cross-store-lint.ts
 function lintCrossStoreReferences(input) {
@@ -1535,10 +2000,10 @@ function buildDebugBundle(input) {
 }
 
 // src/schemas/provenance.ts
-import { z as z12 } from "zod";
-var knowledgeProvenanceSchema = z12.object({
+import { z as z10 } from "zod";
+var knowledgeProvenanceSchema = z10.object({
   store_uuid: storeUuidSchema,
-  alias: z12.string().min(1),
+  alias: z10.string().min(1),
   local_id: localKnowledgeIdSchema,
   global_ref: globalRefSchema,
   // Optional scope coordinate of the entry (resolution axis); present when the
@@ -1547,7 +2012,7 @@ var knowledgeProvenanceSchema = z12.object({
 }).strict();
 
 // src/schemas/mcp-store-contracts.ts
-import { z as z13 } from "zod";
+import { z as z11 } from "zod";
 var MCP_STORE_AWARE_TOOLS = [
   "fab_recall",
   "fab_plan_context",
@@ -1556,14 +2021,14 @@ var MCP_STORE_AWARE_TOOLS = [
   "fab_extract_knowledge",
   "fab_review"
 ];
-var storeAwareEntrySchema = z13.object({
-  stable_id: z13.string(),
+var storeAwareEntrySchema = z11.object({
+  stable_id: z11.string(),
   global_ref: globalRefSchema,
   provenance: knowledgeProvenanceSchema
 }).strict();
-var writtenToStoreSchema = z13.object({
+var writtenToStoreSchema = z11.object({
   store_uuid: storeUuidSchema,
-  alias: z13.string().min(1)
+  alias: z11.string().min(1)
 }).strict();
 var MCP_STORE_AWARE_CONTRACTS = {
   fab_recall: { tool: "fab_recall", surfacesEntries: true, echoesWrittenStore: false },
@@ -1576,7 +2041,7 @@ var MCP_STORE_AWARE_CONTRACTS = {
   fab_archive_scan: {
     tool: "fab_archive_scan",
     surfacesEntries: false,
-    echoesWrittenStore: true
+    echoesWrittenStore: false
   },
   fab_extract_knowledge: {
     tool: "fab_extract_knowledge",
@@ -1587,50 +2052,184 @@ var MCP_STORE_AWARE_CONTRACTS = {
 };
 
 // src/schemas/bindings-snapshot.ts
-import { z as z14 } from "zod";
-var resolvedBindingsSnapshotSchema = z14.object({
+import { z as z12 } from "zod";
+var resolvedBindingsSnapshotSchema = z12.object({
   // Schema version of the snapshot document.
-  version: z14.literal(1),
+  version: z12.literal(1),
   // The project this snapshot is bound to (S13).
-  project_id: z14.string().min(1),
+  project_id: z12.string().min(1),
+  // The local runtime binding key. Defaults to project_id for standard repos;
+  // worktrees may isolate state by setting fabric-config.workspace_binding_id.
+  workspace_binding_id: z12.string().min(1),
   // ISO-8601 generation timestamp (provenance / staleness signal for doctor).
-  generated_at: z14.string().min(1),
+  generated_at: z12.string().min(1),
   // Pre-resolved read-set (required_stores ∪ implicit personal + warnings).
   read_set: storeReadSetSchema,
   // Pre-resolved active write target for non-personal scopes (null if none).
-  write_target: writeTargetSchema.nullable()
+  write_target: writeTargetSchema.nullable(),
+  // Pre-computed store-backed knowledge counts, snapshotted at write time.
+  // PROVENANCE ONLY: these are store-global counts cached in a per-workspace
+  // file, so they go stale whenever store content changes out-of-band (a `git
+  // pull` in the store repo, a sync run from a *different* bound workspace,
+  // etc.) — the snapshot is only regenerated by install/sync/store-ops in the
+  // workspace that runs them (KT-PIT-0017). Hooks MUST NOT trust these numbers
+  // for nudges; they recount live from `knowledge_store_dirs`. Retained for
+  // doctor provenance + backward-compatible fallback when dirs are absent.
+  knowledge_stats: z12.object({
+    pending_count: z12.number().int().nonnegative(),
+    canonical_count: z12.number().int().nonnegative(),
+    oldest_pending_mtime_ms: z12.number().nonnegative().nullable()
+  }).strict().optional(),
+  // Resolved absolute store ROOT dirs the knowledge_stats were derived from.
+  // STABLE across content sync — they only change when mounts/bindings change,
+  // which DOES regenerate the snapshot. Hooks walk `<dir>/knowledge/<type>` +
+  // `<dir>/knowledge/pending` LIVE off these roots so nudge counts are always
+  // fresh regardless of how store content changed (the underseed / review-
+  // backlog false-positive root cure; pairs with knowledge_stats above).
+  knowledge_store_dirs: z12.array(z12.string().min(1)).optional()
 }).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";
-function bindingsSnapshotPath(globalRoot, projectId) {
-  return join3(globalRoot, GLOBAL_STATE_DIR, GLOBAL_BINDINGS_DIR, `${projectId}_resolved.json`);
+import {
+  existsSync as existsSync4,
+  mkdirSync as mkdirSync2,
+  readdirSync as readdirSync3,
+  readFileSync as readFileSync4,
+  renameSync,
+  statSync,
+  unlinkSync,
+  writeFileSync as writeFileSync3
+} from "fs";
+import { join as join5, resolve, sep } from "path";
+var SAFE_BINDING_ID = /^[A-Za-z0-9._-]+$/;
+function assertSafeBindingId(bindingId) {
+  if (!SAFE_BINDING_ID.test(bindingId) || bindingId.includes("..")) {
+    throw new Error(
+      `bindingsSnapshotPath: refusing unsafe workspace_binding_id ${JSON.stringify(bindingId)} (must match ${SAFE_BINDING_ID} and contain no "..")`
+    );
+  }
+}
+function bindingsSnapshotPath(globalRoot, bindingId) {
+  assertSafeBindingId(bindingId);
+  const bindingsDir = resolve(join5(globalRoot, GLOBAL_STATE_DIR, GLOBAL_BINDINGS_DIR));
+  const path = resolve(join5(bindingsDir, `${bindingId}_resolved.json`));
+  if (path !== bindingsDir && !path.startsWith(bindingsDir + sep)) {
+    throw new Error(`bindingsSnapshotPath: resolved path escapes bindings dir for ${JSON.stringify(bindingId)}`);
+  }
+  return path;
+}
+function resolveWorkspaceBindingId(config) {
+  return config.workspace_binding_id ?? config.project_id;
+}
+function countMarkdownFiles(dir) {
+  let count = 0;
+  let oldestMtimeMs = null;
+  if (!existsSync4(dir)) {
+    return { count, oldestMtimeMs };
+  }
+  let entries;
+  try {
+    entries = readdirSync3(dir, { withFileTypes: true });
+  } catch {
+    return { count, oldestMtimeMs };
+  }
+  for (const entry of entries) {
+    const fullPath = join5(dir, entry.name);
+    if (entry.isDirectory()) {
+      const nested = countMarkdownFiles(fullPath);
+      count += nested.count;
+      if (nested.oldestMtimeMs !== null && (oldestMtimeMs === null || nested.oldestMtimeMs < oldestMtimeMs)) {
+        oldestMtimeMs = nested.oldestMtimeMs;
+      }
+      continue;
+    }
+    if (!entry.isFile() || !entry.name.endsWith(".md")) {
+      continue;
+    }
+    let mtimeMs;
+    try {
+      mtimeMs = statSync(fullPath).mtimeMs;
+    } catch {
+      continue;
+    }
+    count += 1;
+    if (oldestMtimeMs === null || mtimeMs < oldestMtimeMs) {
+      oldestMtimeMs = mtimeMs;
+    }
+  }
+  return { count, oldestMtimeMs };
+}
+function collectKnowledgeStats(globalRoot, resolveInput, readSet) {
+  let pendingCount = 0;
+  let oldestPendingMtimeMs = null;
+  let canonicalCount = 0;
+  const storeDirs = [];
+  for (const store of readSet.stores) {
+    const mounted = resolveInput.mountedStores.find((entry) => entry.store_uuid === store.store_uuid) ?? {
+      store_uuid: store.store_uuid
+    };
+    const storeDir = join5(globalRoot, storeRelativePathForMount(mounted));
+    storeDirs.push(storeDir);
+    for (const type of STORE_KNOWLEDGE_TYPE_DIRS) {
+      const canonical = countMarkdownFiles(join5(storeDir, STORE_LAYOUT.knowledgeDir, type));
+      canonicalCount += canonical.count;
+    }
+    const pending = countMarkdownFiles(join5(storeDir, STORE_LAYOUT.knowledgeDir, "pending"));
+    pendingCount += pending.count;
+    if (pending.oldestMtimeMs !== null && (oldestPendingMtimeMs === null || pending.oldestMtimeMs < oldestPendingMtimeMs)) {
+      oldestPendingMtimeMs = pending.oldestMtimeMs;
+    }
+  }
+  return {
+    stats: {
+      pending_count: pendingCount,
+      canonical_count: canonicalCount,
+      oldest_pending_mtime_ms: oldestPendingMtimeMs
+    },
+    storeDirs
+  };
+}
+function atomicWriteJsonSync(path, value) {
+  const tmpPath = `${path}.${process.pid}.${Date.now()}.tmp`;
+  try {
+    writeFileSync3(tmpPath, `${JSON.stringify(value, null, 2)}
+`, "utf8");
+    renameSync(tmpPath, path);
+  } catch (error) {
+    try {
+      unlinkSync(tmpPath);
+    } catch {
+    }
+    throw error;
+  }
 }
 function writeBindingsSnapshot(options) {
   const resolver = createStoreResolver();
   const read_set = resolver.resolveReadSet(options.resolveInput);
   const { target } = resolver.resolveWriteTarget(options.resolveInput, options.writeScope);
+  const { stats, storeDirs } = collectKnowledgeStats(options.globalRoot, options.resolveInput, read_set);
   const snapshot = resolvedBindingsSnapshotSchema.parse({
     version: 1,
     project_id: options.projectId,
+    workspace_binding_id: options.workspaceBindingId ?? options.projectId,
     generated_at: options.now,
     read_set,
-    write_target: target
+    write_target: target,
+    knowledge_stats: stats,
+    knowledge_store_dirs: storeDirs
   });
-  const path = bindingsSnapshotPath(options.globalRoot, options.projectId);
-  mkdirSync2(join3(path, ".."), { recursive: true });
-  writeFileSync2(path, `${JSON.stringify(snapshot, null, 2)}
-`, "utf8");
+  const path = bindingsSnapshotPath(options.globalRoot, snapshot.workspace_binding_id);
+  mkdirSync2(join5(path, ".."), { recursive: true });
+  atomicWriteJsonSync(path, snapshot);
   return snapshot;
 }
 function readBindingsSnapshot(globalRoot, projectId) {
   const path = bindingsSnapshotPath(globalRoot, projectId);
-  if (!existsSync3(path)) {
+  if (!existsSync4(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;
@@ -1639,7 +2238,9 @@ function readBindingsSnapshot(globalRoot, projectId) {
 
 // src/store/store-lifecycle.ts
 function findMountedStore(config, aliasOrUuid) {
-  return config.stores.find((s) => s.alias === aliasOrUuid || s.store_uuid === aliasOrUuid);
+  return config.stores.find(
+    (s) => s.alias === aliasOrUuid || s.store_uuid === aliasOrUuid || s.mount_name === aliasOrUuid
+  );
 }
 function addMountedStore(config, store) {
   const aliasClash = config.stores.find(
@@ -1650,10 +2251,32 @@ function addMountedStore(config, store) {
       `alias '${store.alias}' already mounts store ${aliasClash.store_uuid}; choose another alias`
     );
   }
+  const mountNameClash = store.mount_name === void 0 ? void 0 : config.stores.find(
+    (s) => s.mount_name === store.mount_name && s.store_uuid !== store.store_uuid
+  );
+  if (mountNameClash !== void 0) {
+    throw new Error(
+      `mount_name '${store.mount_name}' already maps to store ${mountNameClash.store_uuid}; choose another mount_name`
+    );
+  }
+  const sanitized = store.remote === void 0 ? store : { ...store, remote: scrubRemoteUrl(store.remote) };
+  store = sanitized;
   const existing = config.stores.find((s) => s.store_uuid === store.store_uuid);
   const stores = existing === void 0 ? [...config.stores, store] : config.stores.map((s) => s.store_uuid === store.store_uuid ? store : s);
   return { ...config, stores };
 }
+function disambiguateAlias(existingAliases, desired) {
+  const taken = new Set(existingAliases);
+  if (!taken.has(desired)) {
+    return desired;
+  }
+  for (let n = 2; ; n += 1) {
+    const candidate = `${desired}-${n}`;
+    if (!taken.has(candidate)) {
+      return candidate;
+    }
+  }
+}
 function detachMountedStore(config, alias) {
   const detached = config.stores.find((s) => s.alias === alias) ?? null;
   if (detached === null) {
@@ -1665,7 +2288,8 @@ function detachMountedStore(config, alias) {
   };
 }
 function bindRequiredStore(required, entry) {
-  return required.some((r) => r.id === entry.id) ? required.map((r) => r.id === entry.id ? entry : r) : [...required, entry];
+  const safeEntry = entry.suggested_remote === void 0 ? entry : { ...entry, suggested_remote: scrubRemoteUrl(entry.suggested_remote) };
+  return required.some((r) => r.id === safeEntry.id) ? required.map((r) => r.id === safeEntry.id ? safeEntry : r) : [...required, safeEntry];
 }
 function explainStore(config, alias) {
   const store = findMountedStore(config, alias);
@@ -1681,155 +2305,155 @@ function explainStore(config, alias) {
 }
 
 // src/schemas/forensic-report.ts
-import { z as z15 } from "zod";
-var forensicCodeSampleSchema = z15.object({
-  path: z15.string(),
-  lines: z15.string(),
-  snippet: z15.string(),
-  pattern_hint: z15.string()
-});
-var forensicEvidenceAnchorSchema = z15.object({
-  file: z15.string(),
-  line: z15.string(),
-  snippet: z15.string()
-});
-var forensicAssertionCoverageSchema = z15.object({
-  ratio: z15.number().min(0).max(1),
-  total: z15.number().int().nonnegative(),
-  matched: z15.number().int().nonnegative(),
-  co_occurring_patterns: z15.array(z15.string())
-});
-var forensicAssertionSchema = z15.object({
-  type: z15.enum(["framework", "pattern", "invariant", "domain"]),
-  statement: z15.string(),
-  confidence: z15.enum(["HIGH", "MEDIUM", "LOW"]),
-  evidence: z15.array(forensicEvidenceAnchorSchema),
+import { z as z13 } from "zod";
+var forensicCodeSampleSchema = z13.object({
+  path: z13.string(),
+  lines: z13.string(),
+  snippet: z13.string(),
+  pattern_hint: z13.string()
+});
+var forensicEvidenceAnchorSchema = z13.object({
+  file: z13.string(),
+  line: z13.string(),
+  snippet: z13.string()
+});
+var forensicAssertionCoverageSchema = z13.object({
+  ratio: z13.number().min(0).max(1),
+  total: z13.number().int().nonnegative(),
+  matched: z13.number().int().nonnegative(),
+  co_occurring_patterns: z13.array(z13.string())
+});
+var forensicAssertionSchema = z13.object({
+  type: z13.enum(["framework", "pattern", "invariant", "domain"]),
+  statement: z13.string(),
+  confidence: z13.enum(["HIGH", "MEDIUM", "LOW"]),
+  evidence: z13.array(forensicEvidenceAnchorSchema),
   coverage: forensicAssertionCoverageSchema,
-  proposed_rule: z15.string().optional(),
-  alternatives: z15.array(z15.string()).optional()
-});
-var forensicTopologySchema = z15.object({
-  total_files: z15.number().int().nonnegative(),
-  by_ext: z15.record(z15.number().int().nonnegative()),
-  key_dirs: z15.array(z15.string()),
-  max_depth: z15.number().int().nonnegative()
-});
-var forensicEntryPointSchema = z15.object({
-  path: z15.string(),
-  reason: z15.string(),
-  size_bytes: z15.number().int().nonnegative().optional()
-});
-var forensicFrameworkSchema = z15.object({
-  kind: z15.string(),
-  version: z15.string(),
-  subkind: z15.string(),
-  evidence: z15.array(z15.string())
-});
-var forensicReadmeSchema = z15.object({
-  quality: z15.enum(["missing", "stub", "ok"]),
-  line_count: z15.number().int().nonnegative(),
-  has_contributing: z15.boolean()
-});
-var candidateFileEntrySchema = z15.object({
-  path: z15.string(),
-  family: z15.enum(["entry", "component", "config", "test", "domain"]),
-  rationale: z15.string()
-});
-var forensicSamplingBudgetSchema = z15.object({
-  max_files: z15.literal(15),
-  max_lines_per_file: z15.literal(100)
-});
-var forensicReportSchema = z15.object({
-  version: z15.string(),
-  generated_at: z15.string(),
-  generated_by: z15.string(),
-  target: z15.string(),
-  project_name: z15.string(),
+  proposed_rule: z13.string().optional(),
+  alternatives: z13.array(z13.string()).optional()
+});
+var forensicTopologySchema = z13.object({
+  total_files: z13.number().int().nonnegative(),
+  by_ext: z13.record(z13.number().int().nonnegative()),
+  key_dirs: z13.array(z13.string()),
+  max_depth: z13.number().int().nonnegative()
+});
+var forensicEntryPointSchema = z13.object({
+  path: z13.string(),
+  reason: z13.string(),
+  size_bytes: z13.number().int().nonnegative().optional()
+});
+var forensicFrameworkSchema = z13.object({
+  kind: z13.string(),
+  version: z13.string(),
+  subkind: z13.string(),
+  evidence: z13.array(z13.string())
+});
+var forensicReadmeSchema = z13.object({
+  quality: z13.enum(["missing", "stub", "ok"]),
+  line_count: z13.number().int().nonnegative(),
+  has_contributing: z13.boolean()
+});
+var candidateFileEntrySchema = z13.object({
+  path: z13.string(),
+  family: z13.enum(["entry", "component", "config", "test", "domain"]),
+  rationale: z13.string()
+});
+var forensicSamplingBudgetSchema = z13.object({
+  max_files: z13.literal(15),
+  max_lines_per_file: z13.literal(100)
+});
+var forensicReportSchema = z13.object({
+  version: z13.string(),
+  generated_at: z13.string(),
+  generated_by: z13.string(),
+  target: z13.string(),
+  project_name: z13.string(),
   framework: forensicFrameworkSchema,
   topology: forensicTopologySchema,
-  entry_points: z15.array(forensicEntryPointSchema),
-  code_samples: z15.array(forensicCodeSampleSchema),
-  assertions: z15.array(forensicAssertionSchema),
-  candidate_files: z15.array(candidateFileEntrySchema),
+  entry_points: z13.array(forensicEntryPointSchema),
+  code_samples: z13.array(forensicCodeSampleSchema),
+  assertions: z13.array(forensicAssertionSchema),
+  candidate_files: z13.array(candidateFileEntrySchema),
   sampling_budget: forensicSamplingBudgetSchema,
   readme: forensicReadmeSchema,
-  recommendations_for_skill: z15.array(z15.string()).optional()
+  recommendations_for_skill: z13.array(z13.string()).optional()
 });
 
 // src/schemas/init-context.ts
-import { z as z16 } from "zod";
-var initContextFrameworkSchema = z16.object({
-  kind: z16.string(),
-  version: z16.string(),
-  subkind: z16.string()
-});
-var initContextInvariantConfidenceSnapshotSchema = z16.object({
-  confidence: z16.enum(["HIGH", "MEDIUM", "LOW"]),
-  evidence_refs: z16.array(z16.string())
-});
-var initContextSourceEvidenceSchema = z16.object({
-  file: z16.string(),
-  lines: z16.string()
-});
-var initContextInvariantSchema = z16.object({
-  type: z16.enum(["ban", "require", "protect"]),
-  rule: z16.string(),
-  rationale: z16.string().optional(),
+import { z as z14 } from "zod";
+var initContextFrameworkSchema = z14.object({
+  kind: z14.string(),
+  version: z14.string(),
+  subkind: z14.string()
+});
+var initContextInvariantConfidenceSnapshotSchema = z14.object({
+  confidence: z14.enum(["HIGH", "MEDIUM", "LOW"]),
+  evidence_refs: z14.array(z14.string())
+});
+var initContextSourceEvidenceSchema = z14.object({
+  file: z14.string(),
+  lines: z14.string()
+});
+var initContextInvariantSchema = z14.object({
+  type: z14.enum(["ban", "require", "protect"]),
+  rule: z14.string(),
+  rationale: z14.string().optional(),
   confidence_snapshot: initContextInvariantConfidenceSnapshotSchema.optional(),
-  source_evidence: z16.array(initContextSourceEvidenceSchema).optional()
-});
-var initContextDomainGroupSchema = z16.object({
-  name: z16.string(),
-  paths: z16.array(z16.string()),
-  summary: z16.string().optional(),
-  topology_type: z16.enum(["mirror", "cross-cutting"]).optional(),
-  target_path: z16.string().optional()
-});
-var initContextInterviewTrailEntrySchema = z16.object({
-  phase: z16.string(),
-  question: z16.string(),
-  answer: z16.string(),
-  presentation: z16.string().optional(),
-  user_corrections: z16.array(z16.string()).optional()
-});
-var initContextSchema = z16.object({
+  source_evidence: z14.array(initContextSourceEvidenceSchema).optional()
+});
+var initContextDomainGroupSchema = z14.object({
+  name: z14.string(),
+  paths: z14.array(z14.string()),
+  summary: z14.string().optional(),
+  topology_type: z14.enum(["mirror", "cross-cutting"]).optional(),
+  target_path: z14.string().optional()
+});
+var initContextInterviewTrailEntrySchema = z14.object({
+  phase: z14.string(),
+  question: z14.string(),
+  answer: z14.string(),
+  presentation: z14.string().optional(),
+  user_corrections: z14.array(z14.string()).optional()
+});
+var initContextSchema = z14.object({
   framework: initContextFrameworkSchema,
-  architecture_patterns: z16.array(z16.string()),
-  invariants: z16.array(initContextInvariantSchema),
-  domain_groups: z16.array(initContextDomainGroupSchema),
-  interview_trail: z16.array(initContextInterviewTrailEntrySchema),
-  forensic_ref: z16.string()
+  architecture_patterns: z14.array(z14.string()),
+  invariants: z14.array(initContextInvariantSchema),
+  domain_groups: z14.array(initContextDomainGroupSchema),
+  interview_trail: z14.array(initContextInterviewTrailEntrySchema),
+  forensic_ref: z14.string()
 });
 
 // src/schemas/events.ts
-import { z as z17 } from "zod";
-var metaUpdatedEventSchema = z17.object({
-  type: z17.literal("meta:updated"),
+import { z as z15 } from "zod";
+var metaUpdatedEventSchema = z15.object({
+  type: z15.literal("meta:updated"),
   payload: agentsMetaSchema
 });
-var lockDriftEventSchema = z17.object({
-  type: z17.literal("lock:drift"),
-  payload: z17.object({
-    locked: z17.array(humanLockEntrySchema),
-    drifted: z17.array(humanLockEntrySchema)
+var lockDriftEventSchema = z15.object({
+  type: z15.literal("lock:drift"),
+  payload: z15.object({
+    locked: z15.array(humanLockEntrySchema),
+    drifted: z15.array(humanLockEntrySchema)
   })
 });
-var lockApprovedEventSchema = z17.object({
-  type: z17.literal("lock:approved"),
-  payload: z17.object({
-    locked: z17.array(humanLockEntrySchema),
-    approved: z17.array(humanLockEntrySchema)
+var lockApprovedEventSchema = z15.object({
+  type: z15.literal("lock:approved"),
+  payload: z15.object({
+    locked: z15.array(humanLockEntrySchema),
+    approved: z15.array(humanLockEntrySchema)
   })
 });
-var ledgerAppendedEventSchema = z17.object({
-  type: z17.literal("ledger:appended"),
+var ledgerAppendedEventSchema = z15.object({
+  type: z15.literal("ledger:appended"),
   payload: ledgerEntrySchema
 });
-var driftDetectedEventSchema = z17.object({
-  type: z17.literal("drift:detected"),
+var driftDetectedEventSchema = z15.object({
+  type: z15.literal("drift:detected"),
   payload: forensicReportSchema
 });
-var fabricEventSchema = z17.discriminatedUnion("type", [
+var fabricEventSchema = z15.discriminatedUnion("type", [
   metaUpdatedEventSchema,
   lockDriftEventSchema,
   lockApprovedEventSchema,
@@ -1838,7 +2462,7 @@ var fabricEventSchema = z17.discriminatedUnion("type", [
 ]);
 
 // src/schemas/event-ledger.ts
-import { z as z18 } from "zod";
+import { z as z16 } from "zod";
 
 // src/cite-line-parser.ts
 var ID_RE = /^K[TP]-[A-Z]+-\d+$/;
@@ -1852,17 +2476,12 @@ function splitStorePrefix(token) {
   return colon === -1 ? { store: null, id: token } : { store: token.slice(0, colon), id: token.slice(colon + 1) };
 }
 var CHAINED_FROM_ID_RE = /chained-from\s+(K[TP]-[A-Z]+-\d+)/i;
-var LEGACY_CITE_TAG_REMAP = {
-  planned: "applied",
-  recalled: "applied",
-  "chained-from": "applied"
-};
 function normalizeCiteTag(rawTag) {
   const head = rawTag.trim().split(/[\s:]+/)[0].toLowerCase();
   if (head === "applied" || head === "dismissed" || head === "none") {
     return head;
   }
-  return LEGACY_CITE_TAG_REMAP[head] ?? "none";
+  return "none";
 }
 function parseTag(rawTag) {
   if (!rawTag) return "none";
@@ -1950,146 +2569,131 @@ function parseCiteLine(raw) {
 }
 
 // src/schemas/event-ledger.ts
-var citeTagSchema = z18.preprocess(
+var citeTagSchema = z16.preprocess(
   (value) => typeof value === "string" ? normalizeCiteTag(value) : value,
-  z18.enum(["applied", "dismissed", "none"])
+  z16.enum(["applied", "dismissed", "none"])
 );
 var eventLedgerEnvelopeSchema = {
-  kind: z18.literal("fabric-event"),
-  id: z18.string(),
-  ts: z18.number().int().nonnegative(),
-  schema_version: z18.literal(1),
-  correlation_id: z18.string().optional(),
-  session_id: z18.string().optional()
+  kind: z16.literal("fabric-event"),
+  id: z16.string(),
+  ts: z16.number().int().nonnegative(),
+  schema_version: z16.literal(1),
+  correlation_id: z16.string().optional(),
+  session_id: z16.string().optional()
 };
-var stringRecordSchema = z18.record(z18.string());
-var knowledgeContextPlannedEventSchema = z18.object({
+var stringRecordSchema = z16.record(z16.string());
+var knowledgeContextPlannedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_context_planned"),
-  target_paths: z18.array(z18.string()),
-  required_stable_ids: z18.array(z18.string()),
-  ai_selectable_stable_ids: z18.array(z18.string()),
-  final_stable_ids: z18.array(z18.string()),
-  selection_token: z18.string().optional(),
-  client_hash: z18.string().optional(),
-  intent: z18.string().optional(),
-  known_tech: z18.array(z18.string()).optional(),
-  diagnostics: z18.array(z18.unknown()).optional()
-});
-var knowledgeSelectionEventSchema = z18.object({
+  event_type: z16.literal("knowledge_context_planned"),
+  target_paths: z16.array(z16.string()),
+  required_stable_ids: z16.array(z16.string()),
+  ai_selectable_stable_ids: z16.array(z16.string()),
+  final_stable_ids: z16.array(z16.string()),
+  selection_token: z16.string().optional(),
+  client_hash: z16.string().optional(),
+  intent: z16.string().optional(),
+  known_tech: z16.array(z16.string()).optional(),
+  diagnostics: z16.array(z16.unknown()).optional()
+});
+var knowledgeSelectionEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_selection"),
-  selection_token: z18.string(),
-  target_paths: z18.array(z18.string()),
-  required_stable_ids: z18.array(z18.string()),
-  ai_selectable_stable_ids: z18.array(z18.string()),
-  ai_selected_stable_ids: z18.array(z18.string()),
-  final_stable_ids: z18.array(z18.string()),
+  event_type: z16.literal("knowledge_selection"),
+  selection_token: z16.string(),
+  target_paths: z16.array(z16.string()),
+  required_stable_ids: z16.array(z16.string()),
+  ai_selectable_stable_ids: z16.array(z16.string()),
+  ai_selected_stable_ids: z16.array(z16.string()),
+  final_stable_ids: z16.array(z16.string()),
   ai_selection_reasons: stringRecordSchema,
-  rejected_stable_ids: z18.array(z18.string()),
-  ignored_stable_ids: z18.array(z18.string())
+  rejected_stable_ids: z16.array(z16.string()),
+  ignored_stable_ids: z16.array(z16.string())
 });
-var knowledgeSectionsFetchedEventSchema = z18.object({
+var knowledgeSectionsFetchedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_sections_fetched"),
-  selection_token: z18.string(),
-  target_paths: z18.array(z18.string()).optional(),
-  requested_sections: z18.array(z18.string()),
-  final_stable_ids: z18.array(z18.string()),
-  ai_selected_stable_ids: z18.array(z18.string()),
-  diagnostics: z18.array(z18.unknown()).optional()
-});
-var editIntentCheckedEventSchema = z18.object({
+  event_type: z16.literal("knowledge_sections_fetched"),
+  selection_token: z16.string(),
+  target_paths: z16.array(z16.string()).optional(),
+  requested_sections: z16.array(z16.string()),
+  final_stable_ids: z16.array(z16.string()),
+  ai_selected_stable_ids: z16.array(z16.string()),
+  diagnostics: z16.array(z16.unknown()).optional()
+});
+var editIntentCheckedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("edit_intent_checked"),
-  path: z18.string(),
-  compliant: z18.boolean(),
-  intent: z18.string(),
-  ledger_entry_id: z18.string(),
+  event_type: z16.literal("edit_intent_checked"),
+  path: z16.string(),
+  compliant: z16.boolean(),
+  intent: z16.string(),
+  ledger_entry_id: z16.string(),
   // rc.35 TASK-07 (P0-2): add "hook" — emitted by the PreToolUse narrow hook
   // for every Edit/Write/MultiEdit fire so cite-coverage doctor metrics see
   // actual edit signals (previously editsTouched was permanently 0 because
   // no production caller of appendLedgerEntry existed).
-  ledger_source: z18.enum(["ai", "human", "hook"]).optional(),
-  commit_sha: z18.string().optional(),
-  parent_sha: z18.string().optional(),
-  parent_ledger_entry_id: z18.string().optional(),
-  diff_stat: z18.string().optional(),
-  annotation: z18.string().optional(),
-  matched_rule_context_ts: z18.number().int().nonnegative().nullable(),
-  window_ms: z18.number().int().nonnegative()
-});
-var knowledgeDriftDetectedEventSchema = z18.object({
+  ledger_source: z16.enum(["ai", "human", "hook"]).optional(),
+  commit_sha: z16.string().optional(),
+  parent_sha: z16.string().optional(),
+  parent_ledger_entry_id: z16.string().optional(),
+  diff_stat: z16.string().optional(),
+  annotation: z16.string().optional(),
+  matched_rule_context_ts: z16.number().int().nonnegative().nullable(),
+  window_ms: z16.number().int().nonnegative()
+});
+var knowledgeDriftDetectedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_drift_detected"),
-  revision: z18.string().optional(),
-  drifted_stable_ids: z18.array(z18.string()),
-  missing_files: z18.array(z18.string()),
-  stale_files: z18.array(z18.string()),
-  details: z18.array(
-    z18.object({
-      file: z18.string(),
-      stable_id: z18.string(),
-      expected_hash: z18.string(),
-      actual_hash: z18.string().nullable()
+  event_type: z16.literal("knowledge_drift_detected"),
+  revision: z16.string().optional(),
+  drifted_stable_ids: z16.array(z16.string()),
+  missing_files: z16.array(z16.string()),
+  stale_files: z16.array(z16.string()),
+  details: z16.array(
+    z16.object({
+      file: z16.string(),
+      stable_id: z16.string(),
+      expected_hash: z16.string(),
+      actual_hash: z16.string().nullable()
     })
   ).optional()
 });
-var mcpEventLedgerEventSchema = z18.object({
+var mcpEventLedgerEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("mcp_event"),
-  mcp_event_id: z18.string(),
-  stream_id: z18.string(),
-  message: z18.unknown()
+  event_type: z16.literal("mcp_event"),
+  mcp_event_id: z16.string(),
+  stream_id: z16.string(),
+  message: z16.unknown()
 });
-var reapplyCompletedEventSchema = z18.object({
+var reapplyCompletedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("reapply_completed"),
-  preserved_ledger: z18.boolean(),
-  preserved_meta: z18.boolean(),
-  rules_count: z18.number().int().nonnegative()
+  event_type: z16.literal("reapply_completed"),
+  preserved_ledger: z16.boolean(),
+  preserved_meta: z16.boolean(),
+  rules_count: z16.number().int().nonnegative()
 });
-var installDiffAppliedEventSchema = z18.object({
+var installDiffAppliedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("install_diff_applied"),
-  applied: z18.array(z18.string()),
-  canonical: z18.array(z18.string()),
-  drifted: z18.array(z18.string())
+  event_type: z16.literal("install_diff_applied"),
+  applied: z16.array(z16.string()),
+  canonical: z16.array(z16.string()),
+  drifted: z16.array(z16.string())
 });
-var eventLedgerTruncatedEventSchema = z18.object({
+var eventLedgerTruncatedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("event_ledger_truncated"),
-  byte_offset: z18.number().int().nonnegative(),
-  byte_length: z18.number().int().nonnegative(),
-  corrupted_path: z18.string()
+  event_type: z16.literal("event_ledger_truncated"),
+  byte_offset: z16.number().int().nonnegative(),
+  byte_length: z16.number().int().nonnegative(),
+  corrupted_path: z16.string()
 });
-var mcpConfigMigratedEventSchema = z18.object({
+var metaReconciledOnStartupEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("mcp_config_migrated"),
-  source: z18.literal("doctor_fix"),
-  removed_from: z18.string()
+  event_type: z16.literal("meta_reconciled_on_startup"),
+  reconciled_files: z16.array(z16.string()),
+  duration_ms: z16.number().int().nonnegative(),
+  source: z16.literal("reconcileKnowledge")
 });
-var bootstrapMarkerMigratedEventSchema = z18.object({
-  ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("bootstrap_marker_migrated"),
-  path: z18.string(),
-  migrated_count: z18.number().int().nonnegative(),
-  legacy_marker: z18.literal("fabric:knowledge-base"),
-  new_marker: z18.literal("fabric:bootstrap"),
-  timestamp: z18.string()
-});
-var metaReconciledOnStartupEventSchema = z18.object({
+var metaReconciledEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("meta_reconciled_on_startup"),
-  reconciled_files: z18.array(z18.string()),
-  duration_ms: z18.number().int().nonnegative(),
-  source: z18.literal("reconcileKnowledge")
-});
-var metaReconciledEventSchema = z18.object({
-  ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("meta_reconciled"),
-  reconciled_files: z18.array(z18.string()),
-  duration_ms: z18.number().int().nonnegative(),
+  event_type: z16.literal("meta_reconciled"),
+  reconciled_files: z16.array(z16.string()),
+  duration_ms: z16.number().int().nonnegative(),
   // v2.0.0-rc.23 TASK-005 (a-B): added `auto-heal-description` trigger so the
   // read-path plan_context handler can drive a full reconcile when it detects
   // any node carrying `description === undefined` (legacy meta drift that the
@@ -2103,7 +2707,7 @@ var metaReconciledEventSchema = z18.object({
   // v2.0.0-rc.29 TASK-005 (BUG-G1): `auto-heal-after-drift` added so
   // `ensureKnowledgeFresh` hot-path can chain a paired reconcile (closing the
   // drift→heal gap) when the caller opts in via `autoHealOnDrift: true`.
-  trigger: z18.enum([
+  trigger: z16.enum([
     "doctor",
     "manual",
     "auto-heal-description",
@@ -2111,195 +2715,207 @@ var metaReconciledEventSchema = z18.object({
     "post-approve",
     "post-modify"
   ]),
-  source: z18.literal("reconcileKnowledge"),
+  source: z16.literal("reconcileKnowledge"),
   // v2.0.0-rc.22 TASK-014 (Scope E): set when reconcileKnowledge forced a
   // writeKnowledgeMeta on revision drift alone (no per-file content drift).
   // Distinguishes top-level schema/revision repair from the standard per-file
   // drift path. Optional so existing emitters stay unchanged.
-  force_write_reason: z18.enum(["revision_drift"]).optional()
+  force_write_reason: z16.enum(["revision_drift"]).optional()
 });
-var claudeSkillPathMigratedEventSchema = z18.object({
+var claudeSkillPathMigratedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("claude_skill_path_migrated"),
-  from: z18.string(),
-  to: z18.string()
+  event_type: z16.literal("claude_skill_path_migrated"),
+  from: z16.string(),
+  to: z16.string()
 });
-var claudeHookPathMigratedEventSchema = z18.object({
+var claudeHookPathMigratedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("claude_hook_path_migrated"),
-  from: z18.string(),
-  to: z18.string()
+  event_type: z16.literal("claude_hook_path_migrated"),
+  from: z16.string(),
+  to: z16.string()
 });
-var codexSkillPathMigratedEventSchema = z18.object({
+var codexSkillPathMigratedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("codex_skill_path_migrated"),
-  from: z18.string(),
-  to: z18.string()
+  event_type: z16.literal("codex_skill_path_migrated"),
+  from: z16.string(),
+  to: z16.string()
 });
-var initScanCompletedEventSchema = z18.object({
+var initScanCompletedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("init_scan_completed"),
-  written_stable_ids: z18.array(z18.string()),
-  duration_ms: z18.number().int().nonnegative(),
-  source: z18.enum(["init", "scan", "doctor_fix", "doctor-rescan"]).optional()
+  event_type: z16.literal("init_scan_completed"),
+  written_stable_ids: z16.array(z16.string()),
+  duration_ms: z16.number().int().nonnegative(),
+  source: z16.enum(["init", "scan", "doctor_fix", "doctor-rescan"]).optional()
 });
-var knowledgeProposedEventSchema = z18.object({
+var knowledgeProposedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_proposed"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string().optional()
+  event_type: z16.literal("knowledge_proposed"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string().optional()
 });
-var knowledgePromoteStartedEventSchema = z18.object({
+var knowledgePromoteStartedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_promote_started"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string().optional()
+  event_type: z16.literal("knowledge_promote_started"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string().optional()
 });
-var knowledgePromotedEventSchema = z18.object({
+var knowledgePromotedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_promoted"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string().optional()
+  event_type: z16.literal("knowledge_promoted"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string().optional()
 });
-var knowledgePromoteFailedEventSchema = z18.object({
+var knowledgePromoteFailedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_promote_failed"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string()
+  event_type: z16.literal("knowledge_promote_failed"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string()
 });
-var knowledgeLayerChangedEventSchema = z18.object({
+var knowledgeModifiedEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("knowledge_modified"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  path: z16.string(),
+  changed_fields: z16.array(z16.string()),
+  before: z16.record(z16.unknown()),
+  after: z16.record(z16.unknown()),
+  reason: z16.string().optional()
+});
+var knowledgeLayerChangedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_layer_changed"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string().optional(),
-  from_layer: z18.enum(["team", "personal"]),
-  to_layer: z18.enum(["team", "personal"]),
+  event_type: z16.literal("knowledge_layer_changed"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string().optional(),
+  from_layer: z16.enum(["team", "personal"]),
+  to_layer: z16.enum(["team", "personal"]),
   // v2.0.0-rc.37 NEW-24: record the pre-flip stable_id so downstream consumers
   // (fab_plan_context redirect surface, fab_get_knowledge_sections.redirect_to)
   // can map a stale caller-held id back to the post-flip canonical id without
   // requiring the caller to re-issue plan-context. Optional for forward-
   // compatibility with rc ≤36 events that never carried this field.
-  previous_stable_id: z18.string().optional()
+  previous_stable_id: z16.string().optional()
 });
-var knowledgeIdRedirectEventSchema = z18.object({
+var knowledgeIdRedirectEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_id_redirect"),
-  timestamp: z18.string().datetime(),
-  previous_stable_id: z18.string(),
-  new_stable_id: z18.string(),
-  reason: z18.string().optional()
+  event_type: z16.literal("knowledge_id_redirect"),
+  timestamp: z16.string().datetime(),
+  previous_stable_id: z16.string(),
+  new_stable_id: z16.string(),
+  reason: z16.string().optional()
 });
-var knowledgeSlugRenamedEventSchema = z18.object({
+var knowledgeSlugRenamedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_slug_renamed"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string().optional(),
-  from_slug: z18.string(),
-  to_slug: z18.string()
-});
-var knowledgeDemotedEventSchema = z18.object({
+  event_type: z16.literal("knowledge_slug_renamed"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string().optional(),
+  from_slug: z16.string(),
+  to_slug: z16.string()
+});
+var knowledgeDemotedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_demoted"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string().optional()
+  event_type: z16.literal("knowledge_demoted"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string().optional()
 });
-var knowledgeArchivedEventSchema = z18.object({
+var knowledgeArchivedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_archived"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string().optional()
+  event_type: z16.literal("knowledge_archived"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string().optional()
 });
-var knowledgeArchiveAttemptedEventSchema = z18.object({
+var knowledgeArchiveAttemptedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_archive_attempted"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string().optional()
+  event_type: z16.literal("knowledge_archive_attempted"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string().optional()
 });
-var knowledgeUnarchivedEventSchema = z18.object({
+var knowledgeUnarchivedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_unarchived"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string().optional(),
+  event_type: z16.literal("knowledge_unarchived"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string().optional(),
   // Pre-move archive path (e.g. ".fabric/.archive/decisions/KT-D-0007--single-cjs-hook.md").
-  archive_path: z18.string().optional(),
-  // Post-move canonical path (e.g. ".fabric/knowledge/team/decisions/KT-D-0007--single-cjs-hook.md").
-  restored_to: z18.string().optional()
+  archive_path: z16.string().optional(),
+  // Post-move canonical path (e.g. "knowledge/decisions/KT-DEC-0007--single-cjs-hook.md" inside the resolved store).
+  restored_to: z16.string().optional()
 });
-var knowledgeDeferredEventSchema = z18.object({
+var knowledgeDeferredEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_deferred"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string().optional(),
-  until: z18.string().datetime().optional()
-});
-var knowledgeRejectedEventSchema = z18.object({
+  event_type: z16.literal("knowledge_deferred"),
+  stable_id: z16.string().optional(),
+  pending_path: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string().optional(),
+  until: z16.string().datetime().optional()
+});
+var knowledgeRejectedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_rejected"),
-  stable_id: z18.string().optional(),
-  timestamp: z18.string().datetime(),
-  reason: z18.string()
+  event_type: z16.literal("knowledge_rejected"),
+  stable_id: z16.string().optional(),
+  timestamp: z16.string().datetime(),
+  reason: z16.string()
 });
-var knowledgeConsumedEventSchema = z18.object({
+var knowledgeConsumedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_consumed"),
-  stable_id: z18.string(),
-  consumed_at: z18.string().datetime(),
-  client_hash: z18.string()
+  event_type: z16.literal("knowledge_consumed"),
+  stable_id: z16.string(),
+  consumed_at: z16.string().datetime(),
+  client_hash: z16.string()
 });
-var knowledgeScopeDegradedEventSchema = z18.object({
+var knowledgeScopeDegradedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_scope_degraded"),
-  stable_id: z18.string(),
-  timestamp: z18.string().datetime(),
-  from_scope: z18.enum(["narrow", "broad"]),
-  to_scope: z18.enum(["narrow", "broad"]),
-  reason: z18.string()
-});
-var doctorRunEventSchema = z18.object({
+  event_type: z16.literal("knowledge_scope_degraded"),
+  stable_id: z16.string(),
+  timestamp: z16.string().datetime(),
+  from_scope: z16.enum(["narrow", "broad"]),
+  to_scope: z16.enum(["narrow", "broad"]),
+  reason: z16.string()
+});
+var doctorRunEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("doctor_run"),
-  mode: z18.enum(["lint", "fix-knowledge"]),
-  issues: z18.number().int().nonnegative(),
-  mutations: z18.number().int().nonnegative().optional(),
-  timestamp: z18.string().datetime()
+  event_type: z16.literal("doctor_run"),
+  mode: z16.enum(["lint", "fix-knowledge"]),
+  issues: z16.number().int().nonnegative(),
+  mutations: z16.number().int().nonnegative().optional(),
+  timestamp: z16.string().datetime()
 });
-var knowledgePathDangledEventSchema = z18.object({
+var knowledgePathDangledEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_path_dangled"),
-  stable_id: z18.string(),
-  removed_glob: z18.string()
+  event_type: z16.literal("knowledge_path_dangled"),
+  stable_id: z16.string(),
+  removed_glob: z16.string()
 });
-var relevanceMigrationRunEventSchema = z18.object({
+var relevanceMigrationRunEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("relevance_migration_run"),
-  timestamp: z18.string().datetime(),
-  scanned_count: z18.number().int().nonnegative(),
-  touched_count: z18.number().int().nonnegative()
+  event_type: z16.literal("relevance_migration_run"),
+  timestamp: z16.string().datetime(),
+  scanned_count: z16.number().int().nonnegative(),
+  touched_count: z16.number().int().nonnegative()
 });
-var pendingAutoArchivedEventSchema = z18.object({
+var pendingAutoArchivedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("pending_auto_archived"),
-  pending_path: z18.string(),
-  archived_to: z18.string(),
-  reason: z18.string()
+  event_type: z16.literal("pending_auto_archived"),
+  pending_path: z16.string(),
+  archived_to: z16.string(),
+  reason: z16.string()
 });
-var assistantTurnObservedEventSchema = z18.object({
+var assistantTurnObservedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("assistant_turn_observed"),
-  kb_line_raw: z18.string().nullable(),
-  cite_ids: z18.array(z18.string()).default([]),
-  cite_tags: z18.array(citeTagSchema).default([]),
+  event_type: z16.literal("assistant_turn_observed"),
+  kb_line_raw: z16.string().nullable(),
+  cite_ids: z16.array(z16.string()).default([]),
+  cite_tags: z16.array(citeTagSchema).default([]),
   // v2.0.0-rc.24 TASK-01: per-cite contract commitments. Index-aligned with
   // cite_ids/cite_tags (commitments[i] belongs to cite_ids[i]). Each slot
   // carries `operators[]` (kind + glob target) or `skip_reason` when the cite
@@ -2307,72 +2923,201 @@ var assistantTurnObservedEventSchema = z18.object({
   // empty array via `.default([])` and are excluded from contract-policy
   // audits by the marker-gate (see cite_contract_policy_activated below).
   // Mirrors the rc.20 cite_tags parallel-array evolution exactly.
-  cite_commitments: z18.array(
-    z18.object({
-      operators: z18.array(
-        z18.object({
-          kind: z18.enum(["edit", "not_edit", "require", "forbid"]),
-          target: z18.string()
+  cite_commitments: z16.array(
+    z16.object({
+      operators: z16.array(
+        z16.object({
+          kind: z16.enum(["edit", "not_edit", "require", "forbid"]),
+          target: z16.string()
         })
       ),
-      skip_reason: z18.string().nullable()
+      skip_reason: z16.string().nullable()
     })
   ).default([]),
-  client: z18.enum(["cc", "codex", "cursor"]).optional(),
-  turn_id: z18.string(),
-  envelope_index: z18.number().int().nonnegative().optional(),
-  timestamp: z18.string().datetime()
+  // 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 unqualified default.
+  cite_stores: z16.array(z16.string().nullable()).optional(),
+  client: z16.enum(["cc", "codex"]).optional(),
+  turn_id: z16.string(),
+  envelope_index: z16.number().int().nonnegative().optional(),
+  timestamp: z16.string().datetime()
+});
+var citePolicyActivatedEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("cite_policy_activated"),
+  policy_version: z16.string(),
+  timestamp: z16.string().datetime()
+});
+var citeContractPolicyActivatedEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("cite_contract_policy_activated")
 });
-var citePolicyActivatedEventSchema = z18.object({
+var eventsRotatedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("cite_policy_activated"),
-  policy_version: z18.string(),
-  timestamp: z18.string().datetime()
+  event_type: z16.literal("events_rotated"),
+  cutoff_ts: z16.string().datetime(),
+  archived_count: z16.number().int().nonnegative(),
+  kept_count: z16.number().int().nonnegative(),
+  archive_path: z16.string()
 });
-var citeContractPolicyActivatedEventSchema = z18.object({
+var knowledgeMetaAutoHealedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("cite_contract_policy_activated")
+  event_type: z16.literal("knowledge_meta_auto_healed"),
+  previous_revision_hash: z16.string(),
+  revision_hash: z16.string(),
+  trigger: z16.literal("read"),
+  caller: z16.enum(["planContext", "getKnowledgeSections", "getKnowledge", "extractKnowledge"]).optional()
 });
-var eventsRotatedEventSchema = z18.object({
+var serveLockClearedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("events_rotated"),
-  cutoff_ts: z18.string().datetime(),
-  archived_count: z18.number().int().nonnegative(),
-  kept_count: z18.number().int().nonnegative(),
-  archive_path: z18.string()
+  event_type: z16.literal("serve_lock_cleared"),
+  pid: z16.number().int().nonnegative(),
+  age_ms: z16.number().int().nonnegative(),
+  timestamp: z16.string().datetime()
 });
-var knowledgeMetaAutoHealedEventSchema = z18.object({
+var knowledgeEnrichedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_meta_auto_healed"),
-  previous_revision_hash: z18.string(),
-  revision_hash: z18.string(),
-  trigger: z18.literal("read"),
-  caller: z18.enum(["planContext", "getKnowledgeSections", "getKnowledge", "extractKnowledge"]).optional()
+  event_type: z16.literal("knowledge_enriched"),
+  path: z16.string(),
+  added_fields: z16.array(z16.enum(["intent_clues", "tech_stack", "impact", "must_read_if"])),
+  mode: z16.enum(["auto", "preview", "readonly", "interactive"]),
+  timestamp: z16.string().datetime()
 });
-var serveLockClearedEventSchema = z18.object({
+var sessionArchiveAttemptedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("serve_lock_cleared"),
-  pid: z18.number().int().nonnegative(),
-  age_ms: z18.number().int().nonnegative(),
-  timestamp: z18.string().datetime()
+  event_type: z16.literal("session_archive_attempted"),
+  outcome: z16.enum(["proposed", "viability_failed", "user_dismissed", "skipped_no_signal"]),
+  covered_through_ts: z16.number().int().nonnegative(),
+  candidates_proposed: z16.number().int().nonnegative().default(0),
+  knowledge_proposed_ids: z16.array(z16.string()).default([])
 });
-var knowledgeEnrichedEventSchema = z18.object({
+var hookSurfaceEmittedEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("hook_surface_emitted"),
+  hook_name: z16.string(),
+  client: z16.enum(["cc", "codex"]),
+  target_channel: z16.string(),
+  rendered_ids: z16.array(z16.string()),
+  delivery_status: z16.enum(["delivered", "suppressed", "error"]),
+  suppression_reason: z16.string().optional()
+});
+var hookSignalEmittedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("knowledge_enriched"),
-  path: z18.string(),
-  added_fields: z18.array(z18.enum(["intent_clues", "tech_stack", "impact", "must_read_if"])),
-  mode: z18.enum(["auto", "preview", "readonly", "interactive"]),
-  timestamp: z18.string().datetime()
+  event_type: z16.literal("hook_signal_emitted"),
+  signal_type: z16.enum(["archive", "review", "maintenance", "other"]),
+  threshold: z16.number(),
+  actual_value: z16.number(),
+  fired: z16.boolean()
 });
-var sessionArchiveAttemptedEventSchema = z18.object({
+var mcpStdioTraceEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("mcp_stdio_trace"),
+  tool_name: z16.string(),
+  request_id: z16.string(),
+  duration_ms: z16.number().nonnegative(),
+  status: z16.enum(["ok", "error"]),
+  payload_bytes_in: z16.number().int().nonnegative(),
+  payload_bytes_out: z16.number().int().nonnegative(),
+  error_code: z16.string().optional()
+});
+var payloadGuardObservedEventSchema = z16.object({
   ...eventLedgerEnvelopeSchema,
-  event_type: z18.literal("session_archive_attempted"),
-  outcome: z18.enum(["proposed", "viability_failed", "user_dismissed", "skipped_no_signal"]),
-  covered_through_ts: z18.number().int().nonnegative(),
-  candidates_proposed: z18.number().int().nonnegative().default(0),
-  knowledge_proposed_ids: z18.array(z18.string()).default([])
+  event_type: z16.literal("payload_guard_observed"),
+  tool_name: z16.string(),
+  path_count: z16.number().int().nonnegative(),
+  tokens_estimated: z16.number().int().nonnegative(),
+  truncated: z16.boolean(),
+  cap: z16.number().int().positive()
+});
+var skillInvocationStartedEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("skill_invocation_started"),
+  skill_name: z16.string(),
+  trigger_source: z16.enum(["user", "auto_invoke", "ai_self_trigger", "chained"]),
+  entry_point: z16.string()
 });
-var eventLedgerEventSchema = z18.discriminatedUnion("event_type", [
+var skillInvocationCompletedEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("skill_invocation_completed"),
+  skill_name: z16.string(),
+  trigger_source: z16.enum(["user", "auto_invoke", "ai_self_trigger", "chained"]),
+  entry_point: z16.string(),
+  outcome: z16.enum(["completed", "aborted", "error", "no_op"]),
+  elapsed_ms: z16.number().nonnegative().optional()
+});
+var skillPhaseTransitionEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("skill_phase_transition"),
+  skill_name: z16.string(),
+  phase: z16.string(),
+  status: z16.enum(["entered", "completed", "skipped", "failed"]),
+  checkpoint: z16.string().optional(),
+  elapsed_ms: z16.number().nonnegative().optional()
+});
+var skillTriggerCandidateEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("skill_trigger_candidate"),
+  skill_name: z16.string(),
+  trigger_source: z16.enum(["user", "auto_invoke", "ai_self_trigger", "chained"]),
+  signal: z16.string(),
+  invoked: z16.boolean()
+});
+var llmJudgeRunEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("llm_judge_run"),
+  prompt: z16.string(),
+  version: z16.string(),
+  model: z16.string(),
+  input_trace_id: z16.string(),
+  score: z16.number(),
+  rationale: z16.string()
+});
+var clientCapabilitySnapshotEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("client_capability_snapshot"),
+  client: z16.enum(["cc", "codex"]),
+  capabilities: z16.array(z16.string()),
+  version: z16.string()
+});
+var sessionEndedEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("session_ended")
+});
+var fileMutatedEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("file_mutated"),
+  path: z16.string(),
+  tool_call_id: z16.string(),
+  tool_name: z16.string().optional(),
+  source_event_id: z16.string().optional(),
+  store_id: z16.string().optional()
+});
+var knowledgeBodyReadEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("knowledge_body_read"),
+  stable_id: z16.string(),
+  store: z16.string().optional(),
+  path: z16.string(),
+  tool_call_id: z16.string().optional(),
+  tool_name: z16.string().optional()
+});
+var precompactObservedEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("precompact_observed")
+});
+var graphEdgeCandidateRequestedEventSchema = z16.object({
+  ...eventLedgerEnvelopeSchema,
+  event_type: z16.literal("graph_edge_candidate_requested"),
+  stable_id: z16.string(),
+  store: z16.string().optional()
+});
+var eventLedgerEventSchema = z16.discriminatedUnion("event_type", [
   knowledgeContextPlannedEventSchema,
   knowledgeSelectionEventSchema,
   knowledgeSectionsFetchedEventSchema,
@@ -2382,10 +3127,6 @@ var eventLedgerEventSchema = z18.discriminatedUnion("event_type", [
   reapplyCompletedEventSchema,
   installDiffAppliedEventSchema,
   eventLedgerTruncatedEventSchema,
-  mcpConfigMigratedEventSchema,
-  // v2.0.0-rc.19 TASK-004: bootstrap_marker_migrated — one-time fabric:knowledge-base
-  // → fabric:bootstrap marker rewrite emitted per file by `fabric doctor --fix`.
-  bootstrapMarkerMigratedEventSchema,
   metaReconciledOnStartupEventSchema,
   metaReconciledEventSchema,
   claudeSkillPathMigratedEventSchema,
@@ -2397,6 +3138,7 @@ var eventLedgerEventSchema = z18.discriminatedUnion("event_type", [
   knowledgePromoteStartedEventSchema,
   knowledgePromotedEventSchema,
   knowledgePromoteFailedEventSchema,
+  knowledgeModifiedEventSchema,
   knowledgeLayerChangedEventSchema,
   // v2.0.0-rc.37 NEW-24: dedicated old→new stable_id mapping event
   knowledgeIdRedirectEventSchema,
@@ -2453,14 +3195,63 @@ var eventLedgerEventSchema = z18.discriminatedUnion("event_type", [
   // fabric-archive skill at the end of every invocation. Drives Phase 0.0
   // cross-session digest, outcome-based rescan filter (skips user_dismissed),
   // covered_through_ts watermark, and `fabric doctor --archive-history`.
-  sessionArchiveAttemptedEventSchema
+  sessionArchiveAttemptedEventSchema,
+  // v2.1 GATE-INSTR (NEW-N-3): 9 interaction-axis instrumentation events.
+  hookSurfaceEmittedEventSchema,
+  hookSignalEmittedEventSchema,
+  mcpStdioTraceEventSchema,
+  payloadGuardObservedEventSchema,
+  skillInvocationStartedEventSchema,
+  skillInvocationCompletedEventSchema,
+  skillPhaseTransitionEventSchema,
+  skillTriggerCandidateEventSchema,
+  llmJudgeRunEventSchema,
+  clientCapabilitySnapshotEventSchema,
+  // lifecycle-refactor Wave 2 — dormant-hook activation markers.
+  sessionEndedEventSchema,
+  fileMutatedEventSchema,
+  // KT-DEC-0030: knowledge_body_read — PostToolUse native-Read consumption marker
+  // (replaces knowledge_consumed as the funnel's "body opened" signal).
+  knowledgeBodyReadEventSchema,
+  precompactObservedEventSchema,
+  graphEdgeCandidateRequestedEventSchema
 ]);
+
+// src/text-tokenize.ts
+var CJK_CLASS = "\\u3400-\\u4dbf\\u4e00-\\u9fff\\uf900-\\ufaff\\u3040-\\u30ff\\uac00-\\ud7af";
+var RUN_RE = new RegExp(`[a-z0-9]+|[${CJK_CLASS}]+`, "gu");
+var CJK_FIRST_RE = new RegExp(`[${CJK_CLASS}]`, "u");
+function tokenize(text) {
+  if (text.length === 0) {
+    return [];
+  }
+  const tokens = [];
+  const lowered = text.toLowerCase();
+  RUN_RE.lastIndex = 0;
+  let match;
+  while ((match = RUN_RE.exec(lowered)) !== null) {
+    const run = match[0];
+    if (CJK_FIRST_RE.test(run[0])) {
+      if (run.length === 1) {
+        tokens.push(run);
+      } else {
+        for (let i = 0; i < run.length - 1; i += 1) {
+          tokens.push(run.slice(i, i + 2));
+        }
+      }
+    } else {
+      tokens.push(run);
+    }
+  }
+  return tokens;
+}
 export {
   AGENTS_META_IDENTITY_SOURCES,
-  AGENTS_META_LAYERS,
   AGENTS_META_TOPOLOGY_TYPES,
   AgentsMetaCountersSchema,
-  BOOTSTRAP_CANONICAL,
+  BOOTSTRAP_CANONICAL_BY_LOCALE,
+  BOOTSTRAP_CANONICAL_EN,
+  BOOTSTRAP_CANONICAL_ZH,
   BOOTSTRAP_MARKER_BEGIN,
   BOOTSTRAP_MARKER_END,
   BOOTSTRAP_REGEX,
@@ -2479,9 +3270,6 @@ export {
   KNOWN_SCOPE_PREFIXES,
   KnowledgeEntryFrontmatterSchema,
   KnowledgeTypeSchema,
-  LEGACY_KB_MARKER_BEGIN,
-  LEGACY_KB_MARKER_END,
-  LEGACY_KB_REGEX,
   LayerSchema,
   MCP_STORE_AWARE_CONTRACTS,
   MCP_STORE_AWARE_TOOLS,
@@ -2493,30 +3281,34 @@ export {
   PERSONAL_SCOPE,
   PERSONAL_STORE_SENTINEL,
   PROJECT_ROOT_SIGNALS,
-  PROPOSED_REASON_DESCRIPTIONS,
+  PROPOSED_REASON_DESCRIPTIONS_BY_LOCALE,
   PROTECTED_TOKENS,
   ProposedReasonSchema,
   REDACTION_PLACEHOLDER_PREFIX,
-  ResolverNotImplementedError,
   SCOPE_COORDINATE_PATTERN,
   STORES_ROOT_DIR,
+  STORE_ALIAS_PATTERN,
   STORE_GITIGNORE,
   STORE_KNOWLEDGE_TYPE_DIRS,
   STORE_LAYOUT,
+  STORE_MOUNT_GROUPS,
+  STORE_MOUNT_NAME_PATTERN,
   STORE_PENDING_DIR,
+  STORE_PROJECT_ID_PATTERN,
   STORE_RESOLVER_WARNING_CODES,
   STORE_UUID_PATTERN,
   StableIdSchema,
   UID_SEGMENT_PATTERN,
   addMountedStore,
+  addStoreProject,
   agentsIdentitySourceSchema,
-  agentsLayerSchema,
   agentsMetaNodeSchema,
   agentsMetaSchema,
   agentsTopologyTypeSchema,
   aggregatePendingAcrossStores,
   aiLedgerEntrySchema,
   allocateKnowledgeId,
+  allocateStoreKnowledgeId,
   annotateIntentRequestSchema,
   archiveScanAnnotations,
   archiveScanInputSchema,
@@ -2525,9 +3317,10 @@ export {
   auditModeSchema,
   bindRequiredStore,
   bindingsSnapshotPath,
-  bootstrapMarkerMigratedEventSchema,
   buildDebugBundle,
   buildFailureTrace,
+  buildScanRecommendations,
+  buildStoreResolveInput,
   candidateFileEntrySchema,
   citeContractMetricsSchema,
   citeContractPolicyActivatedEventSchema,
@@ -2536,6 +3329,7 @@ export {
   citePolicyActivatedEventSchema,
   claudeHookPathMigratedEventSchema,
   claudeSkillPathMigratedEventSchema,
+  clientCapabilitySnapshotEventSchema,
   clientPathsSchema,
   codexSkillPathMigratedEventSchema,
   createProjectRootResolver,
@@ -2545,11 +3339,12 @@ export {
   defaultLayerFilterSchema,
   defaultMessages,
   deriveAgentsMetaIdentitySource,
-  deriveAgentsMetaLayer,
   deriveAgentsMetaStableId,
   deriveAgentsMetaTopologyType,
+  deriveMountLabel,
   detachMountedStore,
   detectNodeLocale,
+  disambiguateAlias,
   doctorRunEventSchema,
   driftDetectedEventSchema,
   editIntentCheckedEventSchema,
@@ -2564,6 +3359,7 @@ export {
   fabricConfigSchema,
   fabricEventSchema,
   fabricLanguageSchema,
+  fileMutatedEventSchema,
   findMountedStore,
   findStoreExecutableViolations,
   forensicAssertionCoverageSchema,
@@ -2580,10 +3376,14 @@ export {
   formatKnowledgeId,
   getPanelFieldByKey,
   getPanelFields,
+  globalConfigPath,
   globalConfigSchema,
   globalRefSchema,
+  graphEdgeCandidateRequestedEventSchema,
   hasSecrets,
   historyStateQuerySchema,
+  hookSignalEmittedEventSchema,
+  hookSurfaceEmittedEventSchema,
   humanLedgerEntrySchema,
   humanLockApproveRequestSchema,
   humanLockEntrySchema,
@@ -2604,6 +3404,7 @@ export {
   isPersonalScope,
   knowledgeArchiveAttemptedEventSchema,
   knowledgeArchivedEventSchema,
+  knowledgeBodyReadEventSchema,
   knowledgeConsumedEventSchema,
   knowledgeContextPlannedEventSchema,
   knowledgeDeferredEventSchema,
@@ -2613,6 +3414,7 @@ export {
   knowledgeIdRedirectEventSchema,
   knowledgeLayerChangedEventSchema,
   knowledgeMetaAutoHealedEventSchema,
+  knowledgeModifiedEventSchema,
   knowledgePathDangledEventSchema,
   knowledgePromoteFailedEventSchema,
   knowledgePromoteStartedEventSchema,
@@ -2637,18 +3439,24 @@ export {
   ledgerSourceSchema,
   lintCrossStoreReferences,
   listStoreKnowledge,
+  llmJudgeRunEventSchema,
+  loadGlobalConfig,
+  loadProjectConfig,
   localKnowledgeIdSchema,
   lockApprovedEventSchema,
   lockDriftEventSchema,
-  mcpConfigMigratedEventSchema,
+  matchBootstrapCanonicalLocale,
   mcpEventLedgerEventSchema,
   mcpPayloadLimitsSchema,
+  mcpStdioTraceEventSchema,
   metaReconciledEventSchema,
   metaReconciledOnStartupEventSchema,
   metaUpdatedEventSchema,
   mountedStoreSchema,
   normalizeCiteTag,
   normalizeLocale,
+  nudgeModeSchema,
+  observeConfigSchema,
   onboardSlotSchema,
   parityCapabilitySchema,
   parityClientExpectationSchema,
@@ -2658,12 +3466,16 @@ export {
   parseCiteLine,
   parseGlobalRef,
   parseKnowledgeId,
+  payloadGuardObservedEventSchema,
   pendingAutoArchivedEventSchema,
   planContextAnnotations,
   planContextHintNarrowEntrySchema,
   planContextHintOutputSchema,
   planContextInputSchema,
   planContextOutputSchema,
+  planContextTopKSchema,
+  precompactObservedEventSchema,
+  projectConfigPath,
   projectRootGoldenCaseSchema,
   projectRootGoldenFileSchema,
   projectRootResolutionSchema,
@@ -2674,41 +3486,69 @@ export {
   readSetEntrySchema,
   readSetGoldenCaseSchema,
   readSetGoldenFileSchema,
+  readStoreCounters,
   readStoreIdentity,
+  readStoreIdentityAsync,
+  readStoreProjects,
   reapplyCompletedEventSchema,
   recallAnnotations,
   recallInputSchema,
   recallOutputSchema,
   recognizeStoreDir,
+  reconcileStoreCounters,
+  redactPii,
   redactSecrets,
   relevanceMigrationRunEventSchema,
   requiredStoreEntrySchema,
+  resolveBootstrapCanonical,
   resolveCandidates,
   resolveFabricLocale,
+  resolveGlobalLocale,
+  resolveGlobalRoot,
   resolveStoreQualifiedId,
+  resolveWorkspaceBindingId,
   resolvedBindingsSnapshotSchema,
   ruleDescriptionIndexItemSchema,
   ruleDescriptionSchema,
+  saveGlobalConfig,
+  saveProjectConfig,
   scanForSecrets,
   scopeCoordinateSchema,
   scopeRoot,
+  scrubRemoteUrl,
   selectionTokenTtlMsSchema,
   serveLockClearedEventSchema,
   sessionArchiveAttemptedEventSchema,
+  sessionEndedEventSchema,
+  skillInvocationCompletedEventSchema,
+  skillInvocationStartedEventSchema,
+  skillPhaseTransitionEventSchema,
+  skillTriggerCandidateEventSchema,
+  storeAliasSchema,
   storeAwareEntrySchema,
+  storeCountersPath,
   storeCountersSchema,
+  storeHasProject,
   storeIdentitySchema,
   storeKnowledgeTypeDir,
+  storeMountGroup,
+  storeMountNameSchema,
+  storeMountSubPath,
+  storeProjectSchema,
+  storeProjectsFileSchema,
   storeReadSetSchema,
   storeRelativePath,
+  storeRelativePathForMount,
   storeResolveInputSchema,
   storeResolverWarningCodeSchema,
   storeResolverWarningSchema,
   storeUuidSchema,
   structuredWarningSchema,
+  tokenize,
   uidSchema,
   withDerivedAgentsMetaNodeDefaults,
   writeBindingsSnapshot,
+  writeRouteSchema,
   writeTargetSchema,
   writtenToStoreSchema,
   zhCNMessages