@forwardimpact/libwiki 0.2.25 → 0.2.26

package/LICENSE

@@ -1,201 +1,21 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to the Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2026 Dick Olsson
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+MIT License
+
+Copyright (c) 2019 Zachary Rice
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -27,8 +27,10 @@ npx fit-wiki audit
 ## CLI
 
 Every command accepts `--wiki-root` (default `wiki/`) and `--today` (default
-today, ISO date). Agent commands take `--agent <name>` or read
-`LIBEVAL_AGENT_PROFILE` from the environment.
+today, ISO date). Agent-scoped commands require an explicit `--agent <name>`
+(`--from` for `memo`) and fail closed without it — there is no environment
+fallback. The only exception is `release --expired`, a cross-agent cleanup
+sweep that runs without `--agent`.
 
 ### `boot` — start a session
 
@@ -55,7 +57,7 @@ line budget would be exceeded.
 ```sh
 npx fit-wiki claim   --agent X --target spec-NNNN --branch claude/spec-NNNN
 npx fit-wiki release --agent X --target spec-NNNN
-npx fit-wiki release --agent X --expired
+npx fit-wiki release --expired
 ```
 
 Maintains the `## Active Claims` table in `MEMORY.md`. Duplicates refused;

package/bin/fit-wiki.js

@@ -21,7 +21,7 @@ const NEEDS_WIKI_SYNC = new Set(["claim", "release", "push", "pull", "init"]);
 
 async function main() {
   const runtime = createDefaultRuntime();
-  const definition = createDefinition(runtime.proc.env);
+  const definition = createDefinition();
   const cli = createCli(definition, {
     runtime,
     packageJsonUrl: new URL("../package.json", import.meta.url),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forwardimpact/libwiki",
-  "version": "0.2.25",
+  "version": "0.2.26",
   "description": "Wiki lifecycle primitives — stable memory for agent teams so coordination persists across sessions.",
   "keywords": [
     "wiki",

package/src/audit/admission.js

@@ -0,0 +1,53 @@
+import path from "node:path";
+
+// Tracked-file enumerator for the admission scope. Yields the
+// admission universe: the wiki-relative paths the filename grammar governs.
+//
+// The universe is the on-disk file tree under `wikiRoot`, intersected with the
+// git index when git state is present. Where there is no git state — a fresh
+// bootstrap or a test fixture — the universe is the whole walk. This keeps the
+// rule's true positive (a *git-tracked* residue) in scope while excluding VCS
+// internals and uncommitted scratch where a real repo exists.
+
+/** Recursively collect file paths (wiki-relative, POSIX) under `dir`. */
+function walk(absDir, wikiRoot, fs, out) {
+  for (const name of fs.readdirSync(absDir)) {
+    // The wiki's own VCS internals are never part of the grammar's universe.
+    if (absDir === wikiRoot && name === ".git") continue;
+    const abs = path.join(absDir, name);
+    if (fs.statSync(abs).isDirectory()) {
+      walk(abs, wikiRoot, fs, out);
+    } else {
+      out.push(path.relative(wikiRoot, abs).split(path.sep).join("/"));
+    }
+  }
+}
+
+/**
+ * Read the git index at `wikiRoot` as a set of wiki-relative paths, or `null`
+ * when there is no git state (no `.git`, or the path is not a work tree — both
+ * surface as a non-zero `git ls-files` exit). `-z` is used so paths with
+ * unusual characters round-trip; output is NUL-delimited and relative to the
+ * repository root, which is `wikiRoot`.
+ */
+function trackedSet(wikiRoot, subprocess) {
+  const res = subprocess.runSync("git", ["ls-files", "-z"], { cwd: wikiRoot });
+  if (res.exitCode !== 0) return null;
+  return new Set(res.stdout.split("\0").filter((p) => p !== ""));
+}
+
+/**
+ * Enumerate the admission universe under `wikiRoot`.
+ * @param {{wikiRoot: string, fs: object, subprocess: object}} options
+ *   `fs` is the sync filesystem surface (`runtime.fsSync`); `subprocess` is
+ *   `runtime.subprocess` (its `runSync` shells out to git).
+ * @returns {string[]} Wiki-relative POSIX paths, tracked-filtered when git state exists.
+ */
+export function listAdmissionPaths({ wikiRoot, fs, subprocess }) {
+  if (!fs.existsSync(wikiRoot)) return [];
+  const walked = [];
+  walk(wikiRoot, wikiRoot, fs, walked);
+  const tracked = trackedSet(wikiRoot, subprocess);
+  if (tracked === null) return walked;
+  return walked.filter((p) => tracked.has(p));
+}

package/src/audit/conflict-markers-rule.js

@@ -0,0 +1,24 @@
+import { scanConflictMarkers } from "../conflict-markers.js";
+
+// Fail-severity audit rule that flags unresolved git conflict markers in any
+// audited wiki surface. Resolved by the `conflict-scan` scope (scopes.js),
+// which yields one `{ path, text, fenceExempt }` subject per file. The rule is
+// deliberately distinct from the budget rules: a marker block can fit inside
+// the word/line budget, and when it does trip the budget the budget hint
+// ("trim history") is actively wrong for this defect. A co-occurring size
+// breach therefore reports BOTH findings, never misattributing structure as
+// size. The hint directs the writer to adjudicate the merged form, never to
+// trim.
+export const CONFLICT_MARKER_RULE = {
+  id: "conflict.markers",
+  scope: "conflict-scan",
+  severity: "fail",
+  check: (s) => {
+    const hits = scanConflictMarkers(s.text, { fenceExempt: s.fenceExempt });
+    return hits.length === 0
+      ? null
+      : hits.map((h) => ({ lineNo: h.lineNo, kind: h.kind }));
+  },
+  message: (_s, r) => `unresolved git conflict marker (${r.kind})`,
+  hint: "adjudicate the merged form: reconcile the two variants into the intended content, then delete the markers — this is corruption, not a size breach, so do not shorten history to clear it",
+};

package/src/audit/grammar.js

@@ -0,0 +1,97 @@
+import path from "node:path";
+import { WEEKLY_LOG_NAME_RE, WEEKLY_LOG_PART_NAME_RE } from "../constants.js";
+
+// The wiki filename admission grammar. A pure classifier: given a
+// wiki-relative path, decide whether the filename grammar admits it. The
+// normative prose lives in memory-protocol.md's "Wiki Filename Grammar"
+// section; this module is its enforcement — one home per policy, so the two
+// cannot drift. The audit's `admission` scope is the only consumer.
+
+const NAMED_LEDGERS = new Set(["Home.md", "MEMORY.md", "STATUS.md"]);
+const STORYBOARD_RE = /^storyboard-\d{4}-M\d{2}\.md$/;
+const DATED_DELIVERABLE_RE = /^(.+)-\d{4}-\d{2}-\d{2}\.md$/;
+
+// Calendar tokens, anchored at hyphen-segment boundaries so a token must occupy
+// whole `-`-delimited segments: `8080` *inside* a longer segment
+// (`release8080-notes`) is not a token, but a standalone `8080` segment is a
+// bare year. Anchoring with `(?:^|-)…(?=-|$)` is load-bearing — a per-segment
+// split would silently miss the multi-segment week/month/date tokens.
+const CALENDAR_TOKEN_RES = [
+  /(?:^|-)\d{4}-W\d{2}(?=-|$)/, // week  YYYY-Www
+  /(?:^|-)\d{4}-M\d{2}(?=-|$)/, // month YYYY-MNN
+  /(?:^|-)\d{4}-\d{2}-\d{2}(?=-|$)/, // date  YYYY-MM-DD
+  /(?:^|-)\d{4}(?=-|$)/, // bare year YYYY
+];
+
+/**
+ * True when `stem` (a basename without its `.md` extension, or a captured
+ * `<topic>`) contains any calendar token on a hyphen-segment boundary.
+ * @param {string} stem
+ * @returns {boolean}
+ */
+export function hasCalendarToken(stem) {
+  return CALENDAR_TOKEN_RES.some((re) => re.test(stem));
+}
+
+/** A root-level `.md` file whose stem carries no calendar token: the summary class. */
+function isSummaryName(base) {
+  if (!base.endsWith(".md")) return false;
+  return !hasCalendarToken(base.slice(0, -".md".length));
+}
+
+/**
+ * The summary-class stem of a root-level basename, or `null`. Named ledgers
+ * (`MEMORY.md` etc.) are not summaries. Used to derive the `rootSummaryAgents`
+ * set that gates `<agent>/` sidecar directory admission.
+ * @param {string} base - A root-level basename.
+ * @returns {string|null}
+ */
+export function rootSummaryStem(base) {
+  if (NAMED_LEDGERS.has(base)) return null;
+  return isSummaryName(base) ? base.slice(0, -".md".length) : null;
+}
+
+/** Classify a root-level file (no `/` in its relative path) by basename. */
+function classifyRootFile(base) {
+  if (NAMED_LEDGERS.has(base)) return "admitted";
+  if (WEEKLY_LOG_NAME_RE.test(base) || WEEKLY_LOG_PART_NAME_RE.test(base)) {
+    return "admitted";
+  }
+  if (STORYBOARD_RE.test(base)) return "admitted";
+  const dated = base.match(DATED_DELIVERABLE_RE);
+  // A dated deliverable's `<topic>` must itself be token-free, so a trailing
+  // date cannot smuggle a token-bearing stem (`…-history-YYYY-MM-DD.md`) in.
+  if (dated && !hasCalendarToken(dated[1])) return "admitted";
+  if (isSummaryName(base)) return "admitted";
+  // Anything else at the root — non-`.md`, or a token-bearing name matching no
+  // exact dated shape — is rejected.
+  return "rejected";
+}
+
+/**
+ * Classify one wiki-relative path against the filename admission grammar.
+ *
+ * Root files (no `/`) are classified by their basename. A nested path is
+ * admitted iff its first segment is an admitted root-level directory —
+ * `metrics` or an `<agent>` that has a root summary-class file — and then every
+ * file beneath it is admitted by membership (innards unpoliced). Directory
+ * evaluation is at the wiki root level only.
+ *
+ * @param {string} relPath - Path relative to the wiki root (POSIX separators).
+ * @param {{rootSummaryAgents: Set<string>|string[]}} options
+ * @returns {"admitted"|"rejected"}
+ */
+export function classifyPath(relPath, { rootSummaryAgents } = {}) {
+  const normalized = relPath.split(path.sep).join("/");
+  const slash = normalized.indexOf("/");
+  if (slash === -1) return classifyRootFile(normalized);
+  const firstSegment = normalized.slice(0, slash);
+  const agents =
+    rootSummaryAgents instanceof Set
+      ? rootSummaryAgents
+      : new Set(rootSummaryAgents ?? []);
+  if (firstSegment === "metrics" || agents.has(firstSegment)) {
+    return "admitted";
+  }
+  return "rejected";
+}

package/src/audit/rules.js

@@ -13,6 +13,7 @@ import {
   SUMMARY_LINE_BUDGET,
   SUMMARY_WORD_BUDGET,
   WEEKLY_LOG_LINE_BUDGET,
+  WEEKLY_LOG_SEAM_RE,
   WEEKLY_LOG_WORD_BUDGET,
   XMR_CLOSE_RE,
   XMR_OPEN_RE,
@@ -22,6 +23,7 @@ import {
   SUMMARY_H1_RE,
   WEEKLY_LOG_H1_RE,
 } from "./scopes.js";
+import { CONFLICT_MARKER_RULE } from "./conflict-markers-rule.js";
 import { STATUS_ROW_RULES } from "./status-row.js";
 
 const PRIORITY_INDEX_HEADING_RE = new RegExp(
@@ -105,6 +107,22 @@ const decisionWithin5 =
     return offenders.length === 0 ? null : offenders;
   };
 
+// Flag entry-shaped `## ` headings that the rotation seam-finder would skip —
+// the grammar-drift that degrades a whole file to one unsplittable prologue and
+// is otherwise silent (the decision-block rule matches only dated headings).
+// Uses the same WEEKLY_LOG_SEAM_RE the seam-finder uses, so the flagged set is
+// exactly the complement of the rotatable set.
+const headingGrammarDrift = (s) => {
+  const offenders = [];
+  for (let i = 0; i < s.fileLines.length; i++) {
+    const line = s.fileLines[i];
+    if (/^## /.test(line) && !WEEKLY_LOG_SEAM_RE.test(line)) {
+      offenders.push({ lineNo: i + 1, observed: line.trim() });
+    }
+  }
+  return offenders.length === 0 ? null : offenders;
+};
+
 function scanMarkers(fileLines, openRe, closeRe, label) {
   const openings = [];
   const findings = [];
@@ -170,6 +188,25 @@ const AGENT_H3_REQUIREMENTS = STORYBOARD_DOMAIN_AGENTS.map((agent) => ({
   pattern: new RegExp(`^### ${agent}(\\s|$|—|-)`),
 }));
 
+// -- Metrics CSV duplicate rows --
+
+// Report every data line byte-identical to an earlier data line in the same
+// CSV. Line 1 is the header (positionally) and blank lines are skipped; the
+// header is never a duplicate subject. Keying on exact line equality gives the
+// spec's exit path for free: any column edit (run id or note) on one row makes
+// the pair non-identical and stops the finding firing.
+const duplicateCsvRows = (s) => {
+  const seen = new Set();
+  const findings = [];
+  s.rows.forEach((text, i) => {
+    const lineNo = i + 1;
+    if (lineNo === 1 || text.trim() === "") return;
+    if (seen.has(text)) findings.push({ lineNo });
+    else seen.add(text);
+  });
+  return findings.length === 0 ? null : findings;
+};
+
 const memoryExists = (s) => s.exists;
 const memoryHasPriorityHeader = (s) =>
   s.exists && PRIORITY_HEADER_RE.test(s.text);
@@ -257,7 +294,8 @@ export const RULES = [
     remediation: "rotate",
     check: lineBudget(WEEKLY_LOG_LINE_BUDGET),
     message: (_s, r) => `${r.value} lines (limit ${WEEKLY_LOG_LINE_BUDGET})`,
-    hint: "run `bunx fit-wiki rotate --agent <agent>` (agent = this filename's prefix) to seal this file as a sealed part and start a fresh weekly log",
+    hint: (s) =>
+      `run \`bunx fit-wiki rotate --agent ${s.agentPrefix}\` to seal this file as a sealed part and start a fresh weekly log`,
   },
   {
     id: "weekly-log.word-budget",
@@ -266,7 +304,8 @@ export const RULES = [
     remediation: "rotate",
     check: wordBudget(WEEKLY_LOG_WORD_BUDGET),
     message: (_s, r) => `${r.value} words (limit ${WEEKLY_LOG_WORD_BUDGET})`,
-    hint: "run `bunx fit-wiki rotate --agent <agent>` (agent = this filename's prefix) to seal this file as a sealed part and start a fresh weekly log",
+    hint: (s) =>
+      `run \`bunx fit-wiki rotate --agent ${s.agentPrefix}\` to seal this file as a sealed part and start a fresh weekly log`,
   },
   {
     id: "weekly-log.h1-agent-matches-filename",
@@ -277,6 +316,15 @@ export const RULES = [
       `H1 title slug '${r.titleSlug}' does not match filename prefix '${s.agentPrefix}'`,
     hint: "rename either the H1 or the file so they agree",
   },
+  {
+    id: "weekly-log.heading-grammar",
+    scope: "weekly-log-main",
+    severity: "fail",
+    check: headingGrammarDrift,
+    message: (_s, r) =>
+      `Entry heading '${r.observed}' does not match the dated grammar`,
+    hint: "weekly-log entry headings must be '## YYYY-MM-DD'; open entries with `fit-wiki log decision/note`, which emit a conforming heading the rotation seam-finder can split",
+  },
   {
     id: "decision-block.heading-within-5",
     scope: "weekly-log-main",
@@ -290,7 +338,7 @@ export const RULES = [
       r.nearMiss
         ? `Entry opens with '${r.nearMiss}'; the heading must be exactly '${DECISION_HEADING}' — move the suffix into the body`
         : `Entry lacks a line that is exactly '${DECISION_HEADING}'`,
-    hint: `open each '## YYYY-MM-DD' entry with a line containing exactly '${DECISION_HEADING}' (no suffix — the check is an exact match); put the one-line summary in the body below it, drawn from the entry's own narrative — do not invent rationale the entry does not support`,
+    hint: `open each '## YYYY-MM-DD' entry with \`fit-wiki log decision\`, which emits a line containing exactly '${DECISION_HEADING}' (no suffix — the check is an exact match); put the one-line summary in the body below it, drawn from the entry's own narrative — do not invent rationale the entry does not support`,
   },
 
   // -- Weekly logs (sealed parts) --
@@ -303,6 +351,15 @@ export const RULES = [
     message: () => "Missing valid H1 heading",
     hint: "set the H1 to '# <agent> — YYYY-Www (part N of M)'",
   },
+  {
+    id: "weekly-log-part.heading-grammar",
+    scope: "weekly-log-part",
+    severity: "fail",
+    check: headingGrammarDrift,
+    message: (_s, r) =>
+      `Entry heading '${r.observed}' does not match the dated grammar`,
+    hint: "weekly-log entry headings must be '## YYYY-MM-DD'; open entries with `fit-wiki log decision/note`, which emit a conforming heading the rotation seam-finder can split",
+  },
   {
     id: "weekly-log-part.line-budget",
     scope: "weekly-log-part",
@@ -310,7 +367,7 @@ export const RULES = [
     remediation: "rotate",
     check: lineBudget(WEEKLY_LOG_LINE_BUDGET),
     message: (_s, r) => `${r.value} lines (limit ${WEEKLY_LOG_LINE_BUDGET})`,
-    hint: "`bunx fit-wiki fix` re-bisects an over-budget part with day-section seams; an irreducible single-day section that alone exceeds the budget must be split at a finer seam by hand",
+    hint: "`bunx fit-wiki fix` re-bisects an over-budget part at its day-section seams and, for a lone over-cap day, at its '### ' block seams; only a single '### ' block that alone exceeds the budget remains for a human to shorten",
   },
   {
     id: "weekly-log-part.word-budget",
@@ -319,7 +376,7 @@ export const RULES = [
     remediation: "rotate",
     check: wordBudget(WEEKLY_LOG_WORD_BUDGET),
     message: (_s, r) => `${r.value} words (limit ${WEEKLY_LOG_WORD_BUDGET})`,
-    hint: "`bunx fit-wiki fix` re-bisects an over-budget part with day-section seams; an irreducible single-day section that alone exceeds the budget must be split at a finer seam by hand",
+    hint: "`bunx fit-wiki fix` re-bisects an over-budget part at its day-section seams and, for a lone over-cap day, at its '### ' block seams; only a single '### ' block that alone exceeds the budget remains for a human to shorten",
   },
   {
     id: "weekly-log-part.h1-agent-matches-filename",
@@ -488,7 +545,41 @@ export const RULES = [
     hint: "every '<!-- obstacles:* -->' or '<!-- experiments:* -->' needs a matching close marker",
   },
 
+  // -- Metrics CSVs (union merge keeps both sides on concurrent appends;
+  // exact-duplicate rows are surfaced here, never silently removed) --
+
+  {
+    id: "metrics-csv.duplicate-row",
+    scope: "metrics-csv",
+    severity: "fail",
+    check: duplicateCsvRows,
+    message: (_s, r) =>
+      `Duplicate metrics row at line ${r.lineNo} (exact match of an earlier row)`,
+    hint: "remove the surplus row, or differentiate a genuinely-distinct measurement by editing its run id or note so the rows are no longer identical",
+  },
+
   // -- STATUS.md rows (per-migration-unit sub-row schema) --
 
   ...STATUS_ROW_RULES,
+
+  // -- Conflict markers (structural; all audited surfaces) --
+
+  CONFLICT_MARKER_RULE,
+
+  // -- Filename admission --
+
+  // The `admission` resolver yields one subject per git-tracked path the
+  // filename grammar rejects, so the check always fires. Flag-for-human: a
+  // wrong automated move or delete destroys memory, so `fix` routes this to the
+  // human report (any non-`agent` remediation class does) and never touches the
+  // file.
+  {
+    id: "admission.not-in-grammar",
+    scope: "admission",
+    severity: "fail",
+    remediation: "flag",
+    check: () => ({}),
+    message: (s) => `${s.relPath} matches no wiki filename grammar class`,
+    hint: "rename to an admitted class, or extend the Wiki Filename Grammar section in memory-protocol.md and audit/grammar.js together (the single admission path)",
+  },
 ];