mirror of
https://github.com/expo/code-review-cli.git
synced 2026-11-13 20:28:06 -10:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6e08db4568 |
No files matched your search
@@ -70,9 +70,9 @@ excludes) — see [the mixed setup](#other-providers) below. Prefer
|
||||
# Review working-tree changes; prints here, posts nothing
|
||||
ecr review
|
||||
# Review a GitHub PR by number (preview only)
|
||||
ecr review --pr 4057
|
||||
ecr review --pr 123
|
||||
# …and post it as the PR comment
|
||||
ecr review --pr 4057 --post
|
||||
ecr review --pr 123 --post
|
||||
```
|
||||
|
||||
Options (most to least common):
|
||||
@@ -141,9 +141,9 @@ your-monorepo/
|
||||
routing.jsonc # the manifest — infra-owned, ordered scope list + locked defaults
|
||||
config.jsonc # the default/root scope; the ONLY place auth/tokenEnv lives
|
||||
shared.md coordinator.md agents/
|
||||
server/
|
||||
www/.expo-code-review/{config.jsonc(NO auth),coordinator.md,agents/} # www team
|
||||
website/.expo-code-review/{config.jsonc(NO auth),coordinator.md,agents/} # website team
|
||||
apps/
|
||||
api/.expo-code-review/{config.jsonc(NO auth),coordinator.md,agents/} # api team
|
||||
web/.expo-code-review/{config.jsonc(NO auth),coordinator.md,agents/} # web team
|
||||
.github/workflows/expo-code-review.yml # unchanged shape: one workflow, one `ecr ci`
|
||||
```
|
||||
|
||||
@@ -160,21 +160,21 @@ your-monorepo/
|
||||
"comment": "single", // "single" = one aggregated comment (default) | "per-scope"
|
||||
// Ordered; the LAST matching scope wins per changed file (CODEOWNERS discipline).
|
||||
"scopes": [
|
||||
{ "name": "default", "paths": ["**/*"], "config": "." },
|
||||
{ "name": "server-www", "paths": ["server/www/**"], "config": "server/www" },
|
||||
{ "name": "server-website", "paths": ["server/website/**"], "config": "server/website" }
|
||||
{ "name": "default", "paths": ["**/*"], "config": "." },
|
||||
{ "name": "apps-api", "paths": ["apps/api/**"], "config": "apps/api" },
|
||||
{ "name": "apps-web", "paths": ["apps/web/**"], "config": "apps/web" }
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
```jsonc
|
||||
// server/www/.expo-code-review/config.jsonc (the www team owns this)
|
||||
// apps/api/.expo-code-review/config.jsonc (the api team owns this)
|
||||
{
|
||||
// NO "auth" block — locked centrally; a tokenEnv here is rejected by loader + CI guard.
|
||||
"model": "openai/gpt-5.5",
|
||||
"policy": { "includeSuggestions": false },
|
||||
"noise": { "additionalIgnores": ["server/www/**/__generated__/**"] }
|
||||
// shared.md, coordinator.md, agents/*.md live beside this file — the www team's roster.
|
||||
"noise": { "additionalIgnores": ["apps/api/**/__generated__/**"] }
|
||||
// shared.md, coordinator.md, agents/*.md live beside this file — the api team's roster.
|
||||
}
|
||||
```
|
||||
|
||||
@@ -248,7 +248,7 @@ your-monorepo/
|
||||
security warning and will be removed on a minor boundary.
|
||||
|
||||
Ownership is enforced with CODEOWNERS: `/.expo-code-review/routing.jsonc @your-infra`
|
||||
(the single authoritative router) and `/server/www/.expo-code-review/ @your-www-team`
|
||||
(the single authoritative router) and `/apps/api/.expo-code-review/ @your-api-team`
|
||||
(each team owns only its own scope dir). Rerouting globs is gated behind infra review.
|
||||
|
||||
---
|
||||
@@ -544,7 +544,7 @@ highest-value part — "repeat offenders": findings whose title recurred across
|
||||
PRs and drew a reply every single time.
|
||||
|
||||
```bash
|
||||
ecr feedback --repo expo/eas-cli --limit 100 --since 2026-06-01
|
||||
ecr feedback --repo your-org/your-repo --limit 100 --since 2026-06-01
|
||||
ecr feedback --as my-review-bot # if CI posts under a PAT/app identity
|
||||
ecr feedback --json # for scripting
|
||||
```
|
||||
|
||||
@@ -133,33 +133,33 @@ test("a carried-over scope (partial --scopes run) not in `results` keeps its pri
|
||||
});
|
||||
|
||||
test("a stale per-scope feedback copy on a carried-over scope never overrides a newer top-level record (undismiss revert)", () => {
|
||||
// Finding stale-scope-feedback: a full run cleared finding F on scope www, storing
|
||||
// R1 (applied:true) both at the top level AND inside www's per-scope review.feedback.
|
||||
// Finding stale-scope-feedback: a full run cleared finding F on scope web, storing
|
||||
// R1 (applied:true) both at the top level AND inside web's per-scope review.feedback.
|
||||
// A human /undismiss rewrote ONLY the top-level record to R2 (applied:false, pinned).
|
||||
// A later `--scopes api` run carries www over via mergePartialAggregate — its review
|
||||
// A later `--scopes api` run carries web over via mergePartialAggregate — its review
|
||||
// still holds the stale R1. The merge must keep R2 (from `prior`), never re-inject R1.
|
||||
const wwwFinding = finding({ file: "www.ts", title: "Www issue" });
|
||||
const wwwFp = scopedFingerprint("www", wwwFinding);
|
||||
const webFinding = finding({ file: "web.ts", title: "Web issue" });
|
||||
const webFp = scopedFingerprint("web", webFinding);
|
||||
// Top-level prior state = the human-overridden record.
|
||||
const r2 = record({
|
||||
fp: wwwFp,
|
||||
fp: webFp,
|
||||
by: "author1",
|
||||
applied: false,
|
||||
unclearedByHuman: true,
|
||||
maintainer: true,
|
||||
});
|
||||
const prior = [r2];
|
||||
// This run freshly reviews only "api"; www is carried over and still embeds the
|
||||
// This run freshly reviews only "api"; web is carried over and still embeds the
|
||||
// stale R1 (applied:true, no pin) inside its per-scope review.feedback.
|
||||
const apiFinding = finding({ file: "api.ts", title: "Api issue" });
|
||||
const results = [seamOkScope("api", [apiFinding], [])];
|
||||
const staleR1 = record({ fp: wwwFp, by: "author1", applied: true, maintainer: true });
|
||||
const staleR1 = record({ fp: webFp, by: "author1", applied: true, maintainer: true });
|
||||
const finalResults: ScopeReviewResult[] = [
|
||||
...results,
|
||||
seamOkScope("www", [wwwFinding], [staleR1]),
|
||||
seamOkScope("web", [webFinding], [staleR1]),
|
||||
];
|
||||
const merged = mergeAggregateFeedback(results, finalResults, prior, feedbackConfig, HEAD_SHA);
|
||||
const kept = merged.find((r) => r.fp === wwwFp);
|
||||
const kept = merged.find((r) => r.fp === webFp);
|
||||
expect(kept).toBeDefined();
|
||||
// The human override survives: pinned and un-applied, not re-hidden by the stale copy.
|
||||
expect(kept!.unclearedByHuman).toBe(true);
|
||||
|
||||
@@ -47,7 +47,7 @@ test("resolveEngines: a scope selecting an anthropic model adds the Claude Code
|
||||
const root = await makeOpencodeRoot();
|
||||
// A nested scope pins an anthropic/… model — the scoped review needs the Claude
|
||||
// CLI/login even though the OpenCode-only root config never touches it.
|
||||
await writeConfigDir(path.join(root, "server", "www", CONFIG_DIRNAME), {
|
||||
await writeConfigDir(path.join(root, "apps", "api", CONFIG_DIRNAME), {
|
||||
config: '{ "model": "anthropic/claude-opus-5" }',
|
||||
agents: { style: agent("style") },
|
||||
});
|
||||
@@ -55,7 +55,7 @@ test("resolveEngines: a scope selecting an anthropic model adds the Claude Code
|
||||
path.join(root, CONFIG_DIRNAME, "routing.jsonc"),
|
||||
`{ "scopes": [
|
||||
{ "name": "default", "paths": ["**/*"], "config": "." },
|
||||
{ "name": "www", "paths": ["server/www/**"], "config": "server/www" }
|
||||
{ "name": "api", "paths": ["apps/api/**"], "config": "apps/api" }
|
||||
] }`,
|
||||
"utf8",
|
||||
);
|
||||
@@ -63,7 +63,7 @@ test("resolveEngines: a scope selecting an anthropic model adds the Claude Code
|
||||
const manifest = await loadRoutingManifest(root);
|
||||
const engines = await resolveEngines(root, rootConfig, manifest);
|
||||
// Without folding scopes in, this would be opencode-only and doctor would skip the
|
||||
// Claude CLI/login checks the www scope's review actually needs.
|
||||
// Claude CLI/login checks the api scope's review actually needs.
|
||||
expect(engines.has("claude-code")).toBe(true);
|
||||
expect(engines.has("opencode")).toBe(true);
|
||||
});
|
||||
|
||||
@@ -37,14 +37,14 @@ test("loadScopeConfig: nested scope inherits the ROOT feedback and stack config"
|
||||
}`,
|
||||
agents: { security: agent("security") },
|
||||
});
|
||||
await writeConfigDir(path.join(root, "server", "www", CONFIG_DIRNAME), {
|
||||
await writeConfigDir(path.join(root, "apps", "api", CONFIG_DIRNAME), {
|
||||
config: "{}",
|
||||
agents: { style: agent("style") },
|
||||
});
|
||||
const manifest = RoutingManifestSchema.parse({
|
||||
scopes: [
|
||||
{ name: "default", paths: ["**/*"], config: "." },
|
||||
{ name: "www", paths: ["server/www/**"], config: "server/www" },
|
||||
{ name: "api", paths: ["apps/api/**"], config: "apps/api" },
|
||||
],
|
||||
});
|
||||
const rootConfig = await loadReviewConfig(root);
|
||||
|
||||
@@ -52,7 +52,7 @@ test("worstDecision: picks the most severe across scopes", () => {
|
||||
test("aggregate: root marker first line, a table row + <details> per scope, worst decision at top", () => {
|
||||
const results = [
|
||||
scope("default", true, { decision: "approve", findings: [finding({ title: "D1" })] }),
|
||||
scope("www", false, {
|
||||
scope("api", false, {
|
||||
decision: "request_changes",
|
||||
findings: [finding({ title: "W1", severity: "critical", category: "security" })],
|
||||
}),
|
||||
@@ -62,22 +62,22 @@ test("aggregate: root marker first line, a table row + <details> per scope, wors
|
||||
expect(body).toContain("**Decision:** Request changes"); // worst across scopes
|
||||
expect(body).toContain("| Scope | Decision | Findings |");
|
||||
expect(body).toContain("| default | Approve | 1 |");
|
||||
expect(body).toContain("| www | Request changes | 1 |");
|
||||
expect(body).toContain("| api | Request changes | 1 |");
|
||||
// one details block per scope, in manifest order
|
||||
expect(body.indexOf("<summary>default")).toBeLessThan(body.indexOf("<summary>www"));
|
||||
expect((body.match(/<summary>(default|www) —/g) ?? []).length).toBe(2);
|
||||
expect(body.indexOf("<summary>default")).toBeLessThan(body.indexOf("<summary>api"));
|
||||
expect((body.match(/<summary>(default|api) —/g) ?? []).length).toBe(2);
|
||||
});
|
||||
|
||||
test("aggregate: default scope uses plain fingerprints, non-default uses scoped ids; embedded block is the union", () => {
|
||||
const dFinding = finding({ title: "D", evidence: "const defaultScopedThing = 1;" });
|
||||
const wFinding = finding({ title: "W", evidence: "const wwwScopedThing = 2;" });
|
||||
const wFinding = finding({ title: "W", evidence: "const apiScopedThing = 2;" });
|
||||
const results = [
|
||||
scope("default", true, { findings: [dFinding] }),
|
||||
scope("www", false, { findings: [wFinding] }),
|
||||
scope("api", false, { findings: [wFinding] }),
|
||||
];
|
||||
const body = renderAggregateMarkdown(results, "tag", []);
|
||||
const plainId = fingerprintFinding(dFinding);
|
||||
const scopedId = scopedFingerprint("www", wFinding);
|
||||
const scopedId = scopedFingerprint("api", wFinding);
|
||||
expect(body).toContain(`id:${plainId}`);
|
||||
expect(body).toContain(`id:${scopedId}`);
|
||||
const embedded = parseEmbeddedFingerprints(body, "tag");
|
||||
@@ -88,12 +88,12 @@ test("aggregate: default scope uses plain fingerprints, non-default uses scoped
|
||||
test("aggregate: state round-trips through parseReviewState (scopes intact); a v1 body still parses", () => {
|
||||
const results = [
|
||||
scope("default", true, { findings: [finding({ title: "D" })] }),
|
||||
scope("www", false, { findings: [finding({ title: "W" })] }),
|
||||
scope("api", false, { findings: [finding({ title: "W" })] }),
|
||||
];
|
||||
const body = renderAggregateMarkdown(results, "tag", []);
|
||||
const state = parseReviewState(body, "tag");
|
||||
expect(state).not.toBeNull();
|
||||
expect(state!.scopes?.map((s) => s.scope)).toEqual(["default", "www"]);
|
||||
expect(state!.scopes?.map((s) => s.scope)).toEqual(["default", "api"]);
|
||||
|
||||
// A pre-routing v1 comment still parses (no scopes field).
|
||||
const v1 = renderMarkdown(review({ findings: [finding()] }), "tag");
|
||||
@@ -117,8 +117,8 @@ test("aggregate: a default-scope finding dismissed pre-routing (plain fp) lands
|
||||
test("aggregate: dismissed findings survive in embedded state so /undismiss can restore them", () => {
|
||||
const dFinding = finding({ title: "DismissedOne", evidence: "const dismissedThing = 1;" });
|
||||
const kFinding = finding({ title: "KeptOne", evidence: "const keptThing = 2;" });
|
||||
const results = [scope("www", false, { findings: [dFinding, kFinding] })];
|
||||
const fp = scopedFingerprint("www", dFinding);
|
||||
const results = [scope("api", false, { findings: [dFinding, kFinding] })];
|
||||
const fp = scopedFingerprint("api", dFinding);
|
||||
const body = renderAggregateMarkdown(results, "tag", [{ fp, by: "me", reason: "known" }]);
|
||||
expect(body).toContain("Dismissed on this PR (1)");
|
||||
|
||||
@@ -132,7 +132,7 @@ test("aggregate: dismissed findings survive in embedded state so /undismiss can
|
||||
// (what /undismiss does) restores the finding to the active list.
|
||||
const restored = renderAggregateMarkdown(state.scopes!, "tag", []);
|
||||
expect(restored).toContain(`id:${fp}`);
|
||||
expect(restored).toContain("| www | Approve | 2 |");
|
||||
expect(restored).toContain("| api | Approve | 2 |");
|
||||
expect(restored).not.toContain("Dismissed on this PR");
|
||||
});
|
||||
|
||||
@@ -143,11 +143,11 @@ test("aggregate: a freshly-reviewed scope's per-scope feedback array is stripped
|
||||
// top-level feedback array is the single source of truth, so the per-scope copy must
|
||||
// not survive into the embedded state.
|
||||
const f = finding({ title: "F", evidence: "const perScopeFeedbackStrip = 1;" });
|
||||
const fp = scopedFingerprint("www", f);
|
||||
const fp = scopedFingerprint("api", f);
|
||||
const staleRecord = { fp, by: "octocat", commentId: 9, maintainer: true, applied: false };
|
||||
const results: ScopeReviewResult[] = [
|
||||
{
|
||||
scope: "www",
|
||||
scope: "api",
|
||||
isDefault: false,
|
||||
review: {
|
||||
decision: "approve",
|
||||
@@ -160,8 +160,8 @@ test("aggregate: a freshly-reviewed scope's per-scope feedback array is stripped
|
||||
];
|
||||
const body = renderAggregateMarkdown(results, "tag", [], undefined, undefined, [staleRecord]);
|
||||
const state = parseReviewState(body, "tag")!;
|
||||
const wwwScope = state.scopes!.find((s) => s.scope === "www")!;
|
||||
expect((wwwScope.review as { feedback?: unknown }).feedback).toBeUndefined();
|
||||
const apiScope = state.scopes!.find((s) => s.scope === "api")!;
|
||||
expect((apiScope.review as { feedback?: unknown }).feedback).toBeUndefined();
|
||||
// The record still rides the top-level feedback array (the single source of truth).
|
||||
expect(state.feedback).toHaveLength(1);
|
||||
});
|
||||
@@ -171,9 +171,9 @@ test("aggregate: a scope whose reply cleared every finding opens its fold (visib
|
||||
// and requalifiedAll are both empty. The fold must still open so the audit note is
|
||||
// visible, matching renderMarkdown and LLP 0010's visible-suppression rule.
|
||||
const f = finding({ title: "Cleared by reply", evidence: "const replyClearedThing = 1;" });
|
||||
const fp = scopedFingerprint("www", f);
|
||||
const fp = scopedFingerprint("api", f);
|
||||
const body = renderAggregateMarkdown(
|
||||
[scope("www", false, { findings: [f] })],
|
||||
[scope("api", false, { findings: [f] })],
|
||||
"tag",
|
||||
[],
|
||||
undefined,
|
||||
@@ -190,9 +190,9 @@ test("aggregate: a scope whose reply cleared every finding opens its fold (visib
|
||||
],
|
||||
);
|
||||
// The finding is suppressed (moved to Dismissed); the scope shows no active finding.
|
||||
expect(body).toContain("<summary>www — Approve (0)</summary>");
|
||||
expect(body).toContain("<summary>api — Approve (0)</summary>");
|
||||
// ...but the fold OPENS so the audit note is above-the-fold, not collapsed away.
|
||||
expect(body).toMatch(/<details open>\n<summary>www —/);
|
||||
expect(body).toMatch(/<details open>\n<summary>api —/);
|
||||
expect(body).toContain("have an author response");
|
||||
});
|
||||
|
||||
@@ -205,7 +205,7 @@ test('aggregate: oversized findings truncate with a "+N more" note and stay unde
|
||||
rationale: "x".repeat(300),
|
||||
}),
|
||||
);
|
||||
const results = [scope("www", false, { decision: "request_changes", findings: many })];
|
||||
const results = [scope("api", false, { decision: "request_changes", findings: many })];
|
||||
const body = renderAggregateMarkdown(results, "tag", []);
|
||||
expect(body.length).toBeLessThan(65_000);
|
||||
expect(body).toContain("more finding(s) — see the workflow log.");
|
||||
@@ -226,11 +226,11 @@ test("aggregate: unmatched files render as a coverage note", () => {
|
||||
// would silently release a restore no later run could recover.
|
||||
test("aggregate: the /undismiss pin set survives a render with no records and a truncating one", () => {
|
||||
const pinned = finding({ title: "Pinned", evidence: "const pinnedEvidence = 1;" });
|
||||
const pinnedFp = scopedFingerprint("www", pinned);
|
||||
const pinnedFp = scopedFingerprint("api", pinned);
|
||||
const pins = [{ fp: pinnedFp, commentId: 42 }];
|
||||
// No feedback record matched this run (the author edited the reply away).
|
||||
const plain = renderAggregateMarkdown(
|
||||
[scope("www", false, { findings: [pinned] })],
|
||||
[scope("api", false, { findings: [pinned] })],
|
||||
"tag",
|
||||
[],
|
||||
undefined,
|
||||
@@ -249,7 +249,7 @@ test("aggregate: the /undismiss pin set survives a render with no records and a
|
||||
}),
|
||||
);
|
||||
const big = renderAggregateMarkdown(
|
||||
[scope("www", false, { decision: "request_changes", findings: [pinned, ...many] })],
|
||||
[scope("api", false, { decision: "request_changes", findings: [pinned, ...many] })],
|
||||
"tag",
|
||||
[],
|
||||
undefined,
|
||||
|
||||
@@ -54,8 +54,8 @@ test("RoutingManifestSchema: rejects duplicate config dirs (after normalize)", (
|
||||
expect(() =>
|
||||
RoutingManifestSchema.parse({
|
||||
scopes: [
|
||||
{ name: "a", paths: ["x/**"], config: "server/www" },
|
||||
{ name: "b", paths: ["y/**"], config: "server/www/" },
|
||||
{ name: "a", paths: ["x/**"], config: "apps/api" },
|
||||
{ name: "b", paths: ["y/**"], config: "apps/api/" },
|
||||
],
|
||||
}),
|
||||
).toThrow(/duplicate scope config dir/);
|
||||
@@ -148,36 +148,36 @@ test("resolveScopes: single catch-all takes everything, unmatched empty", () =>
|
||||
test("resolveScopes: LAST matching scope wins", () => {
|
||||
const m = manifest([
|
||||
{ name: "default", paths: ["**/*"], config: "." },
|
||||
{ name: "www", paths: ["server/www/**"], config: "server/www" },
|
||||
{ name: "api", paths: ["apps/api/**"], config: "apps/api" },
|
||||
]);
|
||||
const r = resolveScopes(m, ["server/www/app.ts", "other.ts"]);
|
||||
expect(r.active.find((s) => s.name === "www")!.files).toEqual(["server/www/app.ts"]);
|
||||
const r = resolveScopes(m, ["apps/api/app.ts", "other.ts"]);
|
||||
expect(r.active.find((s) => s.name === "api")!.files).toEqual(["apps/api/app.ts"]);
|
||||
expect(r.active.find((s) => s.name === "default")!.files).toEqual(["other.ts"]);
|
||||
});
|
||||
|
||||
test("resolveScopes: reversing manifest order flips the winner", () => {
|
||||
const m = manifest([
|
||||
{ name: "www", paths: ["server/www/**"], config: "server/www" },
|
||||
{ name: "api", paths: ["apps/api/**"], config: "apps/api" },
|
||||
{ name: "default", paths: ["**/*"], config: "." },
|
||||
]);
|
||||
const r = resolveScopes(m, ["server/www/app.ts"]);
|
||||
expect(r.active.find((s) => s.name === "default")!.files).toEqual(["server/www/app.ts"]);
|
||||
expect(r.active.some((s) => s.name === "www")).toBe(false);
|
||||
const r = resolveScopes(m, ["apps/api/app.ts"]);
|
||||
expect(r.active.find((s) => s.name === "default")!.files).toEqual(["apps/api/app.ts"]);
|
||||
expect(r.active.some((s) => s.name === "api")).toBe(false);
|
||||
});
|
||||
|
||||
test("resolveScopes: reports overlaps with matched list + winner", () => {
|
||||
const m = manifest([
|
||||
{ name: "default", paths: ["**/*"], config: "." },
|
||||
{ name: "www", paths: ["server/www/**"], config: "server/www" },
|
||||
{ name: "api", paths: ["apps/api/**"], config: "apps/api" },
|
||||
]);
|
||||
const r = resolveScopes(m, ["server/www/app.ts"]);
|
||||
const r = resolveScopes(m, ["apps/api/app.ts"]);
|
||||
expect(r.overlaps).toEqual([
|
||||
{ file: "server/www/app.ts", matched: ["default", "www"], winner: "www" },
|
||||
{ file: "apps/api/app.ts", matched: ["default", "api"], winner: "api" },
|
||||
]);
|
||||
});
|
||||
|
||||
test("resolveScopes: no catch-all leaves unmatched files unrouted", () => {
|
||||
const m = manifest([{ name: "www", paths: ["server/www/**"], config: "server/www" }]);
|
||||
const m = manifest([{ name: "api", paths: ["apps/api/**"], config: "apps/api" }]);
|
||||
const r = resolveScopes(m, ["README.md"]);
|
||||
expect(r.active).toEqual([]);
|
||||
expect(r.unmatched).toEqual(["README.md"]);
|
||||
@@ -216,8 +216,8 @@ test("formatOwnerTable: one row per file, capped with a +N more tail", () => {
|
||||
|
||||
test("scopedCommentTag + marker isolation: root marker is NOT a substring of a scoped marker", () => {
|
||||
const root = "expo-ai-code-reviewer";
|
||||
const scoped = scopedCommentTag(root, "www");
|
||||
expect(scoped).toBe("expo-ai-code-reviewer:www");
|
||||
const scoped = scopedCommentTag(root, "api");
|
||||
expect(scoped).toBe("expo-ai-code-reviewer:api");
|
||||
expect(commentMarker(scoped).includes(commentMarker(root))).toBe(false);
|
||||
expect(commentMarker(root).includes(commentMarker(scoped))).toBe(false);
|
||||
});
|
||||
@@ -232,12 +232,12 @@ test("appendScopeEntry: inserts before the closing ] preserving comments", () =>
|
||||
]
|
||||
}`;
|
||||
const out = appendScopeEntry(raw, {
|
||||
name: "server-www",
|
||||
paths: ["server/www/**"],
|
||||
config: "server/www",
|
||||
name: "apps-api",
|
||||
paths: ["apps/api/**"],
|
||||
config: "apps/api",
|
||||
})!;
|
||||
expect(out).toContain("// keep me");
|
||||
expect(out).toContain('"name": "server-www"');
|
||||
expect(out).toContain('"name": "apps-api"');
|
||||
// Still valid JSON after stripping comments (comma inserted correctly).
|
||||
expect(() => RoutingManifestSchema.parse(JSON.parse(out.replace(/\/\/.*$/gm, "")))).not.toThrow();
|
||||
});
|
||||
@@ -249,9 +249,9 @@ test("appendScopeEntry: comma lands after the entry, not inside a trailing line
|
||||
]
|
||||
}`;
|
||||
const out = appendScopeEntry(raw, {
|
||||
name: "server-www",
|
||||
paths: ["server/www/**"],
|
||||
config: "server/www",
|
||||
name: "apps-api",
|
||||
paths: ["apps/api/**"],
|
||||
config: "apps/api",
|
||||
})!;
|
||||
expect(out).toContain('"config": "." }, // the default scope');
|
||||
// Still valid JSON after stripping comments (comma NOT swallowed by the comment).
|
||||
@@ -265,15 +265,15 @@ test("appendScopeEntry: handles a trailing comma plus block comment after the la
|
||||
{ "name": "default", "paths": ["**/*"], "config": "." }, /* keep */
|
||||
]
|
||||
}`;
|
||||
const out = appendScopeEntry(raw, { name: "www", paths: ["www/**"], config: "www" })!;
|
||||
const out = appendScopeEntry(raw, { name: "api", paths: ["api/**"], config: "api" })!;
|
||||
// No double comma; still parses after stripping both comment styles.
|
||||
const stripped = stripTrailingCommas(stripJsonComments(out));
|
||||
expect(() => RoutingManifestSchema.parse(JSON.parse(stripped))).not.toThrow();
|
||||
});
|
||||
|
||||
test("appendScopeEntry: idempotent on an already-present name", () => {
|
||||
const raw = `{ "scopes": [ { "name": "www", "paths": ["www/**"], "config": "www" } ] }`;
|
||||
expect(appendScopeEntry(raw, { name: "www", paths: ["www/**"], config: "www" })).toBe(raw);
|
||||
const raw = `{ "scopes": [ { "name": "api", "paths": ["api/**"], "config": "api" } ] }`;
|
||||
expect(appendScopeEntry(raw, { name: "api", paths: ["api/**"], config: "api" })).toBe(raw);
|
||||
});
|
||||
|
||||
test("appendScopeEntry: returns null when there is no scopes array", () => {
|
||||
@@ -303,8 +303,8 @@ test("scopedFingerprint: null scope === fingerprintFinding (BACKCOMPAT carry-ove
|
||||
test("scopedFingerprint: scoped ids are hex-only, same length, and differ per scope", () => {
|
||||
const f = finding();
|
||||
const plain = fingerprintFinding(f);
|
||||
const a = scopedFingerprint("www", f);
|
||||
const b = scopedFingerprint("website", f);
|
||||
const a = scopedFingerprint("api", f);
|
||||
const b = scopedFingerprint("web", f);
|
||||
expect(a).toMatch(/^[a-f0-9]+$/);
|
||||
expect(a.length).toBe(plain.length);
|
||||
expect(a).not.toBe(plain);
|
||||
|
||||
@@ -93,22 +93,22 @@ test("loadScopeConfig: config '.' reuses the root config, auth from loadAuthFrom
|
||||
|
||||
test("loadScopeConfig: nested scope reads its own roster/prompts; auth forced from root", async () => {
|
||||
const root = await makeRoot('{ "auth": { "mode": "oauth", "tokenEnv": "ROOT_TOKEN" } }');
|
||||
await writeConfigDir(path.join(root, "server", "www", CONFIG_DIRNAME), {
|
||||
await writeConfigDir(path.join(root, "apps", "api", CONFIG_DIRNAME), {
|
||||
// No auth here; scope-specific model + noise override the root.
|
||||
config:
|
||||
'{ "model": "anthropic/claude-opus-5", "noise": { "additionalIgnores": ["www/gen/**"] } }',
|
||||
'{ "model": "anthropic/claude-opus-5", "noise": { "additionalIgnores": ["api/gen/**"] } }',
|
||||
agents: { style: agent("style") },
|
||||
});
|
||||
const manifest = manifestOf({
|
||||
scopes: [
|
||||
{ name: "default", paths: ["**/*"], config: "." },
|
||||
{ name: "www", paths: ["server/www/**"], config: "server/www" },
|
||||
{ name: "api", paths: ["apps/api/**"], config: "apps/api" },
|
||||
],
|
||||
});
|
||||
const rootConfig = await loadReviewConfig(root);
|
||||
const scoped = await loadScopeConfig(root, manifest.scopes[1]!, manifest, rootConfig);
|
||||
expect(scoped.agents.some((a) => a.id === "style")).toBe(true);
|
||||
expect(scoped.noise.additionalIgnores).toEqual(["www/gen/**"]);
|
||||
expect(scoped.noise.additionalIgnores).toEqual(["api/gen/**"]);
|
||||
expect(scoped.agents.find((a) => a.id === "style")!.model).toBe("anthropic/claude-opus-5");
|
||||
// auth is forced from the root even though the scope config declares none.
|
||||
expect(scoped.auth[0]?.tokenEnv).toBe("ROOT_TOKEN");
|
||||
@@ -159,13 +159,13 @@ test("loadAuthFromRoot: manifest with defaults but no auth key keeps the root au
|
||||
|
||||
test("loadScopeConfig: enforceAgents injects the ROOT agent with alwaysRun", async () => {
|
||||
const root = await makeRoot();
|
||||
await writeConfigDir(path.join(root, "www", CONFIG_DIRNAME), {
|
||||
await writeConfigDir(path.join(root, "api", CONFIG_DIRNAME), {
|
||||
config: "{}",
|
||||
agents: { style: agent("style") }, // no security
|
||||
});
|
||||
const manifest = manifestOf({
|
||||
defaults: { enforceAgents: ["security"] },
|
||||
scopes: [{ name: "www", paths: ["www/**"], config: "www" }],
|
||||
scopes: [{ name: "api", paths: ["api/**"], config: "api" }],
|
||||
});
|
||||
const rootConfig = await loadReviewConfig(root);
|
||||
const scoped = await loadScopeConfig(root, manifest.scopes[0]!, manifest, rootConfig);
|
||||
@@ -177,14 +177,14 @@ test("loadScopeConfig: enforceAgents injects the ROOT agent with alwaysRun", asy
|
||||
|
||||
test("loadScopeConfig: a scope shadowing the enforced id gets the ROOT version (risk 11)", async () => {
|
||||
const root = await makeRoot();
|
||||
await writeConfigDir(path.join(root, "www", CONFIG_DIRNAME), {
|
||||
await writeConfigDir(path.join(root, "api", CONFIG_DIRNAME), {
|
||||
config: "{}",
|
||||
// The scope defines its OWN weaker security agent — must be overridden.
|
||||
agents: { security: agent("weak-security", ""), style: agent("style") },
|
||||
});
|
||||
const manifest = manifestOf({
|
||||
defaults: { enforceAgents: ["security"] },
|
||||
scopes: [{ name: "www", paths: ["www/**"], config: "www" }],
|
||||
scopes: [{ name: "api", paths: ["api/**"], config: "api" }],
|
||||
});
|
||||
const rootConfig = await loadReviewConfig(root);
|
||||
const scoped = await loadScopeConfig(root, manifest.scopes[0]!, manifest, rootConfig);
|
||||
@@ -231,12 +231,12 @@ test("config-dir override composes: root config + routing.jsonc from override, s
|
||||
path.join(root, "altroot", "routing.jsonc"),
|
||||
`{ "scopes": [
|
||||
{ "name": "default", "paths": ["**/*"], "config": "." },
|
||||
{ "name": "www", "paths": ["server/www/**"], "config": "server/www" }
|
||||
{ "name": "api", "paths": ["apps/api/**"], "config": "apps/api" }
|
||||
] }`,
|
||||
"utf8",
|
||||
);
|
||||
// The scope subtree lives at the REPO ROOT, not under the override dir.
|
||||
await writeConfigDir(path.join(root, "server", "www", CONFIG_DIRNAME), {
|
||||
await writeConfigDir(path.join(root, "apps", "api", CONFIG_DIRNAME), {
|
||||
config: '{ "model": "anthropic/claude-opus-5" }',
|
||||
agents: { style: agent("style") },
|
||||
});
|
||||
@@ -244,7 +244,7 @@ test("config-dir override composes: root config + routing.jsonc from override, s
|
||||
// routing.jsonc is read from the override dir (the default tree's is absent).
|
||||
const manifest = await loadRoutingManifest(root, { configDir: "altroot" });
|
||||
expect(manifest).not.toBeNull();
|
||||
expect(manifest!.scopes.map((s) => s.name)).toEqual(["default", "www"]);
|
||||
expect(manifest!.scopes.map((s) => s.name)).toEqual(["default", "api"]);
|
||||
|
||||
// The root config artifacts follow the override.
|
||||
const rootConfig = await loadReviewConfig(root, { configDir: "altroot" });
|
||||
@@ -254,11 +254,11 @@ test("config-dir override composes: root config + routing.jsonc from override, s
|
||||
const def = await loadScopeConfig(root, manifest!.scopes[0]!, manifest!, rootConfig);
|
||||
expect(def.commentTag).toBe("alt-root-tag");
|
||||
|
||||
// The nested scope is still resolved from the repo root (server/www), NOT the
|
||||
// The nested scope is still resolved from the repo root (apps/api), NOT the
|
||||
// override dir — the override must not relocate the scopes themselves.
|
||||
const www = await loadScopeConfig(root, manifest!.scopes[1]!, manifest!, rootConfig);
|
||||
expect(www.agents.some((a) => a.id === "style")).toBe(true);
|
||||
expect(www.agents.find((a) => a.id === "style")!.model).toBe("anthropic/claude-opus-5");
|
||||
const api = await loadScopeConfig(root, manifest!.scopes[1]!, manifest!, rootConfig);
|
||||
expect(api.agents.some((a) => a.id === "style")).toBe(true);
|
||||
expect(api.agents.find((a) => a.id === "style")!.model).toBe("anthropic/claude-opus-5");
|
||||
});
|
||||
|
||||
test("loadReviewConfig: ECR_CONFIG_DIR loads from the alternate dir; unset → .expo-code-review (BACKCOMPAT)", async () => {
|
||||
|
||||
@@ -43,7 +43,7 @@ test("refuses a scope config that declares auth", async () => {
|
||||
await put(root, `${CONFIG_DIRNAME}/config.jsonc`, `{ "auth": { "tokenEnv": "${EXPECTED}" } }`);
|
||||
await put(
|
||||
root,
|
||||
`server/www/${CONFIG_DIRNAME}/config.jsonc`,
|
||||
`apps/api/${CONFIG_DIRNAME}/config.jsonc`,
|
||||
`{ "model": "anthropic/claude-sonnet-5", "auth": { "mode": "api-key", "tokenEnv": "SNEAKY" } }`,
|
||||
);
|
||||
const result = await verifyConfig(root, { expected: EXPECTED });
|
||||
@@ -56,7 +56,7 @@ test("refuses a scope config that declares breakGlass", async () => {
|
||||
await put(root, `${CONFIG_DIRNAME}/config.jsonc`, `{ "auth": { "tokenEnv": "${EXPECTED}" } }`);
|
||||
await put(
|
||||
root,
|
||||
`server/www/${CONFIG_DIRNAME}/config.jsonc`,
|
||||
`apps/api/${CONFIG_DIRNAME}/config.jsonc`,
|
||||
`{ "model": "anthropic/claude-sonnet-5", "breakGlass": { "marker": "override-me" } }`,
|
||||
);
|
||||
const result = await verifyConfig(root, { expected: EXPECTED });
|
||||
@@ -69,7 +69,7 @@ test("refuses a scope config that declares commentTag", async () => {
|
||||
await put(root, `${CONFIG_DIRNAME}/config.jsonc`, `{ "auth": { "tokenEnv": "${EXPECTED}" } }`);
|
||||
await put(
|
||||
root,
|
||||
`server/www/${CONFIG_DIRNAME}/config.jsonc`,
|
||||
`apps/api/${CONFIG_DIRNAME}/config.jsonc`,
|
||||
`{ "model": "anthropic/claude-sonnet-5", "commentTag": "impostor-tag" }`,
|
||||
);
|
||||
const result = await verifyConfig(root, { expected: EXPECTED });
|
||||
@@ -156,7 +156,7 @@ test("refuses a tokenEnv declared only in a non-root file", async () => {
|
||||
await put(root, `${CONFIG_DIRNAME}/config.jsonc`, `{ "model": "anthropic/claude-sonnet-5" }`);
|
||||
await put(
|
||||
root,
|
||||
`server/www/${CONFIG_DIRNAME}/config.jsonc`,
|
||||
`apps/api/${CONFIG_DIRNAME}/config.jsonc`,
|
||||
`{ "auth": { "tokenEnv": "${EXPECTED}" } }`,
|
||||
);
|
||||
const result = await verifyConfig(root, { expected: EXPECTED });
|
||||
|
||||
Reference in new issue
Block a user