@davesheffer/hunch 0.27.0 → 0.29.0

package/dist/cli/index.js

@@ -29,7 +29,8 @@ import { syncCommit, recordFailure, captureTestRun } from "../synthesis/synthesi
 import { parseTestReport } from "../extractors/testreport.js";
 import { selectProvider } from "../synthesis/provider.js";
 import { isGitRepo, headSha, logSince, lastChangeDate, stagedFiles, commitFiles, asOfDate, stagedDiff, commitDiff, rangeFiles, rangeDiff, rangeSubjects, revExists, commitAndPushHunch, gitUntrackCached } from "../extractors/git.js";
-import { runbookId } from "../core/ids.js";
+import { runbookId, decisionId } from "../core/ids.js";
+import { extractInlineIntent } from "../extractors/comments.js";
 import { renderText, renderMarkdown, reportFailsStrict } from "../core/checkreport.js";
 import { partitionReview, READY_MIN_GROUNDED } from "../core/reviewqueue.js";
 import { installPostCommitHook, installPreCommitHook } from "../integrations/hooks.js";
@@ -45,6 +46,7 @@ import { readConfig, writeConfig, FIRMNESS_LEVELS, isFirmness } from "../core/co
 import { blockingInScope, vetoInScope, proposedEditLines } from "../core/hookpolicy.js";
 import { loadGoldenSet, evaluateGraphLift } from "../eval/harness.js";
 import { computeDrift } from "../core/drift.js";
+import { compareCandidates } from "../core/compare.js";
 import { draftTripwires, knownRepoDeps } from "../synthesis/tripwires.js";
 import { constraintId } from "../core/ids.js";
 import { readManifest, writeManifest, SCHEMA_VERSION } from "../core/migrate.js";
@@ -535,6 +537,97 @@ program
     console.log(dim("  advisory, deterministic draft — refine the steps/gotchas; surfaced via `hunch query` and MCP."));
     store.close();
 });
+// ---- capture-comments (inline intent → graph; addendum #2) ----------------
+program
+    .command("capture-comments")
+    .description("Capture inline intent comments into the graph: `hunch-why:` → a decision, `hunch-rule:` → a file-scoped constraint. Deterministic + idempotent.")
+    .option("--private", "write captured records into the private overlay (HUNCH_PRIVATE_DIR)")
+    .action((opts) => {
+    const { store, root } = storeFor();
+    if (opts.private && !store.hasPrivate) {
+        store.close();
+        return fail("--private needs HUNCH_PRIVATE_DIR set to a private store");
+    }
+    const intents = extractInlineIntent(root);
+    const now = new Date().toISOString();
+    let dec = 0, con = 0;
+    for (const it of intents) {
+        const ev = [`${it.file}:${it.line}`];
+        if (it.kind === "why") {
+            const id = decisionId(`inline:${it.file}:${it.text}`);
+            const prev = store.recs("decisions").find((d) => d.id === id); // preserve window for idempotent re-capture
+            const rec = {
+                id, title: it.text, status: "accepted",
+                context: `Captured from an inline hunch-why comment (${it.file}:${it.line}).`,
+                decision: it.text, consequences: [], alternatives_rejected: [], rejected_tripwires: [],
+                related_components: [], related_files: [it.file], supersedes: null, superseded_by: null,
+                caused_by_bug: null, commit: null, valid_from: prev?.valid_from ?? now, valid_to: null,
+                retired: { symbols: [], deps: [] },
+                provenance: { source: "human_confirmed", confidence: 0.9, evidence: ev }, date: prev?.date ?? now,
+            };
+            if (opts.private)
+                store.putPrivate("decisions", rec);
+            else
+                store.json.put("decisions", rec);
+            dec++;
+        }
+        else {
+            const id = constraintId(`inline:${it.file}:${it.text}`);
+            const prev = store.recs("constraints").find((c) => c.id === id);
+            const rec = {
+                id, type: "correctness", statement: it.text, scope: [it.file],
+                // Advisory by default — an inline rule never auto-blocks a build; raise severity
+                // deliberately if you want enforcement. Keeps day-one zero false-positive rage.
+                severity: "warning", enforcement: "advisory_v1",
+                rationale: `Captured from an inline hunch-rule comment (${it.file}:${it.line}).`,
+                source_decision: null, violations: [], status: "active",
+                valid_from: prev?.valid_from ?? now, valid_to: null,
+                provenance: { source: "human_confirmed", confidence: 0.9, evidence: ev },
+            };
+            if (opts.private)
+                store.putPrivate("constraints", rec);
+            else
+                store.json.put("constraints", rec);
+            con++;
+        }
+    }
+    store.reindex();
+    if (!intents.length)
+        console.log("No `hunch-why:` / `hunch-rule:` comments found.");
+    else
+        console.log(`✓ captured ${dec} decision(s) + ${con} constraint(s) from inline comments${opts.private ? " [private overlay]" : ""}`);
+    store.close();
+});
+// ---- compare (rank N candidate solutions by architectural fit) ------------
+program
+    .command("compare")
+    .description("Rank candidate branches/commits by how well each fits the architecture — deterministic merge-verdict over the graph (the 'evaluate 5 solutions' check).")
+    .argument("<candidates...>", "refs to compare (branches or commits), e.g. feat-a feat-b feat-c")
+    .option("--base <ref>", "base to diff each candidate against (3-dot, since merge-base)", "main")
+    .action((candidates, opts) => {
+    const { store, root } = storeFor();
+    if (!isGitRepo(root)) {
+        store.close();
+        return fail("compare needs a git repo");
+    }
+    if (!revExists(opts.base, root)) {
+        store.close();
+        return fail(`base ref "${opts.base}" not found (pass --base <ref>)`);
+    }
+    store.reindex();
+    const ranked = compareCandidates(store, root, opts.base, candidates);
+    const icon = (v) => (v === "pass" ? "✅" : v === "warn" ? "⚠️ " : "⛔");
+    console.log(`Candidates vs ${opts.base} — best architectural fit first:\n`);
+    ranked.forEach((c, i) => {
+        if (c.error) {
+            console.log(`  ${i + 1}. ${c.ref} — ${c.error}`);
+            return;
+        }
+        const best = i === 0 ? dim("  ← best fit") : "";
+        console.log(`  ${i + 1}. ${icon(c.verdict)} ${c.ref}  [${c.verdict}]  ${c.blocking} blocking · ${c.direct} direct · ${c.near} near · ${c.vetoes} veto · ${c.redundant} redundant  (${c.files} files)${best}`);
+    });
+    store.close();
+});
 // ---- embed (opt-in semantic search) ---------------------------------------
 program
     .command("embed")

package/dist/core/compare.js

@@ -0,0 +1,35 @@
+import { verdict } from "./checkreport.js";
+import { revExists, rangeFiles, rangeDiff } from "../extractors/git.js";
+/** A lower fit score is better. Verdict dominates (pass < warn < block), then the
+ *  blocking count, then total advisory hits. Errored candidates sort last. */
+function fitKey(c) {
+    const tier = c.error ? 9 : c.verdict === "pass" ? 0 : c.verdict === "warn" ? 1 : 2;
+    return [tier, c.blocking, c.direct + c.near + c.vetoes + c.redundant];
+}
+export function compareCandidates(store, root, base, candidates) {
+    const results = candidates.map((ref) => {
+        const zero = { ref, verdict: "block", blocking: 0, direct: 0, near: 0, vetoes: 0, redundant: 0, files: 0 };
+        if (!revExists(ref, root))
+            return { ...zero, error: `ref "${ref}" not found` };
+        const files = rangeFiles(base, root, ref);
+        if (!files.length)
+            return { ...zero, verdict: "pass", error: `no changes vs ${base}` };
+        const r = store.buildCheckReport(files, rangeDiff(base, root, ref), { strict: true });
+        return {
+            ref,
+            verdict: verdict(r),
+            blocking: r.strictBlockers + r.regBlocking + r.vetoBlocking,
+            direct: r.direct.length,
+            near: r.near.length,
+            vetoes: r.vetoes.length,
+            redundant: r.redundant.length,
+            files: files.length,
+        };
+    });
+    return results.sort((a, b) => {
+        const [at, ab, ah] = fitKey(a);
+        const [bt, bb, bh] = fitKey(b);
+        return at - bt || ab - bb || ah - bh;
+    });
+}
+//# sourceMappingURL=compare.js.map

package/dist/extractors/comments.js

@@ -0,0 +1,75 @@
+/**
+ * Inline intent capture (roadmap addendum #2). A developer marks intent right where
+ * it lives in the code — `hunch-why: <reason>` (in a comment → a Decision) or
+ * `hunch-rule: <invariant>` (→ a file-scoped Constraint) — and Hunch lifts it into
+ * the graph, deterministically. The third capture source alongside commit synthesis and
+ * correction capture. The tag must follow a comment marker (the slash pair, #, *, --,
+ * <!--, ;) so a matching STRING literal in code isn't mistaken for intent. (Line-based,
+ * so a tagged line that is itself a string literal can still false-positive — advisory.)
+ */
+import { readFileSync, readdirSync } from "node:fs";
+import { join } from "node:path";
+import { trackedFiles } from "./git.js";
+import { toPosixTarget } from "../core/paths.js";
+const EXTS = [
+    ".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs",
+    ".py", ".go", ".rb", ".java", ".rs", ".php", ".cs", ".kt", ".swift", ".scala",
+    ".c", ".h", ".cc", ".cpp", ".hpp", ".sql", ".sh",
+];
+const SKIP = new Set(["node_modules", ".git", ".hunch", ".hunch-private", "dist", "build", "out", "vendor", ".next"]);
+const TAG = /(?:\/\/|#|\*|--|<!--|;)\s*hunch-(why|rule)\s*:\s*(.+?)\s*(?:\*\/|-->|$)/i;
+/** Tracked source files (git ls-files); falls back to a bounded walk outside git. */
+function sourceFiles(root) {
+    const tracked = trackedFiles(root, EXTS);
+    if (tracked.length)
+        return tracked;
+    const out = [];
+    const walk = (dir, rel, depth) => {
+        if (depth > 8)
+            return;
+        let entries;
+        try {
+            entries = readdirSync(dir, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        for (const e of entries) {
+            if (e.name.startsWith("."))
+                continue;
+            const r = rel ? `${rel}/${e.name}` : e.name;
+            if (e.isDirectory()) {
+                if (!SKIP.has(e.name))
+                    walk(join(dir, e.name), r, depth + 1);
+            }
+            else if (EXTS.some((x) => e.name.endsWith(x))) {
+                out.push(r);
+            }
+        }
+    };
+    walk(root, "", 0);
+    return out;
+}
+export function extractInlineIntent(root) {
+    const out = [];
+    for (const rel of sourceFiles(root)) {
+        let content;
+        try {
+            content = readFileSync(join(root, rel), "utf8");
+        }
+        catch {
+            continue;
+        }
+        if (!content.includes("hunch-"))
+            continue; // cheap skip before the per-line scan
+        const file = toPosixTarget(rel);
+        const lines = content.split("\n");
+        for (let i = 0; i < lines.length; i++) {
+            const m = TAG.exec(lines[i]);
+            if (m)
+                out.push({ kind: m[1].toLowerCase(), text: m[2].trim(), file, line: i + 1 });
+        }
+    }
+    return out;
+}
+//# sourceMappingURL=comments.js.map

package/dist/integrations/claudemd.js

@@ -33,6 +33,7 @@ export function renderHunchSection(store) {
     lines.push("- `hunch_bug_lineage(symptom_or_symbol)` — has this bug happened before? what was the root cause?");
     lines.push("- `hunch_query(query)` — free-text search across all of Hunch.");
     lines.push("- `hunch_runbook(task)` — the proven steps for a recurring task (e.g. \"add an MCP tool\", \"cut a release\").");
+    lines.push("- `hunch_compare(candidates)` — rank N candidate branches/commits by architectural fit (fewest invariant hits).");
     lines.push("- `hunch_record_decision(...)` — write back a decision after a non-trivial choice.");
     if (constraints.length) {
         lines.push("");

package/dist/mcp/server.js

@@ -16,6 +16,7 @@ import { decisionId } from "../core/ids.js";
 import { buildCorrectionConstraint } from "../core/correction.js";
 import { revParse, asOfDate, revExists, lastChangeDate, rangeFiles, rangeDiff, commitFiles, commitDiff, stagedFiles, stagedDiff, commitAndPushHunch } from "../extractors/git.js";
 import { formatContext } from "../core/format.js";
+import { compareCandidates } from "../core/compare.js";
 import { renderMarkdown, verdict } from "../core/checkreport.js";
 import { HUNCH_VERSION } from "../core/version.js";
 const ok = (text) => ({ content: [{ type: "text", text }] });
@@ -407,6 +408,33 @@ export function buildServer(root) {
             return err(`Failed to compute merge verdict: ${e.message}`);
         }
     });
+    // -- hunch_compare --------------------------------------------------------
+    server.registerTool("hunch_compare", {
+        title: "Rank candidate solutions by architectural fit",
+        description: "Given several candidate branches/commits (e.g. N solutions to one task), replay each against engineering memory and RANK them best-fit first — the candidate that trips the fewest in-force invariants, reverses no decisions, and adds the least sprawl wins. Deterministic (the same merge-verdict per candidate, no LLM). Use to choose among multiple solutions before committing to one.",
+        inputSchema: {
+            candidates: z.array(z.string()).describe("Refs to compare — branches or commits, e.g. ['feat-a','feat-b','feat-c']."),
+            base: z.string().optional().describe("Base to diff each candidate against (3-dot; default: main)."),
+        },
+    }, async ({ candidates, base }) => {
+        try {
+            const b = base ?? "main";
+            if (!candidates.length)
+                return err("Pass at least one candidate ref.");
+            if (!revExists(b, root))
+                return err(`base ref "${b}" does not resolve (in CI, fetch it first).`);
+            const ranked = compareCandidates(store, root, b, candidates);
+            const icon = (v) => (v === "pass" ? "✅" : v === "warn" ? "⚠" : "⛔");
+            const lines = ranked.map((c, i) => c.error
+                ? `${i + 1}. ${c.ref} — ${c.error}`
+                : `${i + 1}. ${icon(c.verdict)} ${c.ref} [${c.verdict}] — ${c.blocking} blocking · ${c.direct} direct · ${c.near} near · ${c.vetoes} veto · ${c.redundant} redundant (${c.files} files)`);
+            const best = ranked.find((c) => !c.error);
+            return ok(`Candidates vs ${b}, best architectural fit first:\n\n${lines.join("\n")}${best ? `\n\nBest fit: ${best.ref}` : ""}`);
+        }
+        catch (e) {
+            return err(`Failed to compare candidates: ${e.message}`);
+        }
+    });
     return server;
 }
 function provLine(record) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@davesheffer/hunch",
-  "version": "0.27.0",
+  "version": "0.29.0",
   "license": "Apache-2.0",
   "author": "Dave Sheffer <dave.sheffer1@gmail.com>",
   "description": "Hunch — an Engineering Memory OS: a persistent, git-native reasoning graph over a codebase, exposed to Claude Code via MCP.",