@fenglimg/fabric-cli 2.0.1 → 2.1.0-rc.2

package/templates/hooks/lib/cite-line-parser.cjs

@@ -18,7 +18,10 @@
 //     auto-ships to cc/codex/cursor with no install pipeline change.
 //
 // Vocabulary contract (mirrored 1:1 with the TS source):
-//   - cite_tags enum: planned | recalled | chained-from | dismissed | none
+//   - cite_tags enum: applied | dismissed | none (rc.37 NEW-1 2-state vocab).
+//     v2.1.0-rc.1 (ADJ-P4-1, full remap): legacy rc≤36 tags (planned / recalled
+//     / chained-from) are REMAPPED to `applied` here — accepted as input but no
+//     longer emitted verbatim, so the TS source and this twin stay in lockstep.
 //   - operator kinds: edit | not_edit | require | forbid
 //     (source token `!edit:` → schema kind `not_edit`)
 //   - skip:<reason> captures everything after the first colon, so
@@ -29,31 +32,44 @@
 const ID_RE = /^K[TP]-[A-Z]+-\d+$/;
 const SENTINEL_RE = /^KB:\s*none\b\s*(?:\[[^\]]*\])?\s*$/i;
 // v2.0.0-rc.27 TASK-003 (audit §2.18): multi-id citations supported via
-// comma-separated ID group. Mirrors packages/shared/src/cite-line-parser.ts.
-const FULL_RE =
-  /^KB:\s+(K[TP]-[A-Z]+-\d+(?:\s*,\s*K[TP]-[A-Z]+-\d+)*)(?:\s+\(([^)]*)\))?(?:\s+\[([^\]]+)\])?(?:\s+→\s*(.+))?\s*$/;
+// comma-separated ID group. v2.1.0-rc.1 P4 (F3/S62): each id may carry an
+// optional `<store>:` prefix. Mirrors packages/shared/src/cite-line-parser.ts.
+const QUALIFIED_ID = "(?:[^\\s,:]+:)?K[TP]-[A-Z]+-\\d+";
+const FULL_RE = new RegExp(
+  "^KB:\\s+(" +
+    QUALIFIED_ID +
+    "(?:\\s*,\\s*" +
+    QUALIFIED_ID +
+    ")*)(?:\\s+\\(([^)]*)\\))?(?:\\s+\\[([^\\]]+)\\])?(?:\\s+→\\s*(.+))?\\s*$",
+);
 const CHAINED_FROM_ID_RE = /chained-from\s+(K[TP]-[A-Z]+-\d+)/i;
 
-const ALLOWED_TAGS = new Set([
-  // v2.0.0-rc.37 NEW-1: new simplified 2-state tag set ([applied] / [dismissed]).
-  // Old 4-state tags (planned / recalled / chained-from) accepted for
-  // backward compat — they continue to parse and count toward cite-coverage
-  // so in-flight workspaces don't lose their existing audit signal.
-  "applied",
-  "dismissed",
-  // Legacy tags (rc ≤36).
-  "planned",
-  "recalled",
-  "chained-from",
-  "none",
-]);
+// Split `<store>:<id>` into qualifier + local id; bare id → null qualifier.
+function splitStorePrefix(token) {
+  const colon = token.lastIndexOf(":");
+  return colon === -1
+    ? { store: null, id: token }
+    : { store: token.slice(0, colon), id: token.slice(colon + 1) };
+}
+
+// v2.1.0-rc.1 (ADJ-P4-1, full remap): legacy rc≤36 tags collapse to `applied`.
+// Mirrors LEGACY_CITE_TAG_REMAP / normalizeCiteTag in the TS source — accepted
+// as input but emitted as the 2-state vocab so cite-coverage never undercounts.
+const LEGACY_CITE_TAG_REMAP = {
+  planned: "applied",
+  recalled: "applied",
+  "chained-from": "applied",
+};
 
 function parseTag(rawTag) {
   if (!rawTag) return "none";
   // Tags may carry tails like `chained-from KT-DEC-0001` or
   // `dismissed:scope-mismatch`; head token (whitespace/colon-bounded) wins.
   const head = rawTag.trim().split(/[\s:]+/)[0].toLowerCase();
-  return ALLOWED_TAGS.has(head) ? head : "none";
+  if (head === "applied" || head === "dismissed" || head === "none") {
+    return head;
+  }
+  return LEGACY_CITE_TAG_REMAP[head] || "none";
 }
 
 function parseContractTail(tail) {
@@ -89,17 +105,21 @@ function parseLine(line) {
   const trimmed = line.trim();
   if (trimmed.length === 0) return null;
   if (SENTINEL_RE.test(trimmed)) {
-    return { ids: [], tag: "none", commitment: null };
+    return { ids: [], stores: [], tag: "none", commitment: null };
   }
   const fullMatch = trimmed.match(FULL_RE);
   if (fullMatch) {
     // v2.0.0-rc.27 TASK-003 (audit §2.18): split + revalidate each id;
-    // capture chained-from tail id when present.
-    const primaryIds = fullMatch[1]
+    // capture chained-from tail id when present. v2.1.0-rc.1 P4 (F3): strip +
+    // surface any `<store>:` prefix into a parallel stores array.
+    const split = fullMatch[1]
       .split(",")
       .map((part) => part.trim())
-      .filter((part) => part.length > 0);
-    if (primaryIds.some((id) => !ID_RE.test(id))) return null;
+      .filter((part) => part.length > 0)
+      .map(splitStorePrefix);
+    if (split.some((entry) => !ID_RE.test(entry.id))) return null;
+    const primaryIds = split.map((entry) => entry.id);
+    const primaryStores = split.map((entry) => entry.store);
 
     const rawTag = fullMatch[3];
     const tag = parseTag(rawTag);
@@ -114,6 +134,7 @@ function parseLine(line) {
 
     return {
       ids: primaryIds.concat(chainedIds),
+      stores: primaryStores.concat(chainedIds.map(() => null)),
       tag,
       commitment: parseContractTail(fullMatch[4]),
     };
@@ -131,14 +152,15 @@ function parseLine(line) {
  * embedded id as an additional cite_id. cite_tags carries one tag per LINE.
  */
 function parseCiteLine(raw) {
-  const result = { cite_ids: [], cite_tags: [], cite_commitments: [] };
+  const result = { cite_ids: [], cite_tags: [], cite_commitments: [], cite_stores: [] };
   if (typeof raw !== "string") return result;
   for (const line of raw.split(/\r?\n/)) {
     const parsed = parseLine(line);
     if (!parsed) continue;
     result.cite_tags.push(parsed.tag);
-    for (const id of parsed.ids) {
-      result.cite_ids.push(id);
+    for (let i = 0; i < parsed.ids.length; i += 1) {
+      result.cite_ids.push(parsed.ids[i]);
+      result.cite_stores.push(parsed.stores[i] == null ? null : parsed.stores[i]);
     }
     if (parsed.commitment !== null) {
       // v2.0.0-rc.27.1 (Codex review fix): cite_commitments MUST be index-

package/templates/skills/fabric-archive/SKILL.md

@@ -43,6 +43,10 @@ Parse user's prompt for time-window (`今日` / `last week`), topic keyword (`rc
 
 Read `.fabric/fabric-config.json`; resolve `archive_max_candidates_per_batch` (default 8), `archive_max_recent_paths` (default 20), `archive_digest_max_sessions` (default 10). Missing file → defaults silently.
 
+### Phase 0.6 — Store routing (v2.1 multi-store)
+
+Archives land in the **active write store** for the entry's scope — NEVER pick a store yourself. Run `fabric scope-explain team` (or the relevant scope) to get the resolved `writeTarget` (alias + UUID); that is where `fab_extract_knowledge` persists. Single-store / no global config → the lone store (back-compat). After persisting, **echo the target store alias** to the user (`归档到 store '<alias>'`). Personal-scope entries route to the personal store (never the shared team store, R5#3). Do NOT read `~/.fabric` store trees directly — go through `scope-explain` / the MCP write path.
+
 ### UX i18n Policy
 
 Read `fabric_language` (`zh-CN` / `en` / `zh-CN-hybrid` / `match-existing`); emit user-facing prose in resolved variant. Protected tokens (MCP tool names, schema fields, the verbatim `强 team` / `强 personal` / `默认 team` heuristic) NEVER translated. `AskUserQuestion` policy: `header` + `question` translate; `options[]` stay English (routing keys).

package/templates/skills/fabric-import/SKILL.md

@@ -40,6 +40,10 @@ Read `.fabric/fabric-config.json` for tunables (defaults if absent):
 
 First-run vs re-run by state file (ENOENT or `phase != complete && proposed == 0` → first-run window).
 
+### Store routing (v2.1 multi-store)
+
+Import requires an **explicit target store** (E7) — mined entries are NOT auto-routed. Resolve candidates via `fabric scope-explain team` (writable stores in the read-set); if more than one writable store exists, `AskUserQuestion` for the target store alias before persisting (header/question translate, the alias options stay English routing keys). Single writable store → use it. Persist through `fab_extract_knowledge` with the chosen store; echo the target alias. Never write to a store the project did not declare (read-set bound).
+
 ## UX i18n Policy
 
 Read `fabric_language` (`zh-CN` / `en` / `zh-CN-hybrid` / `match-existing`). Emit prose per variant. Protected tokens NEVER translate (`fab_extract_knowledge`, `fab_review`, `.fabric/.import-state.json`, all enum strings, `MUST`/`NEVER`). Full 5-class taxonomy → `Read .../ref/i18n-policy.md`.

package/templates/skills/fabric-review/SKILL.md

@@ -40,6 +40,10 @@ Read `.fabric/fabric-config.json`; resolve:
 
 Missing or unreadable → defaults silently.
 
+### Store routing (v2.1 multi-store)
+
+Review iterates **per-store** — the read-set may span multiple stores (`fabric scope-explain team` → resolved `readSet.stores`). Pending/backlog is reported per-store (NOT aggregated into one undifferentiated pile); each candidate's provenance store is surfaced in cites as `KB: <store-alias>:<id>`. Promotion (draft → verified/proven) is a normal edit + git commit **inside that store's own repo** — no cross-store move. A `dismissed`/`modify` that flips layer between team and personal still goes through `AskUserQuestion`. Never read `~/.fabric` store trees directly; go through the MCP recall path / `scope-explain`.
+
 ### UX i18n Policy
 
 Read `fabric_language` (`zh-CN` / `en` / `zh-CN-hybrid` / `match-existing`); emit user-facing prose in resolved variant. Protected tokens (`fab_review`, `fab_extract_knowledge`, `relevance_scope`, layer/scope enums, `stable_id`, the verbatim `强 team` / `强 personal` / `默认 team` block) NEVER translated. `AskUserQuestion` policy: `header` + `question` translate; `options[]` stay English (routing keys).

package/templates/skills/fabric-sync/SKILL.md

@@ -0,0 +1,46 @@
+---
+name: fabric-sync
+description: 多 store git 同步辅助 — 遍历挂载的知识 store, pull --rebase + push, AI 辅助解冲突。Triggers 同步知识库/sync stores/fabric-sync/解决 store 冲突/rebase 冲突.
+---
+
+# fabric-sync
+
+跨多个挂载知识 store 的 git 同步辅助 (v2.1, S46)。CLI `fabric sync` 是事务/状态机引擎；本 skill 是它的 AI 辅助外层：遍历 store、解释每个 store 的同步结果、在 rebase 冲突时辅助用户决断 continue/abort。
+
+## Precondition
+
+- 已 `fabric install --global` (存在 `~/.fabric` + 全局 store registry)。无全局配置 → 提示先装，停止。
+- 本 skill 不直接读 `~/.fabric` store 树；所有 store 状态经 `fabric sync` / `fabric store list` / `fabric scope-explain` 的 JSON 输出获取 (hook/skill 不自解析 store)。
+
+## Phase 0 — Enumerate stores
+
+`fabric store list` 拿到挂载的 store (alias / uuid / remote)。仅 remote-backed store 参与同步；local-only store 跳过 (无可推/拉)，但提示「local-only — 加 remote 备份」(R5#5)。
+
+## Phase 1 — Run sync
+
+执行 `fabric sync`。逐 store 渲染结果 (NOT 聚合成一坨)：
+- `synced` — 干净 rebase + push 完成。
+- `offline` — 网络不可达；本地已提交，push 已 defer (S17 offline-first)，下次 online 重试。**不报错**。
+- `conflict` — rebase 冲突，sync 暂停并持久化 session。进入 Phase 2。
+
+## Phase 2 — AI-assisted conflict resolution (仅冲突时)
+
+冲突 store 的工作区停在 rebase 中途。辅助用户：
+1. 展示冲突文件 (store 知识树 `.fabric/knowledge/<type>/*.md` 中的 `<<<<<<<`/`=======`/`>>>>>>>` 段)。
+2. 对每个冲突，MUST 解释两侧 (ours = 本地草稿/晋升, theirs = 远端协作者) 并给出**合并建议**（知识条目通常可并存或取更成熟 maturity）。NEVER 擅自丢弃任一侧未经用户确认。
+3. 用户解决后 → `fabric sync --continue` (git rebase --continue + 恢复遍历剩余 store)。
+4. 用户选择放弃该 store → `fabric sync --abort` (git rebase --abort，该 store 留未同步，继续遍历其余)。
+
+## Phase 3 — Settle
+
+所有 store settled (无 pending/conflict) 后：CLI 自动清 session 并重生 `~/.fabric/state/bindings/<id>_resolved.json` 快照 (P3→P4 链)。汇报：已同步 store 数、deferred (offline) store 数、aborted store 数。
+
+## UX i18n Policy
+
+按 `.fabric/fabric-config.json` 的 `fabric_language` 渲染用户可见文案。Protected tokens (`fabric sync`, `--continue`, `--abort`, `git rebase`, store alias, enum) NEVER translate。
+
+## Constraints
+
+- Hook/skill **绝不**直接解析 store 或执行 store 内任何文件 (S65 RCE 防线：store 是数据-only)。
+- 冲突合并建议是辅助，最终由用户拍板；不静默丢弃知识。
+- promotion/CR 经普通 git commit，不跨 store 搬运条目。