@aryam/fixmap-core 0.8.7 → 0.8.9
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 +5 -1
- package/dist/browser.d.ts +5 -1
- package/dist/browser.js +3 -1
- package/dist/browser.js.map +1 -1
- package/dist/cli-quote.d.ts +3 -0
- package/dist/cli-quote.js +9 -0
- package/dist/cli-quote.js.map +1 -0
- package/dist/compare.js +45 -12
- package/dist/compare.js.map +1 -1
- package/dist/exclude.d.ts +2 -0
- package/dist/exclude.js +8 -3
- package/dist/exclude.js.map +1 -1
- package/dist/explain.js +24 -17
- package/dist/explain.js.map +1 -1
- package/dist/grounding.d.ts +3 -1
- package/dist/grounding.js +24 -19
- package/dist/grounding.js.map +1 -1
- package/dist/import-graph.d.ts +2 -0
- package/dist/import-graph.js +84 -10
- package/dist/import-graph.js.map +1 -1
- package/dist/index.d.ts +6 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/languages.d.ts +1 -1
- package/dist/languages.js +60 -12
- package/dist/languages.js.map +1 -1
- package/dist/markdown.d.ts +2 -0
- package/dist/markdown.js +8 -0
- package/dist/markdown.js.map +1 -0
- package/dist/paths.d.ts +8 -0
- package/dist/paths.js +38 -8
- package/dist/paths.js.map +1 -1
- package/dist/plan.d.ts +3 -1
- package/dist/plan.js +58 -15
- package/dist/plan.js.map +1 -1
- package/dist/rank.d.ts +9 -0
- package/dist/rank.js +171 -90
- package/dist/rank.js.map +1 -1
- package/dist/repo-scan.d.ts +3 -1
- package/dist/repo-scan.js +615 -116
- package/dist/repo-scan.js.map +1 -1
- package/dist/report.d.ts +6 -0
- package/dist/report.js +92 -55
- package/dist/report.js.map +1 -1
- package/dist/signals.d.ts +7 -0
- package/dist/signals.js +150 -44
- package/dist/signals.js.map +1 -1
- package/dist/test-gates.js +15 -3
- package/dist/test-gates.js.map +1 -1
- package/dist/text.d.ts +2 -0
- package/dist/text.js +4 -0
- package/dist/text.js.map +1 -1
- package/dist/types.d.ts +8 -2
- package/dist/validate.d.ts +10 -0
- package/dist/validate.js +188 -0
- package/dist/validate.js.map +1 -0
- package/dist/verify.js +48 -6
- package/dist/verify.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -17,6 +17,10 @@ const report = await buildFixMapReport({
|
|
|
17
17
|
console.log(renderMarkdownReport(report));
|
|
18
18
|
```
|
|
19
19
|
|
|
20
|
-
`buildFixMapReport` runs the full pipeline: scan the repository, rank context files against the task, route to the most relevant test commands, and collect risk notes and diagnostics.
|
|
20
|
+
`buildFixMapReport` runs the full pipeline: scan the repository, resolve exclusions, rank context files against the task, route to the most relevant test commands, and collect risk notes and diagnostics. Exact git states can reuse a seven-day scan cache, while `useCache: false` forces a fresh scan and reports the bypass.
|
|
21
|
+
|
|
22
|
+
The package also exports the lower-level scanner, excluder, ranker, grounding, import-graph, test-routing, risk, comparison, explanation, verification, structural validation, and Markdown/JSON rendering APIs. `@aryam/fixmap-core/browser` exposes the filesystem-free report, Compare, Explain, Verify, validation, and rendering logic for browser applications.
|
|
23
|
+
|
|
24
|
+
JSON reports use `reportVersion: 1`. Additive fields and diagnostic codes may appear within that version; consumers should ignore unknown fields and use diagnostic severity as the stable fallback.
|
|
21
25
|
|
|
22
26
|
MIT © FixMap contributors.
|
package/dist/browser.d.ts
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
export { explainFile } from "./explain.js";
|
|
2
2
|
export { buildPathExcluder, NO_EXCLUSIONS, parseIgnoreFile } from "./exclude.js";
|
|
3
3
|
export { compareReports, renderComparisonMarkdown } from "./compare.js";
|
|
4
|
+
export { quoteCliValue } from "./cli-quote.js";
|
|
5
|
+
export type { CliShell } from "./cli-quote.js";
|
|
4
6
|
export { rankContextFiles } from "./rank.js";
|
|
5
|
-
export { buildReportFromRepo, buildRiskNotes, buildTestRoutes, renderMarkdownReport } from "./report.js";
|
|
7
|
+
export { buildReportFromRepo, buildRiskNotes, buildTestRoutes, renderJsonReport, renderMarkdownReport } from "./report.js";
|
|
6
8
|
export { tokenizePath, tokenizeText } from "./signals.js";
|
|
7
9
|
export { renderVerifyMarkdown, verifyPlan } from "./verify.js";
|
|
10
|
+
export { validateFixMapReport } from "./validate.js";
|
|
11
|
+
export type { ValidatedFixMapReport } from "./validate.js";
|
|
8
12
|
export type { FileExplanation } from "./explain.js";
|
|
9
13
|
export type { PathExcluder } from "./exclude.js";
|
|
10
14
|
export type { ReportComparison } from "./compare.js";
|
package/dist/browser.js
CHANGED
|
@@ -7,8 +7,10 @@
|
|
|
7
7
|
export { explainFile } from "./explain.js";
|
|
8
8
|
export { buildPathExcluder, NO_EXCLUSIONS, parseIgnoreFile } from "./exclude.js";
|
|
9
9
|
export { compareReports, renderComparisonMarkdown } from "./compare.js";
|
|
10
|
+
export { quoteCliValue } from "./cli-quote.js";
|
|
10
11
|
export { rankContextFiles } from "./rank.js";
|
|
11
|
-
export { buildReportFromRepo, buildRiskNotes, buildTestRoutes, renderMarkdownReport } from "./report.js";
|
|
12
|
+
export { buildReportFromRepo, buildRiskNotes, buildTestRoutes, renderJsonReport, renderMarkdownReport } from "./report.js";
|
|
12
13
|
export { tokenizePath, tokenizeText } from "./signals.js";
|
|
13
14
|
export { renderVerifyMarkdown, verifyPlan } from "./verify.js";
|
|
15
|
+
export { validateFixMapReport } from "./validate.js";
|
|
14
16
|
//# sourceMappingURL=browser.js.map
|
package/dist/browser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,4DAA4D;AAC5D,EAAE;AACF,4EAA4E;AAC5E,4EAA4E;AAC5E,+CAA+C;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,4DAA4D;AAC5D,EAAE;AACF,4EAA4E;AAC5E,4EAA4E;AAC5E,+CAA+C;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC3H,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/** Quote one command-line value for the shell the user will paste it into. */
|
|
2
|
+
export function quoteCliValue(value, shell = "posix") {
|
|
3
|
+
if (/^[\p{L}\p{N}._/\\:@+-]+$/u.test(value))
|
|
4
|
+
return value;
|
|
5
|
+
return shell === "powershell"
|
|
6
|
+
? `'${value.replaceAll("'", "''")}'`
|
|
7
|
+
: `'${value.replaceAll("'", `'\\''`)}'`;
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=cli-quote.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-quote.js","sourceRoot":"","sources":["../src/cli-quote.ts"],"names":[],"mappings":"AAEA,8EAA8E;AAC9E,MAAM,UAAU,aAAa,CAAC,KAAa,EAAE,QAAkB,OAAO;IACpE,IAAI,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1D,OAAO,KAAK,KAAK,YAAY;QAC3B,CAAC,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG;QACpC,CAAC,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC;AAC5C,CAAC"}
|
package/dist/compare.js
CHANGED
|
@@ -5,7 +5,10 @@
|
|
|
5
5
|
//
|
|
6
6
|
// This compares two reports the caller already has. Nothing is scanned or re-ranked, so a
|
|
7
7
|
// comparison can be run long after the plans were made.
|
|
8
|
+
import { markdownCode } from "./markdown.js";
|
|
8
9
|
export function compareReports(previous, current) {
|
|
10
|
+
assertUniquePaths(previous.contextFiles, "Previous report");
|
|
11
|
+
assertUniquePaths(current.contextFiles, "Current report");
|
|
9
12
|
const previousByPath = indexByPath(previous.contextFiles);
|
|
10
13
|
const currentByPath = indexByPath(current.contextFiles);
|
|
11
14
|
const entered = [];
|
|
@@ -58,26 +61,43 @@ export function compareReports(previous, current) {
|
|
|
58
61
|
unchanged.sort((a, b) => (a.currentRank ?? 0) - (b.currentRank ?? 0));
|
|
59
62
|
const previousGrounding = previous.analysis?.grounding.specificity;
|
|
60
63
|
const currentGrounding = current.analysis?.grounding.specificity;
|
|
64
|
+
const groundingComparable = previousGrounding !== undefined && currentGrounding !== undefined;
|
|
65
|
+
const groundingChanged = groundingComparable && previousGrounding !== currentGrounding;
|
|
61
66
|
return {
|
|
62
|
-
summary: buildSummary(entered, left, moved, confidenceChanged, previous.contextFiles[0], current.contextFiles[0]),
|
|
67
|
+
summary: buildSummary(entered, left, moved, confidenceChanged, previous.contextFiles[0], current.contextFiles[0], groundingChanged, previousGrounding, currentGrounding, groundingComparable),
|
|
63
68
|
entered,
|
|
64
69
|
left,
|
|
65
70
|
moved,
|
|
66
71
|
confidenceChanged,
|
|
67
72
|
unchanged,
|
|
68
|
-
groundingChanged
|
|
73
|
+
groundingChanged,
|
|
69
74
|
...(previousGrounding ? { previousGrounding } : {}),
|
|
70
75
|
...(currentGrounding ? { currentGrounding } : {})
|
|
71
76
|
};
|
|
72
77
|
}
|
|
78
|
+
function assertUniquePaths(files, label) {
|
|
79
|
+
const seen = new Set();
|
|
80
|
+
for (const file of files) {
|
|
81
|
+
if (seen.has(file.path)) {
|
|
82
|
+
throw new Error(`${label} has a duplicate contextFiles path: ${file.path}`);
|
|
83
|
+
}
|
|
84
|
+
seen.add(file.path);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
73
87
|
function indexByPath(files) {
|
|
74
88
|
return new Map(files.map((file, index) => [
|
|
75
89
|
file.path,
|
|
76
90
|
{ rank: Number.isSafeInteger(file.rank) && file.rank > 0 ? file.rank : index + 1, file }
|
|
77
91
|
]));
|
|
78
92
|
}
|
|
79
|
-
function buildSummary(entered, left, moved, confidenceChanged, previousLeader, currentLeader) {
|
|
93
|
+
function buildSummary(entered, left, moved, confidenceChanged, previousLeader, currentLeader, groundingChanged, previousGrounding, currentGrounding, groundingComparable) {
|
|
80
94
|
if (entered.length === 0 && left.length === 0 && moved.length === 0 && confidenceChanged.length === 0) {
|
|
95
|
+
if (groundingChanged) {
|
|
96
|
+
return `The ranking is unchanged, but task grounding changed from ${previousGrounding} to ${currentGrounding}.`;
|
|
97
|
+
}
|
|
98
|
+
if (!groundingComparable && previousGrounding !== currentGrounding) {
|
|
99
|
+
return "Both plans rank the same files in the same order. One plan predates grounding analysis, so that dimension was not compared.";
|
|
100
|
+
}
|
|
81
101
|
return "Both plans rank the same files in the same order. Refining the task changed nothing.";
|
|
82
102
|
}
|
|
83
103
|
const parts = [
|
|
@@ -98,10 +118,12 @@ export function renderComparisonMarkdown(comparison) {
|
|
|
98
118
|
lines.push(`Task grounding changed from **${comparison.previousGrounding ?? "unknown"}** ` +
|
|
99
119
|
`to **${comparison.currentGrounding ?? "unknown"}**.`, "");
|
|
100
120
|
}
|
|
101
|
-
appendSection(lines, "Entered", comparison.entered, (delta) =>
|
|
102
|
-
appendSection(lines, "Left", comparison.left, (delta) =>
|
|
103
|
-
appendSection(lines, "Moved", comparison.moved, (delta) =>
|
|
104
|
-
appendSection(lines, "Confidence changed", comparison.confidenceChanged, (delta) =>
|
|
121
|
+
appendSection(lines, "Entered", comparison.entered, (delta) => `${markdownCode(delta.path)} at rank ${delta.currentRank}${formatMetrics(delta.currentConfidence, delta.currentScore)}`);
|
|
122
|
+
appendSection(lines, "Left", comparison.left, (delta) => `${markdownCode(delta.path)} was rank ${delta.previousRank}${formatMetrics(delta.previousConfidence, delta.previousScore)}`);
|
|
123
|
+
appendSection(lines, "Moved", comparison.moved, (delta) => `${markdownCode(delta.path)} ${describeMove(delta)}`);
|
|
124
|
+
appendSection(lines, "Confidence changed", comparison.confidenceChanged, (delta) => `${markdownCode(delta.path)} stayed at rank ${delta.currentRank}` +
|
|
125
|
+
`${delta.currentScore === undefined ? "" : ` and score ${delta.currentScore}`}; confidence changed from ` +
|
|
126
|
+
`${delta.previousConfidence ?? "unknown"} to ${delta.currentConfidence ?? "unknown"}`);
|
|
105
127
|
if (comparison.unchanged.length > 0) {
|
|
106
128
|
lines.push(`## Unchanged`, "", `${comparison.unchanged.length} file(s) held their rank, score, and confidence.`, "");
|
|
107
129
|
}
|
|
@@ -114,11 +136,22 @@ function describeMove(delta) {
|
|
|
114
136
|
const rank = direction === "held"
|
|
115
137
|
? `stayed at rank ${delta.currentRank}`
|
|
116
138
|
: `${direction} from rank ${delta.previousRank} to ${delta.currentRank}`;
|
|
117
|
-
const score =
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
139
|
+
const score = delta.previousScore === undefined && delta.currentScore === undefined
|
|
140
|
+
? ""
|
|
141
|
+
: `score ${delta.previousScore ?? "unknown"} to ${delta.currentScore ?? "unknown"}`;
|
|
142
|
+
const confidence = delta.previousConfidence === undefined && delta.currentConfidence === undefined
|
|
143
|
+
? ""
|
|
144
|
+
: delta.previousConfidence === delta.currentConfidence
|
|
145
|
+
? `${delta.currentConfidence} confidence`
|
|
146
|
+
: `confidence ${delta.previousConfidence ?? "unknown"} to ${delta.currentConfidence ?? "unknown"}`;
|
|
147
|
+
return [rank, score, confidence].filter(Boolean).join(", ");
|
|
148
|
+
}
|
|
149
|
+
function formatMetrics(confidence, score) {
|
|
150
|
+
const metrics = [
|
|
151
|
+
confidence ? `${confidence} confidence` : "",
|
|
152
|
+
score === undefined ? "" : `score ${score}`
|
|
153
|
+
].filter(Boolean);
|
|
154
|
+
return metrics.length > 0 ? ` (${metrics.join(", ")})` : "";
|
|
122
155
|
}
|
|
123
156
|
function appendSection(lines, title, deltas, format) {
|
|
124
157
|
if (deltas.length === 0) {
|
package/dist/compare.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compare.js","sourceRoot":"","sources":["../src/compare.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,yFAAyF;AACzF,2FAA2F;AAC3F,yCAAyC;AACzC,EAAE;AACF,0FAA0F;AAC1F,wDAAwD;
|
|
1
|
+
{"version":3,"file":"compare.js","sourceRoot":"","sources":["../src/compare.ts"],"names":[],"mappings":"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"}
|
package/dist/exclude.d.ts
CHANGED
|
@@ -4,6 +4,8 @@ export type PathExcluder = {
|
|
|
4
4
|
/** The pattern that matched, for `--explain` to quote back. */
|
|
5
5
|
reasonFor: (path: string) => string | undefined;
|
|
6
6
|
patterns: string[];
|
|
7
|
+
/** Patterns that matched at least one path inspected by this excluder. */
|
|
8
|
+
matchedPatterns: ReadonlySet<string>;
|
|
7
9
|
};
|
|
8
10
|
export declare const NO_EXCLUSIONS: PathExcluder;
|
|
9
11
|
/**
|
package/dist/exclude.js
CHANGED
|
@@ -15,7 +15,8 @@ const COMMENT = /^\s*#/;
|
|
|
15
15
|
export const NO_EXCLUSIONS = {
|
|
16
16
|
excludes: () => false,
|
|
17
17
|
reasonFor: () => undefined,
|
|
18
|
-
patterns: []
|
|
18
|
+
patterns: [],
|
|
19
|
+
matchedPatterns: new Set()
|
|
19
20
|
};
|
|
20
21
|
/**
|
|
21
22
|
* Builds a matcher from gitignore-flavored patterns. Deliberately a small subset — `*`,
|
|
@@ -36,14 +37,17 @@ export function buildPathExcluder(patterns) {
|
|
|
36
37
|
return { pattern, negated, test: compile(body) };
|
|
37
38
|
});
|
|
38
39
|
const cache = new Map();
|
|
40
|
+
const matchedPatterns = new Set();
|
|
39
41
|
const reasonFor = (path) => {
|
|
40
42
|
if (cache.has(path)) {
|
|
41
43
|
return cache.get(path);
|
|
42
44
|
}
|
|
43
45
|
let hit;
|
|
44
46
|
for (const matcher of matchers) {
|
|
45
|
-
if (matcher.test(path))
|
|
47
|
+
if (matcher.test(path)) {
|
|
48
|
+
matchedPatterns.add(matcher.pattern);
|
|
46
49
|
hit = matcher.negated ? undefined : matcher.pattern;
|
|
50
|
+
}
|
|
47
51
|
}
|
|
48
52
|
cache.set(path, hit);
|
|
49
53
|
return hit;
|
|
@@ -51,7 +55,8 @@ export function buildPathExcluder(patterns) {
|
|
|
51
55
|
return {
|
|
52
56
|
excludes: (path) => reasonFor(path) !== undefined,
|
|
53
57
|
reasonFor,
|
|
54
|
-
patterns: cleaned
|
|
58
|
+
patterns: cleaned,
|
|
59
|
+
matchedPatterns
|
|
55
60
|
};
|
|
56
61
|
}
|
|
57
62
|
/** Reads `.fixmapignore` from a repository root, if it has one. */
|
package/dist/exclude.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exclude.js","sourceRoot":"","sources":["../src/exclude.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,EAAE;AACF,wFAAwF;AACxF,yFAAyF;AACzF,sFAAsF;AACtF,2FAA2F;AAC3F,2FAA2F;AAC3F,6BAA6B;AAC7B,EAAE;AACF,yFAAyF;AACzF,sFAAsF;AACtF,2FAA2F;AAC3F,0CAA0C;AAE1C,MAAM,OAAO,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"exclude.js","sourceRoot":"","sources":["../src/exclude.ts"],"names":[],"mappings":"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"}
|
package/dist/explain.js
CHANGED
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
// file it left out — and until now the only answer available was silence, which reads
|
|
5
5
|
// like the tool has nothing to say for itself. Every branch below reports a specific,
|
|
6
6
|
// checkable cause rather than a score.
|
|
7
|
-
import { isBackupPath, isGeneratedPath, isRecordedEvaluationOutput, moduleStem } from "./paths.js";
|
|
7
|
+
import { isBackupPath, isGeneratedPath, isRecordedEvaluationOutput, LOCKFILE_NAMES, moduleStem, pathMatchesMention } from "./paths.js";
|
|
8
|
+
import { markdownCode } from "./markdown.js";
|
|
8
9
|
import { REPORT_SCORE_CUTOFF, rankContextFiles } from "./rank.js";
|
|
9
10
|
import { extractFileMentions } from "./signals.js";
|
|
10
11
|
export function explainFile(repo, input, targetPath) {
|
|
@@ -67,7 +68,9 @@ export function explainFile(repo, input, targetPath) {
|
|
|
67
68
|
return {
|
|
68
69
|
path,
|
|
69
70
|
status: exclusion.status,
|
|
70
|
-
reasons:
|
|
71
|
+
reasons: exclusion.status === "not-scanned"
|
|
72
|
+
? []
|
|
73
|
+
: [exclusion.summary.replace(/^(?:Excluded|Not scanned):\s*/, "")],
|
|
71
74
|
summary: exclusion.summary
|
|
72
75
|
};
|
|
73
76
|
}
|
|
@@ -76,22 +79,25 @@ export function explainFile(repo, input, targetPath) {
|
|
|
76
79
|
const everything = rankContextFiles(repo, input, Number.MAX_SAFE_INTEGER, Number.NEGATIVE_INFINITY);
|
|
77
80
|
const scored = everything.find((file) => file.path === path);
|
|
78
81
|
const lowestReported = reported[reported.length - 1]?.score;
|
|
79
|
-
const
|
|
82
|
+
const limit = input.limit ?? 8;
|
|
83
|
+
const reportIsFull = reported.length >= limit;
|
|
84
|
+
const cutoff = reportIsFull && lowestReported !== undefined ? lowestReported : REPORT_SCORE_CUTOFF;
|
|
85
|
+
const outsideLimit = reportIsFull && scored !== undefined && lowestReported !== undefined && scored.score >= lowestReported;
|
|
80
86
|
return {
|
|
81
87
|
path,
|
|
82
88
|
status: outsideLimit ? "outside-limit" : "below-cutoff",
|
|
83
89
|
score: scored?.score ?? 0,
|
|
84
|
-
cutoff
|
|
90
|
+
cutoff,
|
|
85
91
|
reasons: scored?.reasons ?? [],
|
|
86
92
|
summary: outsideLimit
|
|
87
93
|
? `Scored ${scored.score}, tied with or above the lowest reported score of ${lowestReported}, but fell outside the top ${reported.length} after score and path tie-breaking.`
|
|
88
|
-
: `Scored ${scored?.score ?? 0}, below the
|
|
94
|
+
: `Scored ${scored?.score ?? 0}, below the reporting cutoff of ${REPORT_SCORE_CUTOFF}. ` +
|
|
89
95
|
"Name a symbol, error string, or path from this file in the task to raise it."
|
|
90
96
|
};
|
|
91
97
|
}
|
|
92
98
|
/** Renders one file's explanation. The summary carries the answer; reasons show the working. */
|
|
93
99
|
export function renderExplanationMarkdown(explanation) {
|
|
94
|
-
const lines = [`# Why ${explanation.path}`, "", explanation.summary];
|
|
100
|
+
const lines = [`# Why ${markdownCode(explanation.path)}`, "", explanation.summary];
|
|
95
101
|
if (explanation.reasons.length > 0) {
|
|
96
102
|
lines.push("", "## Signals", "");
|
|
97
103
|
for (const reason of explanation.reasons) {
|
|
@@ -120,13 +126,21 @@ function describeExclusion(repo, input, path) {
|
|
|
120
126
|
"That is usually a sparse or partial checkout — widen the cone to rank it — and otherwise a deletion."
|
|
121
127
|
};
|
|
122
128
|
}
|
|
129
|
+
const parentSubmodule = repo.trackedFiles?.find((tracked) => path.startsWith(`${tracked}/`));
|
|
130
|
+
if (parentSubmodule) {
|
|
131
|
+
return {
|
|
132
|
+
status: "not-scanned",
|
|
133
|
+
summary: `Not scanned: this path is inside the submodule ${parentSubmodule}, which is a separate repository. ` +
|
|
134
|
+
`Run FixMap with --repo ${parentSubmodule} to map it.`
|
|
135
|
+
};
|
|
136
|
+
}
|
|
123
137
|
return {
|
|
124
138
|
status: "not-scanned",
|
|
125
139
|
summary: "Not scanned: no such path in this repository, or it is ignored by .gitignore."
|
|
126
140
|
};
|
|
127
141
|
}
|
|
128
142
|
const mentioned = [...extractFileMentions(input.issueText ?? "")]
|
|
129
|
-
.some((mention) => path
|
|
143
|
+
.some((mention) => pathMatchesMention(path, mention));
|
|
130
144
|
if (mentioned) {
|
|
131
145
|
return null;
|
|
132
146
|
}
|
|
@@ -142,17 +156,11 @@ function describeExclusion(repo, input, path) {
|
|
|
142
156
|
summary: `Not scanned: ${file.extension || "this file type"} is outside the supported source extensions.`
|
|
143
157
|
};
|
|
144
158
|
}
|
|
145
|
-
if (
|
|
159
|
+
if (LOCKFILE_NAMES.has(path.split("/").pop() ?? "")) {
|
|
146
160
|
return { status: "excluded", summary: "Excluded: lockfiles are never edit targets." };
|
|
147
161
|
}
|
|
148
|
-
if (path
|
|
149
|
-
|
|
150
|
-
return { status: "excluded", summary: "Excluded: recorded evaluation output is regenerated by the evaluation record command, not edited by hand." };
|
|
151
|
-
}
|
|
152
|
-
return {
|
|
153
|
-
status: "excluded",
|
|
154
|
-
summary: "Excluded: benchmark fixtures are ranked only when the task is about evaluation."
|
|
155
|
-
};
|
|
162
|
+
if (isRecordedEvaluationOutput(path)) {
|
|
163
|
+
return { status: "excluded", summary: "Excluded: recorded evaluation output is regenerated by the evaluation record command, not edited by hand." };
|
|
156
164
|
}
|
|
157
165
|
if (isGeneratedPath(path) && !repo.changedFiles.includes(path)) {
|
|
158
166
|
const stem = moduleStem(path);
|
|
@@ -170,5 +178,4 @@ function describeExclusion(repo, input, path) {
|
|
|
170
178
|
}
|
|
171
179
|
return null;
|
|
172
180
|
}
|
|
173
|
-
const LOCKFILES = new Set(["package-lock.json", "npm-shrinkwrap.json", "pnpm-lock.yaml", "yarn.lock", "bun.lock", "bun.lockb"]);
|
|
174
181
|
//# sourceMappingURL=explain.js.map
|
package/dist/explain.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explain.js","sourceRoot":"","sources":["../src/explain.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,EAAE;AACF,uFAAuF;AACvF,sFAAsF;AACtF,sFAAsF;AACtF,uCAAuC;AAGvC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"explain.js","sourceRoot":"","sources":["../src/explain.ts"],"names":[],"mappings":"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"}
|
package/dist/grounding.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { RankedFile, RepoMap, TaskAnalysis } from "./types.js";
|
|
2
2
|
export type TaskGrounding = TaskAnalysis["grounding"];
|
|
3
3
|
export type RankingShape = TaskAnalysis["ranking"];
|
|
4
|
+
export declare const CLUSTERED_RANKING_MARGIN = 2;
|
|
4
5
|
export declare function analyzeTaskGrounding(repo: RepoMap, input: {
|
|
5
6
|
issueText?: string | undefined;
|
|
6
7
|
diffText?: string | undefined;
|
|
@@ -10,6 +11,7 @@ export declare function buildGroundedTaskTokens(grounding: TaskGrounding, input:
|
|
|
10
11
|
diffText?: string | undefined;
|
|
11
12
|
changedFiles?: string[];
|
|
12
13
|
}): Set<string>;
|
|
13
|
-
export declare function buildRankingShape(contextFiles: RankedFile
|
|
14
|
+
export declare function buildRankingShape(contextFiles: Array<Pick<RankedFile, "score">>): RankingShape;
|
|
14
15
|
export declare function buildNextAction(grounding: TaskGrounding, ranking: RankingShape, contextFiles: RankedFile[], hasRoutedTests?: boolean): string;
|
|
16
|
+
export declare function isVagueTaskText(issueText: string): boolean;
|
|
15
17
|
export declare function identifierTokens(identifier: string): Set<string>;
|
package/dist/grounding.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { pathMatchesMention } from "./paths.js";
|
|
2
|
+
import { extractTaskSignals, tokenizeIdentifier, tokenizeText } from "./signals.js";
|
|
2
3
|
const MAX_IDENTIFIER_MATCHED_FILES = 5;
|
|
3
|
-
const VAGUE_TASK_PATTERN =
|
|
4
|
+
const VAGUE_TASK_PATTERN = /^\s*(?:please\s+)?(?:improve|make|clean(?:\s+(?:this|it|things?))?\s+up|cleanup|refactor)\b/i;
|
|
4
5
|
// Same vocabulary, global, for stripping rather than detecting. A `g` regex carries
|
|
5
6
|
// lastIndex between calls, so detection keeps its own non-global copy.
|
|
6
|
-
const VAGUE_TASK_TERMS =
|
|
7
|
+
const VAGUE_TASK_TERMS = /\b(?:please|improve|better|clean(?:\s+(?:this|it|things?))?\s+up|cleanup|refactor|developer\s+experience|dx|general|overall|codebase|quality|make|things?)\b/gi;
|
|
8
|
+
export const CLUSTERED_RANKING_MARGIN = 2;
|
|
7
9
|
export function analyzeTaskGrounding(repo, input) {
|
|
8
10
|
const issueText = input.issueText ?? "";
|
|
9
11
|
const signals = extractTaskSignals({
|
|
@@ -25,8 +27,7 @@ export function analyzeTaskGrounding(repo, input) {
|
|
|
25
27
|
.map((entry) => entry.identifier);
|
|
26
28
|
const resolvedIdentifierCount = identifiers.filter((entry) => entry.status === "exact-definition" || entry.status === "exact-text").length;
|
|
27
29
|
const hasMatchedFileMention = [...signals.fileMentions].some((mention) => repo.files.some((file) => pathMatchesMention(file.path, mention)));
|
|
28
|
-
const hasDirectAnchor =
|
|
29
|
-
hasMatchedFileMention ||
|
|
30
|
+
const hasDirectAnchor = hasMatchedFileMention ||
|
|
30
31
|
resolvedIdentifierCount > 0 ||
|
|
31
32
|
partiallyResolvedIdentifiers.length > 0;
|
|
32
33
|
const issueTokens = tokenizeText(issueText);
|
|
@@ -35,7 +36,7 @@ export function analyzeTaskGrounding(repo, input) {
|
|
|
35
36
|
return tokenizeText(file.path).has(token) || tokenizeText(file.textSample).has(token);
|
|
36
37
|
});
|
|
37
38
|
const singleUnmatchedToken = issueTokens.size === 1 && !singleTokenHasRepoMatch;
|
|
38
|
-
const vague = !hasDirectAnchor && (
|
|
39
|
+
const vague = !hasDirectAnchor && (isVagueTaskText(issueText) || singleUnmatchedToken);
|
|
39
40
|
return {
|
|
40
41
|
specificity: hasDirectAnchor ? "anchored" : vague ? "vague" : "descriptive",
|
|
41
42
|
identifiers,
|
|
@@ -78,7 +79,7 @@ export function buildRankingShape(contextFiles) {
|
|
|
78
79
|
const thirdScore = sortedScores[2];
|
|
79
80
|
const clustered = topScore !== null &&
|
|
80
81
|
thirdScore !== undefined &&
|
|
81
|
-
topScore - thirdScore <=
|
|
82
|
+
topScore - thirdScore <= CLUSTERED_RANKING_MARGIN;
|
|
82
83
|
return { topScore, runnerUpScore, topGap, clustered };
|
|
83
84
|
}
|
|
84
85
|
export function buildNextAction(grounding, ranking, contextFiles, hasRoutedTests = true) {
|
|
@@ -86,7 +87,7 @@ export function buildNextAction(grounding, ranking, contextFiles, hasRoutedTests
|
|
|
86
87
|
return "Verify or correct the unresolved identifiers before editing ranked files.";
|
|
87
88
|
}
|
|
88
89
|
if (grounding.unverifiedIdentifiers.length > 0) {
|
|
89
|
-
return "
|
|
90
|
+
return "Inspect the content diagnostics and make those source files readable before trusting identifier-based recommendations.";
|
|
90
91
|
}
|
|
91
92
|
if (grounding.partiallyResolvedIdentifiers.length > 0) {
|
|
92
93
|
return "Verify the partially matched symbol name in the leading file before editing.";
|
|
@@ -101,15 +102,16 @@ export function buildNextAction(grounding, ranking, contextFiles, hasRoutedTests
|
|
|
101
102
|
return "Treat the leading files as a subsystem neighborhood and verify the exact edit point before changing code.";
|
|
102
103
|
}
|
|
103
104
|
if (contextFiles[0]) {
|
|
105
|
+
const leading = contextFiles.find((file) => !file.reasons.includes("generated build artifact; maintained source counterpart exists")) ?? contextFiles[0];
|
|
104
106
|
return hasRoutedTests
|
|
105
|
-
? `Inspect ${
|
|
106
|
-
: `Inspect ${
|
|
107
|
+
? `Inspect ${leading.path} and its routed tests before editing.`
|
|
108
|
+
: `Inspect ${leading.path} before editing; no related test file was routed.`;
|
|
107
109
|
}
|
|
108
110
|
return "Add a concrete repository anchor and rerun FixMap.";
|
|
109
111
|
}
|
|
110
112
|
function groundIdentifier(repo, identifier) {
|
|
111
|
-
const definitionPattern = new RegExp(
|
|
112
|
-
const exactPattern = new RegExp(`(
|
|
113
|
+
const definitionPattern = new RegExp(`(?<![\\p{L}\\p{N}_$])(?:export\\s+)?(?:async\\s+)?(?:function\\s*\\*?\\s*|(?:const|let|var|class|interface|type|enum|def|fn|func|fun|struct|trait)\\s+)${escapeRegExp(identifier)}(?![\\p{L}\\p{N}_$])`, "u");
|
|
114
|
+
const exactPattern = new RegExp(`(?<![\\p{L}\\p{N}_$])${escapeRegExp(identifier)}(?![\\p{L}\\p{N}_$])`, "u");
|
|
113
115
|
const definitionFiles = repo.files
|
|
114
116
|
.filter((file) => definitionPattern.test(file.textSample))
|
|
115
117
|
.map((file) => file.path)
|
|
@@ -130,7 +132,7 @@ function groundIdentifier(repo, identifier) {
|
|
|
130
132
|
: groundPartialOrUnverifiedIdentifier(repo, identifier);
|
|
131
133
|
}
|
|
132
134
|
function groundPartialOrUnverifiedIdentifier(repo, identifier) {
|
|
133
|
-
const identifierParts =
|
|
135
|
+
const identifierParts = tokenizeIdentifier(identifier);
|
|
134
136
|
const partialFiles = repo.files
|
|
135
137
|
.filter((file) => hasDefinitionContainingTokens(file.textSample, identifierParts))
|
|
136
138
|
.map((file) => file.path)
|
|
@@ -151,13 +153,13 @@ function hasDefinitionContainingTokens(text, expectedTokens) {
|
|
|
151
153
|
if (expectedTokens.size < 2) {
|
|
152
154
|
return false;
|
|
153
155
|
}
|
|
154
|
-
const definitionPattern =
|
|
156
|
+
const definitionPattern = /(?<![\p{L}\p{N}_$])(?:export\s+)?(?:async\s+)?(?:function\s*\*?\s*|(?:const|let|var|class|interface|type|enum|def|fn|func|fun|struct|trait)\s+)([\p{L}_$][\p{L}\p{N}_$]*)(?![\p{L}\p{N}_$])/gu;
|
|
155
157
|
for (const match of text.matchAll(definitionPattern)) {
|
|
156
158
|
const name = match[1];
|
|
157
159
|
if (!name) {
|
|
158
160
|
continue;
|
|
159
161
|
}
|
|
160
|
-
const candidateTokens =
|
|
162
|
+
const candidateTokens = tokenizeIdentifier(name);
|
|
161
163
|
if ([...expectedTokens].every((token) => candidateTokens.has(token))) {
|
|
162
164
|
return true;
|
|
163
165
|
}
|
|
@@ -171,6 +173,9 @@ function isAnchorIdentifier(identifier, issueText) {
|
|
|
171
173
|
if (/[_$0-9]/.test(identifier)) {
|
|
172
174
|
return true;
|
|
173
175
|
}
|
|
176
|
+
if (!/^[\x00-\x7F]+$/.test(identifier)) {
|
|
177
|
+
return true;
|
|
178
|
+
}
|
|
174
179
|
if (/^[a-z][A-Za-z0-9_$]*[A-Z]/.test(identifier)) {
|
|
175
180
|
return true;
|
|
176
181
|
}
|
|
@@ -183,19 +188,19 @@ function isAnchorIdentifier(identifier, issueText) {
|
|
|
183
188
|
// an improvement — "improve the retry backoff so a 503 stops hammering the
|
|
184
189
|
// upstream host" — out of the vague bucket.
|
|
185
190
|
const MAX_RESIDUAL_TOKENS_FOR_VAGUE = 3;
|
|
186
|
-
function
|
|
191
|
+
export function isVagueTaskText(issueText) {
|
|
187
192
|
if (issueText.trim().length === 0 || !VAGUE_TASK_PATTERN.test(issueText)) {
|
|
188
193
|
return false;
|
|
189
194
|
}
|
|
195
|
+
if (/^\s*(?:please\s+)?(?:refactor|cleanup|clean\s+up)\s+(?:broke|breaks?|caused|causes|deleted?|deletes?|fails?|failed)\b/i.test(issueText)) {
|
|
196
|
+
return false;
|
|
197
|
+
}
|
|
190
198
|
const residual = tokenizeText(issueText.replace(VAGUE_TASK_TERMS, " "));
|
|
191
199
|
return residual.size <= MAX_RESIDUAL_TOKENS_FOR_VAGUE;
|
|
192
200
|
}
|
|
193
201
|
function removeIdentifiers(text, identifiers) {
|
|
194
202
|
return identifiers.reduce((current, identifier) => current.replace(new RegExp(escapeRegExp(identifier), "g"), " "), text);
|
|
195
203
|
}
|
|
196
|
-
function pathMatchesMention(path, mention) {
|
|
197
|
-
return path === mention || path.endsWith(`/${mention}`) || mention.endsWith(`/${path}`);
|
|
198
|
-
}
|
|
199
204
|
function escapeRegExp(value) {
|
|
200
205
|
return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
201
206
|
}
|
package/dist/grounding.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grounding.js","sourceRoot":"","sources":["../src/grounding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"grounding.js","sourceRoot":"","sources":["../src/grounding.ts"],"names":[],"mappings":"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"}
|