@agentvibes/guardrails 0.2.3 → 0.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +11 -0
- package/dist/gitDiff.d.ts +17 -1
- package/dist/gitDiff.js +53 -9
- package/dist/gitDiff.js.map +1 -1
- package/dist/renameDiffTest.d.ts +1 -0
- package/dist/renameDiffTest.js +140 -0
- package/dist/renameDiffTest.js.map +1 -0
- package/dist/verifyDiff.js +7 -8
- package/dist/verifyDiff.js.map +1 -1
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -16,6 +16,17 @@ Tools (ast-grep, biome) are not npm dependencies: the CLI resolves them from
|
|
|
16
16
|
PATH, falls back to `mise x <tool>@<pin>` using the pins in this package's
|
|
17
17
|
`mise.toml`, and prints a one-line install hint when neither works.
|
|
18
18
|
|
|
19
|
+
**Biome must be 2.5 or newer.** The preset writes
|
|
20
|
+
`linter.rules.preset: "recommended"`, a key biome 2.4 does not know, so an older
|
|
21
|
+
biome refuses the whole config rather than degrading — it lints nothing and says
|
|
22
|
+
`Found an unknown key 'preset'`. Biome v1 refuses it harder still, on
|
|
23
|
+
`includes`, `root` and `assist` as well. Measured across the fleet on
|
|
24
|
+
2026-09-07: of 18 repos with a readable biome, twelve were on 1.9.4.
|
|
25
|
+
|
|
26
|
+
Adopting the preset, and what a repo may keep in its own `biome.json`, is
|
|
27
|
+
[Presets](#presets) below — including `[biome] preset = "enforced"`, which is
|
|
28
|
+
what makes drift fail a build rather than only be reported.
|
|
29
|
+
|
|
19
30
|
Installing straight from git (`github:AgentVibes/guardrails#<sha>`) works —
|
|
20
31
|
the `prepare` script builds `dist/` at install time — but pnpm blocks
|
|
21
32
|
lifecycle scripts of git-hosted deps by default, and the unblock knob moved
|
package/dist/gitDiff.d.ts
CHANGED
|
@@ -14,5 +14,21 @@ export declare function changedFiles(root: string, mergeBase: string): {
|
|
|
14
14
|
tracked: string[];
|
|
15
15
|
untracked: string[];
|
|
16
16
|
};
|
|
17
|
-
/**
|
|
17
|
+
/**
|
|
18
|
+
* 1-based line numbers ADDED in the working tree vs mergeBase, per file.
|
|
19
|
+
*
|
|
20
|
+
* ONE rename-aware diff (`-M`) for all .ts/.tsx paths is parsed, not one diff
|
|
21
|
+
* per file. Diffing a renamed file alone hands git only its new path, so it
|
|
22
|
+
* cannot pair the rename and reports every line as added; with both paths in
|
|
23
|
+
* the same diff a 100%-similarity rename produces no hunks at all and a
|
|
24
|
+
* rename-with-edits produces hunks only for the lines that actually changed.
|
|
25
|
+
*
|
|
26
|
+
* Keyed by ABSOLUTE path (like changedFiles). A file with no added lines — a
|
|
27
|
+
* pure rename, a deletion — is absent rather than mapped to an empty set.
|
|
28
|
+
*/
|
|
29
|
+
export declare function addedLinesByFile(root: string, mergeBase: string): Map<string, Set<number>>;
|
|
30
|
+
/**
|
|
31
|
+
* 1-based line numbers ADDED in the working tree vs mergeBase for one file.
|
|
32
|
+
* "No added lines" and "file absent from the diff" are both the empty set.
|
|
33
|
+
*/
|
|
18
34
|
export declare function addedLines(root: string, mergeBase: string, file: string): Set<number>;
|
package/dist/gitDiff.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { spawnSync } from "node:child_process";
|
|
2
2
|
import { isAbsolute, join } from "node:path";
|
|
3
|
+
function absPath(root, f) {
|
|
4
|
+
return isAbsolute(f) ? f : join(root, f);
|
|
5
|
+
}
|
|
3
6
|
function git(root, args) {
|
|
4
7
|
const res = spawnSync("git", root === undefined ? args : ["-C", root, ...args], {
|
|
5
8
|
encoding: "utf8",
|
|
@@ -59,32 +62,73 @@ export function resolveMergeBase(root, explicitBase) {
|
|
|
59
62
|
}
|
|
60
63
|
/** Changed (ACMR) tracked .ts/.tsx files vs the merge base, plus untracked ones. Absolute paths. */
|
|
61
64
|
export function changedFiles(root, mergeBase) {
|
|
62
|
-
const abs = (f) => (isAbsolute(f) ? f : join(root, f));
|
|
63
65
|
const tracked = (git(root, ["diff", "--name-only", "--diff-filter=ACMR", mergeBase, "--", "*.ts", "*.tsx"]) ?? "")
|
|
64
66
|
.split("\n")
|
|
65
67
|
.filter((f) => f !== "")
|
|
66
|
-
.map(
|
|
68
|
+
.map((f) => absPath(root, f));
|
|
67
69
|
const untracked = (git(root, ["ls-files", "--others", "--exclude-standard", "--", "*.ts", "*.tsx"]) ?? "")
|
|
68
70
|
.split("\n")
|
|
69
71
|
.filter((f) => f !== "")
|
|
70
|
-
.map(
|
|
72
|
+
.map((f) => absPath(root, f));
|
|
71
73
|
return { tracked, untracked };
|
|
72
74
|
}
|
|
73
|
-
/**
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
/**
|
|
76
|
+
* 1-based line numbers ADDED in the working tree vs mergeBase, per file.
|
|
77
|
+
*
|
|
78
|
+
* ONE rename-aware diff (`-M`) for all .ts/.tsx paths is parsed, not one diff
|
|
79
|
+
* per file. Diffing a renamed file alone hands git only its new path, so it
|
|
80
|
+
* cannot pair the rename and reports every line as added; with both paths in
|
|
81
|
+
* the same diff a 100%-similarity rename produces no hunks at all and a
|
|
82
|
+
* rename-with-edits produces hunks only for the lines that actually changed.
|
|
83
|
+
*
|
|
84
|
+
* Keyed by ABSOLUTE path (like changedFiles). A file with no added lines — a
|
|
85
|
+
* pure rename, a deletion — is absent rather than mapped to an empty set.
|
|
86
|
+
*/
|
|
87
|
+
export function addedLinesByFile(root, mergeBase) {
|
|
88
|
+
const out = git(root, ["diff", "-U0", "-M", mergeBase, "--", "*.ts", "*.tsx"]) ?? "";
|
|
89
|
+
const byFile = new Map();
|
|
90
|
+
let file;
|
|
91
|
+
// `+++ ` is a header only between `diff --git` and the file's first `@@`.
|
|
92
|
+
// Inside a hunk, an ADDED source line whose text starts with `++ ` is also
|
|
93
|
+
// printed as `+++ …`, and must not be read as a new file.
|
|
94
|
+
let inHeader = false;
|
|
77
95
|
for (const line of out.split("\n")) {
|
|
78
|
-
if (
|
|
96
|
+
if (line.startsWith("diff --git ")) {
|
|
97
|
+
file = undefined;
|
|
98
|
+
inHeader = true;
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
101
|
+
if (line.startsWith("@@"))
|
|
102
|
+
inHeader = false;
|
|
103
|
+
if (inHeader && line.startsWith("+++ ")) {
|
|
104
|
+
// git appends a tab when the path contains whitespace; a pure rename has
|
|
105
|
+
// no `+++` line at all, which is what leaves its target absent.
|
|
106
|
+
const p = line.slice(4).replace(/\t$/, "");
|
|
107
|
+
file = p === "/dev/null" ? undefined : absPath(root, p.replace(/^b\//, ""));
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
110
|
+
if (file === undefined || !line.startsWith("@@"))
|
|
79
111
|
continue;
|
|
80
112
|
const m = line.match(/\+(\d+)(?:,(\d+))?/);
|
|
81
113
|
if (m === null)
|
|
82
114
|
continue;
|
|
83
115
|
const start = Number(m[1]);
|
|
84
116
|
const len = m[2] === undefined ? 1 : Number(m[2]);
|
|
117
|
+
let lines = byFile.get(file);
|
|
118
|
+
if (lines === undefined) {
|
|
119
|
+
lines = new Set();
|
|
120
|
+
byFile.set(file, lines);
|
|
121
|
+
}
|
|
85
122
|
for (let i = 0; i < len; i++)
|
|
86
123
|
lines.add(start + i);
|
|
87
124
|
}
|
|
88
|
-
return
|
|
125
|
+
return byFile;
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* 1-based line numbers ADDED in the working tree vs mergeBase for one file.
|
|
129
|
+
* "No added lines" and "file absent from the diff" are both the empty set.
|
|
130
|
+
*/
|
|
131
|
+
export function addedLines(root, mergeBase, file) {
|
|
132
|
+
return addedLinesByFile(root, mergeBase).get(absPath(root, file)) ?? new Set();
|
|
89
133
|
}
|
|
90
134
|
//# sourceMappingURL=gitDiff.js.map
|
package/dist/gitDiff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitDiff.js","sourceRoot":"","sources":["../src/gitDiff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE7C,SAAS,GAAG,CAAC,IAAwB,EAAE,IAAc;IACnD,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE;QAC9E,QAAQ,EAAE,MAAM;QAChB,SAAS,EAAE,GAAG,GAAG,IAAI,GAAG,IAAI;KAC7B,CAAC,CAAC;IACH,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IACpD,OAAO,GAAG,CAAC,MAAM,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,GAAW;IACjC,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;AAC5D,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,YAAqB;IAClE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IACzD,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAE5C,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,EAAE;QAC3B,cAAc;QACd,IAAI;QACJ,SAAS;QACT,0BAA0B;KAC3B,CAAC,EAAE,IAAI,EAAE,CAAC;IACX,MAAM,UAAU,GACd,YAAY,KAAK,SAAS;QACxB,CAAC,CAAC,CAAC,YAAY,CAAC;QAChB,CAAC,CAAC;YACE,UAAU;YACV,aAAa;YACb,eAAe;YACf,eAAe;YACf,iBAAiB;YACjB,MAAM;YACN,QAAQ;SACT,CAAC;IAER,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,EAAE;YAAE,SAAS;QAC9C,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,GAAG,WAAW,CAAC,CAAC,KAAK,SAAS;YAAE,SAAS;QAC1F,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;QAC1D,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,EAAE;YAAE,SAAS;QAC5C,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,IAAI,EAAE,KAAK,OAAO,IAAI,YAAY,KAAK,SAAS;YAAE,SAAS;QACxE,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,SAAiB;IAEjB,MAAM,
|
|
1
|
+
{"version":3,"file":"gitDiff.js","sourceRoot":"","sources":["../src/gitDiff.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { spawnSync } from "node:child_process";
|
|
2
|
+
import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { addedLinesByFile, changedFiles } from "./gitDiff.js";
|
|
6
|
+
import { packageRoot } from "./packagePaths.js";
|
|
7
|
+
// is-97095d35: verify-diff treated a renamed file as if every line were new,
|
|
8
|
+
// because each changed path was diffed ALONE — with only the new path in the
|
|
9
|
+
// pathspec git cannot pair the rename. The added-lines computation now runs one
|
|
10
|
+
// rename-aware `git diff -U0 -M` and reads per-file hunks.
|
|
11
|
+
//
|
|
12
|
+
// Three executed directions, because a "fix" that stopped counting added lines
|
|
13
|
+
// altogether would be worse than the bug:
|
|
14
|
+
// 1. pure rename of a file with a pre-existing violation → zero added lines,
|
|
15
|
+
// verify-diff exit 0 (the inherited violation must NOT gate)
|
|
16
|
+
// 2. rename plus one new violating line → exactly that line gates
|
|
17
|
+
// 3. ordinary modified file → its added line still gates (regression)
|
|
18
|
+
const BASE_SOURCE = `export const keep = 1;
|
|
19
|
+
export const inherited = (x: unknown) => x as any;
|
|
20
|
+
export const tail = 3;
|
|
21
|
+
`;
|
|
22
|
+
const NEW_VIOLATION = "export const fresh = (x: unknown) => x as any;\n";
|
|
23
|
+
const INHERITED_LINE = 2;
|
|
24
|
+
const ADDED_LINE = 4;
|
|
25
|
+
function git(dir, ...args) {
|
|
26
|
+
const r = spawnSync("git", ["-C", dir, ...args], { encoding: "utf8" });
|
|
27
|
+
if (r.status !== 0)
|
|
28
|
+
throw new Error(`git ${args.join(" ")}: ${r.stderr}`);
|
|
29
|
+
return r.stdout;
|
|
30
|
+
}
|
|
31
|
+
function expectStep(step, ok, detail) {
|
|
32
|
+
if (!ok) {
|
|
33
|
+
console.error(`FAIL rename-diff: ${step}\n${detail}`);
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
36
|
+
console.log(` ok rename-diff: ${step}`);
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
39
|
+
function countOf(haystack, needle) {
|
|
40
|
+
return haystack.split(needle).length - 1;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* A repo whose one commit holds BASE_SOURCE plus a same-commit `origin/main`
|
|
44
|
+
* ref, so verify-diff resolves the added-lines rung against it (a bare local
|
|
45
|
+
* branch sitting at HEAD is rejected as degenerate by resolveMergeBase).
|
|
46
|
+
*/
|
|
47
|
+
function seedRepo(dir) {
|
|
48
|
+
mkdirSync(dir, { recursive: true });
|
|
49
|
+
git(dir, "init", "-q");
|
|
50
|
+
git(dir, "config", "user.email", "t@t");
|
|
51
|
+
git(dir, "config", "user.name", "t");
|
|
52
|
+
writeFileSync(join(dir, "original.ts"), BASE_SOURCE);
|
|
53
|
+
git(dir, "add", "-A");
|
|
54
|
+
git(dir, "commit", "-qm", "init");
|
|
55
|
+
const base = git(dir, "rev-parse", "HEAD").trim();
|
|
56
|
+
git(dir, "update-ref", "refs/remotes/origin/main", base);
|
|
57
|
+
return base;
|
|
58
|
+
}
|
|
59
|
+
function verifyDiff(dir) {
|
|
60
|
+
const res = spawnSync("node", [join(packageRoot, "dist", "cli.js"), "verify-diff"], {
|
|
61
|
+
cwd: dir,
|
|
62
|
+
encoding: "utf8",
|
|
63
|
+
});
|
|
64
|
+
if (res.error)
|
|
65
|
+
throw res.error;
|
|
66
|
+
return { status: res.status ?? -1, out: `${res.stdout}${res.stderr}` };
|
|
67
|
+
}
|
|
68
|
+
function main() {
|
|
69
|
+
const dir = mkdtempSync(join(tmpdir(), "guardrails-rename-diff-"));
|
|
70
|
+
try {
|
|
71
|
+
// 1. pure rename — no content change at all.
|
|
72
|
+
const pure = join(dir, "pure");
|
|
73
|
+
const pureBase = seedRepo(pure);
|
|
74
|
+
if (!readFileSync(join(pure, "original.ts"), "utf8").includes("as any")) {
|
|
75
|
+
console.error("FAIL rename-diff: fixture is inert — the base file carries no violation");
|
|
76
|
+
return 1;
|
|
77
|
+
}
|
|
78
|
+
git(pure, "mv", "original.ts", "pure.ts");
|
|
79
|
+
const pureAdded = addedLinesByFile(pure, pureBase).get(join(pure, "pure.ts"));
|
|
80
|
+
const pureTracked = changedFiles(pure, pureBase).tracked.includes(join(pure, "pure.ts"));
|
|
81
|
+
if (!expectStep("pure rename → still tracked, zero added lines", pureTracked && pureAdded?.size === undefined, `tracked=${pureTracked} added=${pureAdded === undefined ? "absent" : [...pureAdded].join(",")}`)) {
|
|
82
|
+
return 1;
|
|
83
|
+
}
|
|
84
|
+
const pureRun = verifyDiff(pure);
|
|
85
|
+
if (!expectStep("pure rename of a violating file → verify-diff exit 0", pureRun.status === 0, pureRun.out)) {
|
|
86
|
+
return 1;
|
|
87
|
+
}
|
|
88
|
+
// 2. rename plus one new violating line appended.
|
|
89
|
+
const moved = join(dir, "moved");
|
|
90
|
+
const movedBase = seedRepo(moved);
|
|
91
|
+
git(moved, "mv", "original.ts", "modified.ts");
|
|
92
|
+
writeFileSync(join(moved, "modified.ts"), BASE_SOURCE + NEW_VIOLATION);
|
|
93
|
+
const movedAdded = addedLinesByFile(moved, movedBase).get(join(moved, "modified.ts"));
|
|
94
|
+
if (!expectStep("rename + one added violation → exactly line 4 added", movedAdded?.size === 1 && movedAdded.has(ADDED_LINE), `added=${movedAdded === undefined ? "absent" : [...movedAdded].join(",")}`)) {
|
|
95
|
+
return 1;
|
|
96
|
+
}
|
|
97
|
+
const movedRun = verifyDiff(moved);
|
|
98
|
+
if (!expectStep("rename + one added violation → verify-diff reports exactly that line", movedRun.status === 1 &&
|
|
99
|
+
movedRun.out.includes(`modified.ts:${ADDED_LINE}`) &&
|
|
100
|
+
!movedRun.out.includes(`modified.ts:${INHERITED_LINE}`) &&
|
|
101
|
+
countOf(movedRun.out, "error[") === 1, movedRun.out)) {
|
|
102
|
+
return 1;
|
|
103
|
+
}
|
|
104
|
+
// 3. ordinary modified file — the regression direction.
|
|
105
|
+
const mod = join(dir, "modified");
|
|
106
|
+
const modBase = seedRepo(mod);
|
|
107
|
+
writeFileSync(join(mod, "original.ts"), BASE_SOURCE + NEW_VIOLATION);
|
|
108
|
+
const modAdded = addedLinesByFile(mod, modBase).get(join(mod, "original.ts"));
|
|
109
|
+
if (!expectStep("ordinary modified file → still reports its added line", modAdded?.size === 1 && modAdded.has(ADDED_LINE), `added=${modAdded === undefined ? "absent" : [...modAdded].join(",")}`)) {
|
|
110
|
+
return 1;
|
|
111
|
+
}
|
|
112
|
+
const modRun = verifyDiff(mod);
|
|
113
|
+
if (!expectStep("ordinary modified file → verify-diff exit 1 on the new line only", modRun.status === 1 &&
|
|
114
|
+
modRun.out.includes(`original.ts:${ADDED_LINE}`) &&
|
|
115
|
+
!modRun.out.includes(`original.ts:${INHERITED_LINE}`) &&
|
|
116
|
+
countOf(modRun.out, "error[") === 1, modRun.out)) {
|
|
117
|
+
return 1;
|
|
118
|
+
}
|
|
119
|
+
// 4. an added line whose text starts with `++ ` prints as `+++ …` inside a
|
|
120
|
+
// -U0 hunk; it must count as an added line, not as a new file header.
|
|
121
|
+
const plus = join(dir, "plus");
|
|
122
|
+
const plusBase = seedRepo(plus);
|
|
123
|
+
// It only bites when a LATER hunk follows it, so it goes after line 1 and
|
|
124
|
+
// a second, separate hunk is appended at the end: lines 2 and 5.
|
|
125
|
+
const [first, ...rest] = BASE_SOURCE.split("\n");
|
|
126
|
+
writeFileSync(join(plus, "original.ts"), `${first}\n++ not a header\n${rest.join("\n")}export const after = 5;\n`);
|
|
127
|
+
const plusAdded = addedLinesByFile(plus, plusBase);
|
|
128
|
+
const plusLines = plusAdded.get(join(plus, "original.ts"));
|
|
129
|
+
if (!expectStep("added line starting with `++ ` → counted in its own file, no phantom file", plusAdded.size === 1 && plusLines?.size === 2 && plusLines.has(2) && plusLines.has(5), `files=${[...plusAdded.keys()].join(",")} added=${plusLines === undefined ? "absent" : [...plusLines].join(",")}`)) {
|
|
130
|
+
return 1;
|
|
131
|
+
}
|
|
132
|
+
console.log("rename-diff fixtures passed");
|
|
133
|
+
return 0;
|
|
134
|
+
}
|
|
135
|
+
finally {
|
|
136
|
+
rmSync(dir, { recursive: true, force: true });
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
process.exit(main());
|
|
140
|
+
//# sourceMappingURL=renameDiffTest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"renameDiffTest.js","sourceRoot":"","sources":["../src/renameDiffTest.ts"],"names":[],"mappings":"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"}
|
package/dist/verifyDiff.js
CHANGED
|
@@ -2,7 +2,7 @@ import { join, relative } from "node:path";
|
|
|
2
2
|
import { match } from "ts-pattern";
|
|
3
3
|
import { AstGrepConfigError, scanFindings } from "./astGrep.js";
|
|
4
4
|
import { formatFinding } from "./findings.js";
|
|
5
|
-
import {
|
|
5
|
+
import { addedLinesByFile, changedFiles, gitRoot, resolveMergeBase } from "./gitDiff.js";
|
|
6
6
|
import { rulesConfig } from "./packagePaths.js";
|
|
7
7
|
import { dedupeFindings, ruleConfigs } from "./repoRules.js";
|
|
8
8
|
import { SeverityConfigError, severityRaiseArgs } from "./severity.js";
|
|
@@ -49,19 +49,18 @@ function planFor(rung) {
|
|
|
49
49
|
.with({ kind: "added-lines" }, ({ root, mergeBase }) => {
|
|
50
50
|
const { tracked, untracked } = changedFiles(root, mergeBase);
|
|
51
51
|
const untrackedSet = new Set(untracked);
|
|
52
|
-
|
|
52
|
+
// One rename-aware diff for every changed file: a renamed file's added
|
|
53
|
+
// lines are its hunks only, so a pure rename contributes no added lines
|
|
54
|
+
// and an inherited violation never gates. A file absent from the map has
|
|
55
|
+
// no added lines (pure rename, deletion) — nothing to keep.
|
|
56
|
+
const addedByFile = addedLinesByFile(root, mergeBase);
|
|
53
57
|
return {
|
|
54
58
|
rungLabel: `added-lines vs merge-base ${mergeBase.slice(0, 12)}`,
|
|
55
59
|
files: [...new Set([...tracked, ...untracked])],
|
|
56
60
|
keep: (f) => {
|
|
57
61
|
if (untrackedSet.has(f.file))
|
|
58
62
|
return true;
|
|
59
|
-
|
|
60
|
-
if (added === undefined) {
|
|
61
|
-
added = addedLines(root, mergeBase, f.file);
|
|
62
|
-
addedByFile.set(f.file, added);
|
|
63
|
-
}
|
|
64
|
-
return added.has(f.line);
|
|
63
|
+
return addedByFile.get(f.file)?.has(f.line) ?? false;
|
|
65
64
|
},
|
|
66
65
|
};
|
|
67
66
|
})
|
package/dist/verifyDiff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyDiff.js","sourceRoot":"","sources":["../src/verifyDiff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAgB,aAAa,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"verifyDiff.js","sourceRoot":"","sources":["../src/verifyDiff.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agentvibes/guardrails",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.4",
|
|
4
4
|
"description": "Verification toolkit that makes agents write simple code: ast-grep rule canon, diff ratchet, biome/tsconfig presets, one CLI.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"format": "biome check --write .",
|
|
36
36
|
"test:rules": "node dist/testRules.js",
|
|
37
37
|
"test:gate": "node dist/gateRed.js",
|
|
38
|
-
"check": "pnpm build && pnpm lint && pnpm test:rules && pnpm test:twins && pnpm test:repo-rules && pnpm test:preset && pnpm test:gate && pnpm test:sibling-clone && pnpm test:metrics && pnpm test:init && pnpm test:severity && pnpm test:screens && pnpm test:jsx-suppress && pnpm test:hooks && pnpm test:iterate && pnpm test:leaks && pnpm leaks",
|
|
38
|
+
"check": "pnpm build && pnpm lint && pnpm test:rules && pnpm test:twins && pnpm test:repo-rules && pnpm test:preset && pnpm test:gate && pnpm test:sibling-clone && pnpm test:metrics && pnpm test:init && pnpm test:severity && pnpm test:screens && pnpm test:jsx-suppress && pnpm test:hooks && pnpm test:iterate && pnpm test:rename-diff && pnpm test:leaks && pnpm leaks",
|
|
39
39
|
"test:metrics": "node dist/metricsCycle.js",
|
|
40
40
|
"leaks": "node dist/cli.js leaks .",
|
|
41
41
|
"test:leaks": "node dist/leaksRed.js",
|
|
@@ -43,6 +43,7 @@
|
|
|
43
43
|
"test:severity": "node dist/severityTest.js",
|
|
44
44
|
"test:hooks": "node dist/hookStopTest.js",
|
|
45
45
|
"test:iterate": "node dist/iterateTest.js",
|
|
46
|
+
"test:rename-diff": "node dist/renameDiffTest.js",
|
|
46
47
|
"test:screens": "node dist/screenScopeTest.js",
|
|
47
48
|
"test:twins": "node dist/twinCoverageTest.js",
|
|
48
49
|
"test:repo-rules": "node dist/repoRulesTest.js",
|