Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/commands/check.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,15 @@ export function registerCheckCommand(program: Command) {
process.exit(1);
}

const loadedAdrs = await loadRuleAdrs(projectRoot, opts.adr);
let loadedAdrs;
try {
loadedAdrs = await loadRuleAdrs(projectRoot, opts.adr);
} catch (err) {
logError(
err instanceof Error ? err.message : `Failed to load rules: ${err}`
);
process.exit(1);
}

if (loadedAdrs.length === 0) {
if (opts.json) {
Expand Down
40 changes: 17 additions & 23 deletions src/engine/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const RuleSetSchema = z.object({
})
),
});
import { logDebug, logWarn } from "../helpers/log";
import { logDebug } from "../helpers/log";
import { projectPaths } from "../helpers/paths";
import { ensureRulesShim } from "../helpers/rules-shim";

Expand Down Expand Up @@ -90,30 +90,24 @@ export async function loadRuleAdrs(
);
}

try {
// Cache-bust: Bun caches import() per-process, so append a timestamp
// to force re-reading from disk on every call (critical for repeated invocations).
// Use file:// URL to handle Windows backslash paths in import().
const rulesUrl = `${pathToFileURL(rulesFile).href}?t=${Date.now()}`;
const mod = await import(rulesUrl);
const parsed = RuleSetSchema.safeParse(mod.default);

if (!parsed.success) {
logWarn(
`ADR ${adr.frontmatter.id}: companion file does not export a valid RuleSet as default`
);
return null;
}

const ruleSet: RuleSet = parsed.data;
logDebug(
`Loaded ${Object.keys(ruleSet.rules).length} rules from ${adr.frontmatter.id}`
// Cache-bust: Bun caches import() per-process, so append a timestamp
// to force re-reading from disk on every call (critical for repeated invocations).
// Use file:// URL to handle Windows backslash paths in import().
const rulesUrl = `${pathToFileURL(rulesFile).href}?t=${Date.now()}`;
const mod = await import(rulesUrl);
const parsed = RuleSetSchema.safeParse(mod.default);

if (!parsed.success) {
throw new Error(
`ADR ${adr.frontmatter.id}: companion file does not export a valid RuleSet as default`
);
return { adr, ruleSet };
} catch (err) {
logWarn(`Failed to import rules for ${adr.frontmatter.id}: ${err}`);
return null;
}

const ruleSet: RuleSet = parsed.data;
logDebug(
`Loaded ${Object.keys(ruleSet.rules).length} rules from ${adr.frontmatter.id}`
);
return { adr, ruleSet };
})
);

Expand Down
Loading