@fenglimg/fabric-cli 2.2.0 → 2.3.0-rc.1

package/templates/hooks/fabric-hint.cjs

@@ -6,7 +6,11 @@ const { dirname, join } = require("node:path");
 // ledgers (events.jsonl, metrics.jsonl). Under multi-window concurrency a bare
 // appendFileSync can interleave a partial write; route through the advisory-lock
 // primitive (drop-on-contention, best-effort — matches injection-log).
+// ux-w2-9: events.jsonl writes go through the single guarded event-writer
+// (envelope stamp + event_type guard); metrics.jsonl stays on the raw locked
+// primitive (it is not a schema-governed event ledger).
 const { appendLockedLine } = require("./lib/injection-log.cjs");
+const { appendEvent } = require("./lib/event-writer.cjs");
 
 // v2.0.0-rc.7 T5: session-digest writer. Best-effort (never blocks Stop hook
 // on failure — see contract in lib/session-digest-writer.cjs).
@@ -976,11 +980,11 @@ function readArchiveEditThreshold(projectRoot) {
  * Both default to a no-trigger shape when omitted (back-compat for callers
  * pre-dating the two-lane split).
  *
- * Returns one of:
- *   - { decision: 'block', reason, signal: 'archive', recommended_skill: 'fabric-archive' }
- *   - { decision: 'block', reason, signal: 'archive_backlog', recommended_skill: 'fabric-archive' }
- *   - { decision: 'block', reason, signal: 'review', recommended_skill: 'fabric-review' }
- *   - { decision: 'block', reason, signal: 'import', recommended_skill: 'fabric-import' }
+ * Returns one of (ux-w0-3: `decision: 'soft'` — a reminder, never a gate):
+ *   - { decision: 'soft', reason, signal: 'archive', recommended_skill: 'fabric-archive' }
+ *   - { decision: 'soft', reason, signal: 'archive_backlog', recommended_skill: 'fabric-archive' }
+ *   - { decision: 'soft', reason, signal: 'review', recommended_skill: 'fabric-review' }
+ *   - { decision: 'soft', reason, signal: 'import', recommended_skill: 'fabric-import' }
  *   - null on no trigger
  */
 // rc.7 T7: thresholds is the externalized-config view passed in by main().
@@ -1077,7 +1081,7 @@ function decide(events, now, pendingStats, underseedStats, editCounterStats, thr
     const line3 = renderBanner("archiveCta", variant, {});
     const reason = [line1, line2, line3].filter((l) => l.length > 0).join("\n");
     return {
-      decision: "block",
+      decision: "soft",
       reason,
       signal: "archive",
       recommended_skill: "fabric-archive",
@@ -1100,7 +1104,7 @@ function decide(events, now, pendingStats, underseedStats, editCounterStats, thr
     const line2 = renderBanner("backlogCta", variant, {});
     const reason = `${line1}\n${line2}`;
     return {
-      decision: "block",
+      decision: "soft",
       reason,
       signal: "archive_backlog",
       recommended_skill: "fabric-archive",
@@ -1138,7 +1142,7 @@ function decide(events, now, pendingStats, underseedStats, editCounterStats, thr
     const line2 = renderBanner("reviewCta", variant, {});
     const reason = `${line1}\n${line2}`;
     return {
-      decision: "block",
+      decision: "soft",
       reason,
       signal: "review",
       recommended_skill: "fabric-review",
@@ -1196,10 +1200,11 @@ function decide(events, now, pendingStats, underseedStats, editCounterStats, thr
     const line2 = renderBanner("importCta", variant, {});
     const reason = `${line1}\n${line2}`;
     return {
-      decision: "block",
+      decision: "soft",
       reason,
       signal: "import",
-      recommended_skill: "fabric-import",
+      // W3-C: fabric-import folded into fabric-archive `source` mode.
+      recommended_skill: "fabric-archive",
       // v2.1 NEW-N-3: underseed corpus trigger — node-count vs threshold. The
       // "import" signal collapses to schema signal_type "other" in main().
       threshold: underseed.threshold,
@@ -1525,8 +1530,8 @@ function writeMaintenanceLastEmit(projectRoot, nowMs, sessionId) {
  *      the previous Signal-D emit. Tracked via dedicated sidecar
  *      `.fabric/.cache/maintenance-hint-last-emit`.
  *
- * Returns one of:
- *   - { decision: 'block', reason, signal: 'maintenance', recommended_skill: null }
+ * Returns one of (ux-w0-3: `decision: 'soft'` — a reminder, never a gate):
+ *   - { decision: 'soft', reason, signal: 'maintenance', recommended_skill: null }
  *   - null on no trigger
  *
  * `recommended_skill` is intentionally null — the maintenance prompt
@@ -1591,7 +1596,7 @@ function evaluateMaintenanceSignal(events, now, canonicalCount, lastEmitMs, thre
   const reason = `${line1}\n${line2}`;
 
   return {
-    decision: "block",
+    decision: "soft",
     reason,
     signal: "maintenance",
     // CLI recommendation rather than Skill — doctor is a CLI surface.
@@ -1681,7 +1686,7 @@ function emitGraphEdgeCandidateBestEffort(cwd, events, sessionId) {
     };
     if (store !== undefined) event.store = store;
     if (typeof sessionId === "string" && sessionId.length > 0) event.session_id = sessionId;
-    appendLockedLine(join(fabricDir, EVENT_LEDGER_FILE), JSON.stringify(event) + "\n");
+    appendEvent(fabricDir, event);
 
     // Record the de-dup marker (best-effort; atomic when state-store lib loaded).
     try {
@@ -1743,7 +1748,7 @@ function emitSignalFiredEvent(cwd, sessionId, result) {
       fired: true,
     };
     if (typeof sessionId === "string" && sessionId.length > 0) event.session_id = sessionId;
-    appendLockedLine(join(fabricDir, EVENT_LEDGER_FILE), JSON.stringify(event) + "\n");
+    appendEvent(fabricDir, event);
   } catch {
     // best-effort telemetry — never block the hook
   }
@@ -1896,7 +1901,6 @@ function extractAndWriteAssistantTurnsBestEffort(cwd, stdinPayload) {
       // writer applies the same guard via its own internal check.
       return;
     }
-    const ledgerPath = join(fabricDir, EVENT_LEDGER_FILE);
     const client = detectClient();
     let randomUUID;
     try {
@@ -1952,7 +1956,7 @@ function extractAndWriteAssistantTurnsBestEffort(cwd, stdinPayload) {
           timestamp: new Date().toISOString(),
         };
         if (client !== undefined) event.client = client;
-        appendLockedLine(ledgerPath, JSON.stringify(event) + "\n");
+        appendEvent(fabricDir, event);
       } catch {
         // Per-turn failure must not abort the remaining turns; the Stop hook
         // contract is "never block on hook failure". Best-effort continues.
@@ -2220,6 +2224,45 @@ function writeSessionDigestBestEffort(projectRoot, stdinPayload) {
   }
 }
 
+// ux-w0-3 (KT-DEC-0007): the SINGLE soft-emit path for EVERY Stop-hook signal
+// (archive / archive_backlog / review / import / maintenance). A nudge is a
+// reminder layer, NEVER a gate — so no signal ever emits a blocking decision.
+// The AI channel always carries the reason (flow ⊥ observation, D3); the human
+// systemMessage is gated by nudge_mode (D4/D5), with high-value signals
+// (knowledge-loss: archive / archive_backlog) surfacing at lower volumes.
+// Mutates `result` (strips telemetry-only threshold/actual_value, like the prior
+// inline paths). When the client adapter is unavailable, falls back to a plain
+// non-blocking JSON payload (decision stays "soft", never blocking).
+function emitSoftSignal(out, result, cwd, highValue) {
+  const reasonText = typeof result.reason === "string" ? result.reason : "";
+  delete result.threshold;
+  delete result.actual_value;
+  const client =
+    clientAdapter && typeof clientAdapter.detectClient === "function"
+      ? clientAdapter.detectClient(__dirname)
+      : undefined;
+  // Known client (cc / codex): emit the dual-sink envelope on stdout —
+  // additionalContext(AI, always) + systemMessage(human, gated by nudge_mode).
+  if (client && clientAdapter && typeof clientAdapter.emitDualSink === "function") {
+    const humanGate =
+      nudgePolicy !== null
+        ? nudgePolicy.resolveHumanSink(cwd, "stop", { highValue })
+        : { emitHuman: true };
+    clientAdapter.emitDualSink(
+      { human: humanGate.emitHuman ? reasonText : null, ai: reasonText },
+      { client, eventName: "Stop", streams: { stdout: out } },
+    );
+    return;
+  }
+  // Unknown client / no adapter → emit the reason as a plain, non-blocking
+  // payload on stdout. `result.decision` is "soft" (non-blocking), so this is
+  // a reminder, not a gate (KT-DEC-0007).
+  out.write(JSON.stringify(result));
+}
+
+// High-value (knowledge-loss) signals surface at lower nudge_mode volumes.
+const HIGH_VALUE_SIGNALS = new Set(["archive", "archive_backlog"]);
+
 /**
  * Main entry — invoked both as a CLI (require.main === module) and in-process by tests.
  *
@@ -2492,9 +2535,7 @@ function main(env, stdio) {
     // uses hours, so we branch here to avoid mixing semantics.
     if (result.signal === "maintenance") {
       emitSignalFiredEvent(cwd, sessionId, result);
-      delete result.threshold;
-      delete result.actual_value;
-      out.write(JSON.stringify(result));
+      emitSoftSignal(out, result, cwd, HIGH_VALUE_SIGNALS.has(result.signal));
       writeMaintenanceLastEmit(cwd, nowMs, resolveHookSessionId(stdinPayload));
       return;
     }
@@ -2516,27 +2557,12 @@ function main(env, stdio) {
     }
 
     emitSignalFiredEvent(cwd, sessionId, result);
-    const reasonText = typeof result.reason === "string" ? result.reason : "";
-    delete result.threshold;
-    delete result.actual_value;
-    // v2.2 dual-sink (Goal A / D3): the archive nudge is SOFT — emitted as
-    // additionalContext(AI) + systemMessage(human), NEVER decision:block. The
-    // human channel is gated by nudge_mode (D4/D5); the AI channel always carries
-    // it (flow ⊥ observation). Missing it is backstopped by the SessionEnd marker
-    // + cross-session debt (D3). Review/import keep the decision:block contract
-    // (out of Goal A scope; KT-DEC-0007 nudge semantics unchanged for them).
-    if (result.signal === "archive" && clientAdapter && typeof clientAdapter.emitDualSink === "function") {
-      const humanGate =
-        nudgePolicy !== null
-          ? nudgePolicy.resolveHumanSink(cwd, "stop", { highValue: true })
-          : { emitHuman: true };
-      clientAdapter.emitDualSink(
-        { human: humanGate.emitHuman ? reasonText : null, ai: reasonText },
-        { client: clientAdapter.detectClient(__dirname), eventName: "Stop", streams: { stdout: out } },
-      );
-    } else {
-      out.write(JSON.stringify(result));
-    }
+    // ux-w0-3 (KT-DEC-0007): EVERY A/B/C signal (archive / archive_backlog /
+    // review / import) emits SOFT via the shared path — additionalContext(AI) +
+    // nudge_mode-gated systemMessage(human), NEVER decision:block. Previously
+    // only `archive` was soft and review/import blocked; the block contract is
+    // retired (a nudge is a reminder layer, never a gate).
+    emitSoftSignal(out, result, cwd, HIGH_VALUE_SIGNALS.has(result.signal));
     cache[result.signal] = nowMs;
     writeShownCache(cwd, cache, resolveHookSessionId(stdinPayload));
   } catch {

package/templates/hooks/knowledge-hint-broad.cjs

@@ -42,11 +42,21 @@ const { spawnSync } = require("node:child_process");
 const { existsSync, readdirSync, readFileSync } = require("node:fs");
 const { join } = require("node:path");
 
+// W3-B F-005 (C-003 HUD-shared layer): the SessionStart AI sink reskin consumes
+// the parity-trivial shared structural primitives — sectionBar (title row) +
+// scopeBadge ([team]/[project]/[personal]) — from the .cjs theme mirror. This is
+// the ONLY shared-theme dependency the hook may take: lib/theme.cjs is byte-locked
+// to packages/shared/src/theme.ts by theme-parity.test.ts (G-THEME). The hook MUST
+// NEVER reach for the CLI-only ESM/TS structure layer (the tree / grid primitives
+// under packages/cli/src/tui) — it is unrequireable from a .cjs runtime; the HUD
+// deliberately uses plain two-space indent instead of the complex tree() primitive.
+const { sectionBar, scopeBadge } = require("./lib/theme.cjs");
+
 // W1-01 (ISS-012): the SessionStart broad hook appends a hook_surface_emitted
-// event to the shared events.jsonl. Under multi-window concurrency a bare
-// appendFileSync can interleave a partial write; route through the advisory-lock
-// primitive (drop-on-contention, best-effort — matches injection-log).
-const { appendLockedLine } = require("./lib/injection-log.cjs");
+// event to the shared events.jsonl. ux-w2-9: route through the single guarded
+// event-writer (envelope stamp + event_type guard + advisory-lock append) so
+// the row always satisfies the event-ledger schema the doctor reads.
+const { appendEvent } = require("./lib/event-writer.cjs");
 
 // rc.16 TASK-003: shared banner-i18n lib (resolves fabric_language config and
 // renders localized banner text). Mirror of the wiring in fabric-hint.cjs
@@ -330,7 +340,7 @@ function isImportTouched(projectRoot) {
 
 /**
  * rc.8 underseed self-check: determine whether the SessionStart hook should
- * surface the one-line `/fabric-import` recommendation banner.
+ * surface the one-line `/fabric-archive` recommendation banner.
  *
  * Three-condition truth table (ALL must hold to return true):
  *   1. the workspace is fabric-bound — readWorkspaceBindingId(cwd) !== null
@@ -441,7 +451,7 @@ const MATURITY_DRAFT = "draft";
 // fabric-hint.cjs Signal C `📋 Fabric:`). rc.16 TASK-003 routed the literal
 // through the banner-i18n lib (key: 'broadImportBanner') — see main() below
 // for the renderBanner call site. Substring contracts preserved across all
-// variants: leading two-space indent, `📋 Fabric:` prefix, `/fabric-import`
+// variants: leading two-space indent, `📋 Fabric:` prefix, `/fabric-archive`
 // verbatim token (asserted by knowledge-hint-broad.test.ts).
 
 // -----------------------------------------------------------------------------
@@ -921,6 +931,24 @@ function renderScopeStoreLabel(snapshot, lang) {
 // must_read_if}); `alwaysBodies` is always_bodies[] ({id,type,layer,summary,body}).
 const REFERENCE_TYPES = new Set(["decision", "pitfall", "process"]);
 
+// W3-B F-005: map a knowledge entry's layer to a scopeBadge() scope key
+// (team→'team' · project→'project' · personal→'personal'). Bodies carry an
+// explicit `.layer`; plan-context reference entries do not, so the layer is
+// recovered from the id prefix (`team:KT-…` / `project:…` / `personal:…`), with a
+// `KP-` id always personal. Anything unrecognized falls back to 'team' — the
+// broadest, default tier — so the badge never renders an undefined scope.
+const VALID_SCOPES = new Set(["team", "project", "personal"]);
+function layerToScope(entry) {
+  const e = entry || {};
+  if (typeof e.layer === "string" && VALID_SCOPES.has(e.layer)) return e.layer;
+  const id = typeof e.id === "string" ? e.id : "";
+  const prefix = id.includes(":") ? id.slice(0, id.indexOf(":")) : "";
+  if (VALID_SCOPES.has(prefix)) return prefix;
+  // `KP-*` ids are the personal convention even without a `personal:` prefix.
+  if (/(^|:)KP-/.test(id)) return "personal";
+  return "team";
+}
+
 function renderAiSink(opts) {
   const { entries, alwaysBodies, storeLabel, broadIndexBackstop, summaryMaxLen, lang } =
     opts || {};
@@ -939,35 +967,56 @@ function renderAiSink(opts) {
   let indexCount = 0; // total rendered index lines (always + reference), for the backstop.
 
   const lines = [];
-  lines.push(`[fabric:SessionStart] ${storeLabel || "store"}`);
+  // W3-B F-005 (mockup #3): a single sectionBar title carrying the active /
+  // reference counts, replacing the legacy `[fabric:SessionStart] <store>` +
+  // flat `ALWAYS-ACTIVE RULES (...)` header. The store label is preserved on the
+  // human sink (renderScopeStoreLabel); the AI sink leads with the count title.
+  // sectionBar degrades to `# <title>` when color is off (NO_COLOR / non-TTY),
+  // byte-locked to the TS source by theme-parity.
+  lines.push(
+    sectionBar(
+      zh
+        ? `Fabric Knowledge · ${bodies.length} 常驻 · ${referenceEntries.length} 参考`
+        : `Fabric Knowledge · ${bodies.length} active · ${referenceEntries.length} reference`,
+    ),
+  );
 
-  // ALWAYS-ACTIVE RULES — index-only (title + summary), never the eager body.
+  // ALWAYS-ACTIVE — plain sub-section label (the `RULES (...)` qualifier is kept
+  // so the contract substring + framing survive the reskin). Index-only (title +
+  // summary), never the eager body.
   lines.push(
     zh
-      ? "ALWAYS-ACTIVE RULES (无条件适用 · 照此行遵循,正文按需取):"
-      : "ALWAYS-ACTIVE RULES (unconditional · act on the line; body on demand):",
+      ? "  ALWAYS-ACTIVE RULES (无条件适用 · 照此行遵循,正文按需取):"
+      : "  ALWAYS-ACTIVE RULES (unconditional · act on the line; body on demand):",
   );
   if (bodies.length === 0) {
     lines.push(zh ? "  (无 always-active 条目)" : "  (none)");
   } else {
     // KT-DEC-0036: render each always-active entry as a single index line
-    // (title + summary). The body is one cheap on-demand fetch away (see footer),
-    // so injecting it on every SessionStart is a permanent context tax
-    // (KT-GLD-0005) we no longer pay.
+    // (scope badge + title + summary). The body is one cheap on-demand fetch away
+    // (see footer), so injecting it on every SessionStart is a permanent context
+    // tax (KT-GLD-0005) we no longer pay.
     for (const b of bodies) {
+      const badge = scopeBadge(layerToScope(b));
       const label = `[${TYPE_SINGULAR[b.type] || b.type}] ${b.id}`;
-      const summary = typeof b.summary === "string" ? b.summary.trim() : "";
-      lines.push(summary.length > 0 ? `  ${label} · ${summary}` : `  ${label}`);
+      // ux-w1-3: bound the always-active summary by hint_summary_max_len, mirroring
+      // the REFERENCE must_read_if hook below — one long entry must not blow up the
+      // SessionStart sink.
+      const raw = typeof b.summary === "string" ? b.summary.trim() : "";
+      const summary = truncateSummary(raw, summaryMaxLen);
+      lines.push(
+        summary.length > 0 ? `  ${badge} ${label} · ${summary}` : `  ${badge} ${label}`,
+      );
       indexCount += 1;
     }
   }
 
-  // REFERENCE — broad decision/pitfall/process: title + must_read_if hook.
+  // REFERENCE — broad decision/pitfall/process: scope badge + title + must_read_if hook.
   if (referenceEntries.length > 0) {
     lines.push(
       zh
-        ? "REFERENCE (情境触发 · 命中 must_read_if 时 Read / fab_recall):"
-        : "REFERENCE (situational · Read when must_read_if fires / fab_recall):",
+        ? "  REFERENCE (情境触发 · 命中 must_read_if 时 Read / fab_recall):"
+        : "  REFERENCE (situational · Read when must_read_if fires / fab_recall):",
     );
     let folded = 0;
     for (const e of referenceEntries) {
@@ -975,6 +1024,7 @@ function renderAiSink(opts) {
         folded += 1;
         continue;
       }
+      const badge = scopeBadge(layerToScope(e));
       const type = TYPE_SINGULAR[toPluralType(e.type)] || e.type;
       const rawHook =
         typeof e.must_read_if === "string" && e.must_read_if.length > 0
@@ -983,7 +1033,11 @@ function renderAiSink(opts) {
             ? e.summary
             : "";
       const hookText = truncateSummary(rawHook, summaryMaxLen);
-      lines.push(hookText.length > 0 ? `  [${type}] ${e.id} — ${hookText}` : `  [${type}] ${e.id}`);
+      lines.push(
+        hookText.length > 0
+          ? `  ${badge} [${type}] ${e.id} — ${hookText}`
+          : `  ${badge} [${type}] ${e.id}`,
+      );
       indexCount += 1;
     }
     // D0028 backstop: fold the overflow tail into one marker + drift signal.
@@ -1022,7 +1076,7 @@ function renderAiSink(opts) {
 // Block 5 (Option X): build the two SessionStart sinks (human systemMessage +
 // AI additionalContext) from a plan-context-hint payload, WITHOUT emitting or
 // recording telemetry. This is the single shared renderer: main() calls it then
-// emits + logs; `fabric context` calls it then prints (byte-identical injection
+// emits + logs; `fabric inspect` calls it then prints (byte-identical injection
 // by construction — same code, same config/FS reads). Pure-ish: it reads config
 // + snapshot + .md summaries for `cwd` but has no stdout/ledger side effects.
 //
@@ -1124,8 +1178,8 @@ function buildSessionStartSinks(cwd, payload, env) {
   if (humanLines.length > 0) {
     humanLines.push(
       fabricLanguageForEmit === "zh-CN"
-        ? "  看具体注入: fabric context (--explain 看每条来源)"
-        : "  Inspect this injection: fabric context (--explain for per-entry provenance)",
+        ? "  看具体注入: fabric inspect (--explain 看每条来源)"
+        : "  Inspect this injection: fabric inspect (--explain for per-entry provenance)",
     );
   }
 
@@ -1190,7 +1244,7 @@ function main(env, stdio) {
     // per-line char cap + broad_index_backstop fold, not by dropping entries.
 
     // Block 5 (Option X): build both sinks via the shared renderer (same code
-    // `fabric context` uses → byte-identical injection). Side-effect-free; the
+    // `fabric inspect` uses → byte-identical injection). Side-effect-free; the
     // emit + telemetry below stay in main().
     const { human, ai, resolvedPayload, hasRenderedContent, reminderToContext } =
       buildSessionStartSinks(cwd, payload, env);
@@ -1273,7 +1327,7 @@ function main(env, stdio) {
           rendered_ids: renderedIds,
           delivery_status: "delivered",
         };
-        appendLockedLine(join(fabricDir, "events.jsonl"), JSON.stringify(surfaceEvent) + "\n");
+        appendEvent(fabricDir, surfaceEvent);
       }
     } catch {
       // best-effort telemetry — never block session start
@@ -1299,6 +1353,10 @@ module.exports = {
   renderFull,
   renderTruncated,
   renderSummary,
+  // W3-B F-005: the reskinned SessionStart AI sink + its layer→scope mapper,
+  // exported for the NO_COLOR snapshot test (hud-reskin.test.ts).
+  renderAiSink,
+  layerToScope,
   truncateSummary,
   // rc.8 underseed self-check helpers (exported for unit testing).
   countCanonicalNodes,

package/templates/hooks/knowledge-hint-narrow.cjs

@@ -19,7 +19,7 @@
  *         [<id>] (<type>/<maturity>) <summary-line>
  *         [<id>] (<type>/<maturity>) <summary-line>
  *         ...
- *       (如需重读 broad 决策，调 fab_plan_context 或 fabric plan-context-hint --all)
+ *       (如需重读 broad 决策，跑 fabric plan-context-hint --all)
  *
  *     When narrow.length === 0: complete silence (exit 0, no stderr).
  *
@@ -1215,7 +1215,7 @@ function readSummaryMaxLen(projectRoot) {
  *   [fabric] N narrow-scoped knowledge entries match your edit targets:
  *     [<id>] (<type>/<maturity>) <summary>
  *     ...
- *   (如需重读 broad 决策，调 fab_plan_context 或 fabric plan-context-hint --all)
+ *   (如需重读 broad 决策，跑 fabric plan-context-hint --all)
  */
 function renderSummary(payload, maxLen) {
   if (!payload || payload.version !== 2) {
@@ -1242,7 +1242,7 @@ function renderSummary(payload, maxLen) {
   for (const entry of entries) {
     lines.push(formatEntryLine(entry, maxLen));
   }
-  lines.push("  (如需重读 broad 决策，调 fab_plan_context 或 fabric plan-context-hint --all)");
+  lines.push("  (如需重读 broad 决策，跑 fabric plan-context-hint --all)");
   return lines;
 }
 

package/templates/hooks/knowledge-pretooluse.cjs

@@ -0,0 +1,111 @@
+#!/usr/bin/env node
+// ux-w2-6: the SINGLE PreToolUse hook. Previously the Edit|Write|MultiEdit
+// matcher carried TWO commands — knowledge-hint-narrow.cjs (narrow KB hint) and
+// cite-policy-evict.cjs (recall-before-edit nudge) — so a single edit produced
+// TWO additionalContext envelopes (双弹). This orchestrator runs both in ONE
+// process and merges their output into ONE envelope.
+//
+// narrow.cjs and cite-policy-evict.cjs stay as standalone modules (their full
+// contract test-suites are unchanged); this entry imports them as libs, reads
+// stdin ONCE (stdin is single-read), hands the parsed payload to each via the
+// `env.payload` test seam, captures each one's stdout, and folds the two
+// envelopes into a single `{ systemMessage?, hookSpecificOutput.additionalContext? }`.
+// Each sub-hook stays best-effort/silent-on-failure, so a throw in one never
+// blocks the edit or suppresses the other (KT-DEC-0007).
+
+const narrow = require("./knowledge-hint-narrow.cjs");
+const cite = require("./cite-policy-evict.cjs");
+
+function readStdinPayload() {
+  try {
+    const raw = require("node:fs").readFileSync(0, "utf8");
+    if (!raw || raw.trim().length === 0) return null;
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+
+// Parse a captured stdout chunk as a Claude Code hook envelope. Returns null for
+// empty / non-JSON output (e.g. a stderr-only codex breadcrumb leaves stdout
+// empty). Tolerant: a malformed line is ignored, never thrown.
+function parseEnvelope(text) {
+  const trimmed = typeof text === "string" ? text.trim() : "";
+  if (trimmed.length === 0) return null;
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return null;
+  }
+}
+
+// Fold narrow + cite envelopes into one. additionalContext (AI sink) is
+// concatenated (narrow hint first, then the cite nudge); systemMessage (human
+// sink) likewise. Either side may be absent.
+function mergeEnvelopes(narrowText, citeText) {
+  const a = parseEnvelope(narrowText);
+  const b = parseEnvelope(citeText);
+  if (a === null && b === null) return null;
+
+  const aiParts = [];
+  const humanParts = [];
+  let eventName = "PreToolUse";
+  for (const env of [a, b]) {
+    if (env === null) continue;
+    const hso = env.hookSpecificOutput;
+    if (hso && typeof hso.additionalContext === "string" && hso.additionalContext.length > 0) {
+      aiParts.push(hso.additionalContext);
+      if (typeof hso.hookEventName === "string") eventName = hso.hookEventName;
+    }
+    if (typeof env.systemMessage === "string" && env.systemMessage.length > 0) {
+      humanParts.push(env.systemMessage);
+    }
+  }
+
+  const merged = {};
+  if (humanParts.length > 0) merged.systemMessage = humanParts.join("\n");
+  if (aiParts.length > 0) {
+    merged.hookSpecificOutput = {
+      hookEventName: eventName,
+      additionalContext: aiParts.join("\n"),
+    };
+  }
+  return Object.keys(merged).length > 0 ? `${JSON.stringify(merged)}\n` : null;
+}
+
+async function main(env, stdio) {
+  try {
+    const out = (stdio && stdio.stdout) || process.stdout;
+    const err = (stdio && stdio.stderr) || process.stderr;
+    // Read stdin ONCE and share the parsed payload with both sub-hooks (stdin is
+    // a single-read stream — the prior two-command wiring read it twice).
+    const payload = env && env.payload !== undefined ? env.payload : readStdinPayload();
+    const sub = { ...(env || {}), payload };
+
+    const narrowChunks = [];
+    const citeChunks = [];
+    const capture = (sink) => ({ write: (c) => sink.push(String(c)) });
+
+    try {
+      await narrow.main(sub, { stdout: capture(narrowChunks), stderr: err });
+    } catch {
+      // narrow best-effort — never block the edit
+    }
+    try {
+      await cite.main(sub, { stdout: capture(citeChunks), stderr: err });
+    } catch {
+      // cite best-effort — never block the edit
+    }
+
+    const merged = mergeEnvelopes(narrowChunks.join(""), citeChunks.join(""));
+    if (merged !== null) out.write(merged);
+  } catch {
+    // Silent — the PreToolUse hook MUST NEVER block the edit on its own failure.
+  }
+}
+
+module.exports = { main, mergeEnvelopes, parseEnvelope };
+
+if (require.main === module) {
+  main();
+}

package/templates/hooks/lib/banner-i18n.cjs

@@ -37,7 +37,7 @@
  *   Broad hook:             broadImportBanner
  *
  * Protected tokens — NEVER translated, kept verbatim across all 4 variants:
- *   - Slash commands: /fabric-archive, /fabric-review, /fabric-import
+ *   - Slash commands: /fabric-archive, /fabric-review, /fabric-archive
  *   - CLI commands:   `fabric doctor --lint`
  *   - Numeric / template substrings the existing tests assert on:
  *       "${hoursElapsed.toFixed(1)}h" (e.g. "25.0h"), "阈值 ${N}h",
@@ -222,12 +222,13 @@ const STRINGS = {
       `📋 Fabric: 知识库节点数 ${p.nodeCount}/${p.threshold}，距 init_scan_completed ${p.hoursSinceInit}h。`,
   },
 
-  // Source (zh-CN): fabric-hint.cjs:698  `   是否调 /fabric-import 从 git 历史与现有文档回灌知识?`
-  // params: {} — protected token /fabric-import verbatim across all variants.
+  // W3-C: fabric-import folded into fabric-archive `source` mode — the underseed
+  // cold-start nudge now points at /fabric-archive (its source mode). Protected
+  // token /fabric-archive verbatim across all variants.
   importCta: {
-    "zh-CN": () => "   是否调 /fabric-import 从 git 历史与现有文档回灌知识?",
-    en: () => "   Run /fabric-import to backfill knowledge from git history and existing docs?",
-    "zh-CN-hybrid": () => "   是否调 /fabric-import 从 git 历史与现有文档回灌知识?",
+    "zh-CN": () => "   是否调 /fabric-archive 的 source mode 从 git 历史与现有文档回灌知识?",
+    en: () => "   Run /fabric-archive source mode to backfill knowledge from git history and existing docs?",
+    "zh-CN-hybrid": () => "   是否调 /fabric-archive 的 source mode 从 git 历史与现有文档回灌知识?",
   },
 
   // ---- Signal D: maintenance -----------------------------------------------
@@ -289,15 +290,15 @@ const STRINGS = {
 
   // ---- Broad hook: import recommendation ------------------------------------
   // Source (zh-CN): knowledge-hint-broad.cjs:262
-  //   "  📋 Fabric: 知识库稀疏，是否调 /fabric-import 从 git 历史与现有文档回灌知识?"
+  //   "  📋 Fabric: 知识库稀疏，是否调 /fabric-archive 从 git 历史与现有文档回灌知识?"
   // Note: leading two spaces are intentional (existing banner indent).
-  // params: {} — protected token /fabric-import verbatim.
+  // params: {} — protected token /fabric-archive verbatim.
   broadImportBanner: {
-    "zh-CN": () => "  📋 Fabric: 知识库稀疏，是否调 /fabric-import 从 git 历史与现有文档回灌知识?",
+    "zh-CN": () => "  📋 Fabric: 知识库稀疏，是否调 /fabric-archive 从 git 历史与现有文档回灌知识?",
     en: () =>
-      "  📋 Fabric: knowledge base is sparse — run /fabric-import to backfill from git history and existing docs?",
+      "  📋 Fabric: knowledge base is sparse — run /fabric-archive to backfill from git history and existing docs?",
     "zh-CN-hybrid": () =>
-      "  📋 Fabric: 知识库稀疏，是否调 /fabric-import 从 git 历史与现有文档回灌知识?",
+      "  📋 Fabric: 知识库稀疏，是否调 /fabric-archive 从 git 历史与现有文档回灌知识?",
   },
 
   // ---- Broad hook: meta auto-refresh breadcrumb (rc.22 Scope D T-D4) -------

package/templates/hooks/lib/bindings-snapshot-reader.cjs

@@ -153,7 +153,7 @@ function liveKnowledgeStats(snapshot) {
   // out-of-band (store grew via git pull / cross-workspace sync), so trusting it
   // re-introduced exactly the false-nudge this whole field cures — observed a
   // store with 61 live canonical entries whose cached count was frozen at 1,
-  // mis-firing the "knowledge sparse → /fabric-import" underseed nudge AND
+  // mis-firing the "knowledge sparse → /fabric-archive" underseed nudge AND
   // defeating the fabric-import `canonical > 50 → SKIP` guard. read_set carries
   // no resolved store root either (alias/uuid only), so a live recount is
   // impossible without re-resolution (which hooks must not do). Return null