@warpgogol/forge 5.3.3 → 6.0.0

package/os/compass/handlers/tests/summary-record.test.ts

@@ -2,16 +2,19 @@ import { describe, it, expect, beforeEach, afterEach } from "vitest";
 import { mkdtemp, mkdir, writeFile, readFile, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { execFileSync } from "node:child_process";
 import {
   runCompassSummaryRecord,
   parseChangeSummary,
   mergeHistoryIds,
   buildChangeSummaryBlock,
   stripConventionalPrefix,
+  stripGitTrailers,
   isValidGovernanceId,
   CHANGE_SUMMARY_WINDOW,
 } from "../summary-record.ts";
 import { resolveCompassPolicy } from "../../policy.ts";
+import { policyWithIdPattern, cleanupForgeYamlFixtures } from "./forge-yaml-fixture.ts";
 import type { ForgeRuntimeContext } from "../../../../src/types.ts";
 
 // Generic policy — this path has no forge.yaml, so resolution falls back to
@@ -159,6 +162,51 @@ describe("compass.summary.record", () => {
     expect(missing.exitCode).toBe(1);
   });
 
+  it("skips auto-inject when the worktree diff already adds a same-ID item (id-in-diff)", async () => {
+    execFileSync("git", ["init"], { cwd: root });
+    execFileSync("git", ["config", "user.email", "t@t"], { cwd: root });
+    execFileSync("git", ["config", "user.name", "T"], { cwd: root });
+    await writeFile(join(root, "src", "a.ts"), TS_HEADER(["RFC-0001: existing item."]));
+    execFileSync("git", ["add", "-A"], { cwd: root });
+    execFileSync("git", ["commit", "-m", "baseline"], { cwd: root });
+    // The pending change carries a hand-authored descriptive item for the ID.
+    await writeFile(
+      join(root, "src", "a.ts"),
+      TS_HEADER(["RFC-0001: existing item.", "RFC-1095: descriptive hand-written entry"]),
+    );
+
+    const result = await runCompassSummaryRecord(
+      makeInput({ id: "RFC-1095", files: ["src/a.ts"], text: "generic subject line" }),
+      makeContext(root),
+    );
+
+    expect(result.data?.skipped).toEqual([{ file: "src/a.ts", reason: "id-in-diff" }]);
+    expect(result.data?.recorded).toEqual([]);
+    const source = await readFile(join(root, "src", "a.ts"), "utf8");
+    expect(source).not.toContain("generic subject line");
+  });
+
+  it("still records when the same-ID item already exists at HEAD (consecutive-commit stack)", async () => {
+    execFileSync("git", ["init"], { cwd: root });
+    execFileSync("git", ["config", "user.email", "t@t"], { cwd: root });
+    execFileSync("git", ["config", "user.name", "T"], { cwd: root });
+    await writeFile(
+      join(root, "src", "a.ts"),
+      TS_HEADER(["RFC-1095: step 1 — recorded by the previous commit"]),
+    );
+    execFileSync("git", ["add", "-A"], { cwd: root });
+    execFileSync("git", ["commit", "-m", "baseline"], { cwd: root });
+
+    const result = await runCompassSummaryRecord(
+      makeInput({ id: "RFC-1095", files: ["src/a.ts"], text: "step 2" }),
+      makeContext(root),
+    );
+
+    expect(result.data?.recorded).toEqual(["src/a.ts"]);
+    const source = await readFile(join(root, "src", "a.ts"), "utf8");
+    expect(source).toContain("<item>RFC-1095: step 2</item>");
+  });
+
   it("defaults item text to the bare ID when --text is absent", async () => {
     await writeFile(join(root, "src", "a.ts"), TS_HEADER([]));
     await runCompassSummaryRecord(
@@ -190,6 +238,65 @@ describe("compass.summary.record", () => {
     expect(source).toContain("<item>RFC-1095: record command</item>");
     expect(source).not.toContain("RFC-1095: RFC-1095");
   });
+
+  it("strips Generated-with/Co-Authored-By trailer blocks from the recorded item (RFC-1233 AC-1)", async () => {
+    await writeFile(join(root, "src", "a.ts"), TS_HEADER([]));
+    await runCompassSummaryRecord(
+      makeInput({
+        id: "RFC-1233",
+        files: ["src/a.ts"],
+        text: "trailer stripping\n\nGenerated with [Devin](https://devin.ai)\nCo-Authored-By: Devin <bot@users.noreply.github.com>",
+      }),
+      makeContext(root),
+    );
+    const source = await readFile(join(root, "src", "a.ts"), "utf8");
+    expect(source).toContain("<item>RFC-1233: trailer stripping</item>");
+    expect(source).not.toContain("Co-Authored-By");
+    expect(source).not.toContain("Generated with");
+    expect(source).not.toContain("devin.ai");
+  });
+
+  it("neutralizes a literal star-slash in --text so the item cannot terminate the block comment (RFC-1233 AC-2)", async () => {
+    await writeFile(join(root, "src", "a.ts"), TS_HEADER([]));
+    await runCompassSummaryRecord(
+      makeInput({
+        id: "RFC-1233",
+        files: ["src/a.ts"],
+        text: "glob src" + "/**/*.ts in comments",
+      }),
+      makeContext(root),
+    );
+    const source = await readFile(join(root, "src", "a.ts"), "utf8");
+    expect(source).toContain("RFC-1233: glob src");
+    expect(source.match(CS_BLOCK_RE)).not.toBeNull();
+    // The neutralized form keeps both characters readable but cannot close /*.
+    expect(source).toContain("glob src/**" + "∕*.ts in comments");
+  });
+
+  it("keeps a single-line subject identical — negative regression (RFC-1233 AC-3)", async () => {
+    await writeFile(join(root, "src", "a.ts"), TS_HEADER([]));
+    await runCompassSummaryRecord(
+      makeInput({ id: "RFC-1233", files: ["src/a.ts"], text: "plain subject line" }),
+      makeContext(root),
+    );
+    const source = await readFile(join(root, "src", "a.ts"), "utf8");
+    expect(source).toContain("<item>RFC-1233: plain subject line</item>");
+  });
+
+  it("preserves a Key: value-shaped line when it is not in the trailing block (RFC-1233 AC-4)", async () => {
+    await writeFile(join(root, "src", "a.ts"), TS_HEADER([]));
+    await runCompassSummaryRecord(
+      makeInput({
+        id: "RFC-1233",
+        files: ["src/a.ts"],
+        text: "fix the parser\n\nNote: this line is prose about the fix\nfinal summary line",
+      }),
+      makeContext(root),
+    );
+    const source = await readFile(join(root, "src", "a.ts"), "utf8");
+    expect(source).toContain("Note: this line is prose about the fix");
+    expect(source).toContain("final summary line");
+  });
 });
 
 describe("summary-record helpers", () => {
@@ -216,9 +323,54 @@ describe("summary-record helpers", () => {
     ]);
   });
 
+  afterEach(() => {
+    cleanupForgeYamlFixtures();
+  });
+
+  it("mergeHistoryIds sorts mission-format tokens under their namespace (RFC-1220)", () => {
+    const missionPolicy = policyWithIdPattern(
+      "\\b(?:[A-Z][A-Z0-9]*-)+\\d+\\b|\\b[a-z][a-z0-9-]*-m\\d{6}\\b",
+    );
+    expect(mergeHistoryIds(["acme-m000003"], ["acme-m000001", "RFC-0002"], missionPolicy)).toEqual([
+      "acme-m000001",
+      "acme-m000003",
+      "RFC-0002",
+    ]);
+  });
+
+  it("mergeHistoryIds appends unparseable admitted tokens last (RFC-1220)", () => {
+    const driftPolicy = policyWithIdPattern("\\b(?:[A-Z][A-Z0-9]*-)+\\d+\\b|\\b[A-Z]+-[A-Z]+\\b");
+    expect(mergeHistoryIds(["FOO-BAR"], ["RFC-0002", "RFC-0001"], driftPolicy)).toEqual([
+      "RFC-0001",
+      "RFC-0002",
+      "FOO-BAR",
+    ]);
+  });
+
   it("buildChangeSummaryBlock omits <history> when empty", () => {
     const block = buildChangeSummaryBlock(["RFC-1: a"], [], "x.ts");
     expect(block).not.toContain("<history>");
     expect(block).toContain("<item>RFC-1: a</item>");
   });
+
+  it("stripGitTrailers strips a Token:-shaped tail block (RFC-1233)", () => {
+    expect(
+      stripGitTrailers("subject\n\nbody line\nCo-Authored-By: Devin <bot@x>\nX-RFC: RFC-1233"),
+    ).toBe("subject\n\nbody line");
+  });
+
+  it("stripGitTrailers keeps a lone markdown-link tail (no strict trailer line)", () => {
+    const msg = "subject\n\nsee [the docs](https://example.com)";
+    expect(stripGitTrailers(msg)).toBe(msg);
+  });
+
+  it("stripGitTrailers on a trailer-only message returns empty", () => {
+    expect(stripGitTrailers("Co-Authored-By: Devin <bot@x>")).toBe("");
+  });
+
+  it("stripGitTrailers strips empty-value trailers (Token:) — interpret-trailers allows them", () => {
+    expect(stripGitTrailers("subject\n\nReviewed-by:\nSigned-off-by: Devin <bot@x>")).toBe(
+      "subject",
+    );
+  });
 });

package/os/compass/policy.ts

@@ -12,6 +12,7 @@ are authored, how risky they are, and what counts as a governance ID
 </MODULE_CONTRACT>
 <CHANGE_SUMMARY>
   <item>RFC-1096: initial policy resolver — generic defaults + profile compass section + bindings.compass overrides.</item>
+  <item>RFC-1220: step 1 — widen governance-ID tail regex</item>
 </CHANGE_SUMMARY>
 */
 
@@ -212,9 +213,14 @@ function compilePattern(key: string, pattern: string, flags?: string): RegExp {
   }
 }
 
-/** Split a `NAMESPACE-NUMBER` governance ID on its last dash. */
+/**
+ * Split a `NAMESPACE-NUMBER` governance ID on its last dash.
+ * Mission-format tails (`slug-mNNNNNN`) parse as `{ namespace: slug, numeric: N }`.
+ * The `m` stays outside the digit capture — `-(m?\d+)$` would capture `m000175`
+ * into the numeric group and produce `NaN` (RFC-1220).
+ */
 export function parseGovernanceIdParts(id: string): { namespace: string; numeric: number } | null {
-  const match = id.match(/^(.*)-(\d+)$/);
+  const match = id.match(/^(.*)-m?(\d+)$/);
   if (!match) return null;
   return { namespace: match[1]!, numeric: Number(match[2]) };
 }