lemmascript 0.1.0 → 0.3.0

package/tools/dist/ir.js

@@ -1,7 +1,7 @@
 /**
- * Lean IR — the intermediate representation between transform and emit.
+ * IR — the intermediate representation between transform and emit.
  *
  * The transform phase produces these types.
- * The emit phase pretty-prints them to Lean syntax.
+ * The emit phase pretty-prints them to backend syntax (Lean or Dafny).
  */
 export {};

package/tools/dist/lean-commands.js

@@ -0,0 +1,35 @@
+/**
+ * Lean backend commands: gen, check.
+ */
+import { existsSync, writeFileSync } from "fs";
+import { execSync } from "child_process";
+import path from "path";
+export function leanGen(typesPath, defPath, typesText, defText) {
+    if (typesPath && typesText) {
+        writeFileSync(typesPath, typesText);
+        console.log(`Generated: ${typesPath}`);
+    }
+    writeFileSync(defPath, defText);
+    console.log(`Generated: ${defPath}`);
+}
+export function leanCheck(dir, base) {
+    let lakeDir = dir;
+    while (lakeDir !== path.dirname(lakeDir)) {
+        if (existsSync(path.join(lakeDir, "lakefile.lean")))
+            break;
+        lakeDir = path.dirname(lakeDir);
+    }
+    const proofPath = path.join(dir, `${base}.proof.lean`);
+    if (!existsSync(proofPath)) {
+        console.error(`No proof file: ${proofPath}`);
+        return false;
+    }
+    console.log("Running lake build...");
+    try {
+        execSync(`lake build`, { cwd: lakeDir, stdio: "inherit" });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/tools/dist/lean-emit.js

@@ -0,0 +1,397 @@
+/**
+ * Lean emitter — IR → Lean text.
+ * No logic, no type decisions — just serialization.
+ */
+// ── Ty → Lean type string ──────────────────────────────────
+function tyToLean(ty) {
+    switch (ty.kind) {
+        case "nat": return "Nat";
+        case "int": return "Int";
+        case "real": return "Float"; // Lean doesn't have exact reals; Float is approximate
+        case "bool": return "Bool";
+        case "string": return "String";
+        case "void": return "Unit";
+        case "array": {
+            const elem = tyToLean(ty.elem);
+            return elem.includes(" ") ? `Array (${elem})` : `Array ${elem}`;
+        }
+        case "map": {
+            const k = tyToLean(ty.key);
+            const v = tyToLean(ty.value);
+            const kStr = k.includes(" ") ? `(${k})` : k;
+            const vStr = v.includes(" ") ? `(${v})` : v;
+            return `Std.HashMap ${kStr} ${vStr}`;
+        }
+        case "set": {
+            const elem = tyToLean(ty.elem);
+            return elem.includes(" ") ? `Std.HashSet (${elem})` : `Std.HashSet ${elem}`;
+        }
+        case "optional": {
+            const inner = tyToLean(ty.inner);
+            return inner.includes(" ") ? `Option (${inner})` : `Option ${inner}`;
+        }
+        case "user": return ty.name;
+        case "unknown": return "_";
+    }
+}
+// ── Lean keyword escaping ────────────────────────────────────
+const LEAN_KEYWORDS = new Set([
+    "def", "theorem", "lemma", "example", "structure", "class", "instance",
+    "inductive", "where", "match", "with", "if", "then", "else", "do",
+    "let", "mut", "return", "for", "in", "while", "break", "continue",
+    "import", "open", "section", "namespace", "end", "set_option",
+    "variable", "axiom", "constant", "private", "protected", "noncomputable",
+    "partial", "unsafe", "macro", "syntax", "by", "fun", "have", "show",
+    "at", "from", "to", "deriving", "extends", "true", "false",
+]);
+function escapeName(name) {
+    return LEAN_KEYWORDS.has(name) ? `«${name}»` : name;
+}
+// ── Operator precedence (for parenthesization) ──────────────
+const PREC = {
+    "→": 1, "∨": 2, "∧": 3,
+    "=": 4, "≠": 4, "≥": 4, "≤": 4, ">": 4, "<": 4,
+    "+": 5, "-": 5, "++": 5, "arrayConcat": 5, "*": 6, "/": 6, "%": 6,
+};
+function prec(op) { return PREC[op] ?? 10; }
+// ── Method call → Lean syntax ───────────────────────────────
+let _needsJSString = false;
+function emitMethodCall(tyKind, method, monadic, obj, args) {
+    // Array methods
+    if (tyKind === "array") {
+        if (method === "map")
+            return `${obj}.${monadic ? "mapM" : "map"} ${args[0]}`;
+        if (method === "filter")
+            return `${obj}.${monadic ? "filterM" : "filter"} ${args[0]}`;
+        if (method === "every")
+            return `${obj}.${monadic ? "allM" : "all"} ${args[0]}`;
+        if (method === "some")
+            return `${obj}.${monadic ? "anyM" : "any"} ${args[0]}`;
+        if (method === "includes")
+            return `${obj}.contains ${args[0]}`;
+        if (method === "find")
+            return `${obj}.find? ${args[0]}`;
+        if (method === "with")
+            return `${obj}.set! ${args[0]} ${args[1]}`;
+        if (method === "push")
+            return `Array.push ${obj} ${args[0]}`;
+    }
+    // String methods
+    if (tyKind === "string") {
+        _needsJSString = true;
+        if (method === "indexOf")
+            return `JSString.indexOf ${obj} ${args[0]}`;
+        if (method === "slice")
+            return `JSString.slice ${obj} ${args[0]} ${args[1]}`;
+    }
+    // Map methods
+    if (tyKind === "map") {
+        if (method === "get")
+            return `${obj}.get? ${args[0]}`;
+        if (method === "getDirect")
+            return `${obj}.get! ${args[0]}`;
+        if (method === "has")
+            return `${obj}.contains ${args[0]}`;
+        if (method === "set")
+            return `${obj}.insert ${args[0]} ${args[1]}`;
+    }
+    // Set methods
+    if (tyKind === "set") {
+        if (method === "has")
+            return `${obj}.contains ${args[0]}`;
+        if (method === "add")
+            return `${obj}.insert ${args[0]}`;
+        if (method === "delete")
+            return `${obj}.erase ${args[0]}`;
+    }
+    throw new Error(`Unsupported Lean method call: .${method}() on ${tyKind}`);
+}
+// ── Expression emission ─────────────────────────────────────
+function emitExpr(e, parentPrec) {
+    switch (e.kind) {
+        case "var": return escapeName(e.name);
+        case "num": return `${e.value}`;
+        case "bool": return e.value ? "true" : "false";
+        case "str": return `"${e.value.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n')}"`;
+        case "constructor": return `.${e.name}`;
+        case "arrayLiteral":
+            if (e.elems.length === 0)
+                return `#[]`;
+            return `#[${e.elems.map(el => emitExpr(el)).join(", ")}]`;
+        case "emptyMap": return `Std.HashMap.empty`;
+        case "emptySet": return `Std.HashSet.empty`;
+        case "methodCall": {
+            const obj = emitExpr(e.obj);
+            const wrap = e.obj.kind === "binop" || e.obj.kind === "app" || e.obj.kind === "methodCall";
+            const receiver = wrap ? `(${obj})` : obj;
+            const args = e.args.map(a => (a.kind === "binop" || a.kind === "unop" || a.kind === "implies" || a.kind === "app" || a.kind === "methodCall") ? `(${emitExpr(a)})` : emitExpr(a));
+            return emitMethodCall(e.objTy.kind, e.method, e.monadic, receiver, args);
+        }
+        case "lambda": {
+            const params = e.params.map(p => p.name).join(" ");
+            // Single return statement → expression lambda
+            if (e.body.length === 1 && e.body[0].kind === "return") {
+                return `(fun ${params} => ${emitExpr(e.body[0].value)})`;
+            }
+            // Multi-statement → do block
+            return `(fun ${params} => do\n${emitStmts(e.body, 2)})`;
+        }
+        case "unop":
+            if (e.op === "¬")
+                return `¬(${emitExpr(e.expr)})`;
+            if (e.op === "-" && e.expr.kind === "num")
+                return `-${e.expr.value}`;
+            return `(-${emitExpr(e.expr)})`;
+        case "binop": {
+            const op = e.op === "arrayConcat" ? "++" : e.op;
+            const s = `${emitExpr(e.left, prec(e.op))} ${op} ${emitExpr(e.right, prec(e.op))}`;
+            return (parentPrec !== undefined && prec(e.op) < parentPrec) ? `(${s})` : s;
+        }
+        case "implies": {
+            const parts = [...e.premises.map(p => emitExpr(p)), emitExpr(e.conclusion)];
+            const s = parts.join(" → ");
+            return parentPrec !== undefined ? `(${s})` : s;
+        }
+        case "app": {
+            const args = e.args.map(a => (a.kind === "binop" || a.kind === "unop" || a.kind === "implies" || a.kind === "app" || a.kind === "methodCall") ? `(${emitExpr(a)})` : emitExpr(a));
+            // SetToSeq → .toArray for Lean (HashSet has native toArray)
+            if (e.fn === "SetToSeq" && args.length === 1)
+                return `${args[0]}.toArray`;
+            return `${e.fn} ${args.join(" ")}`;
+        }
+        case "field": {
+            const obj = emitExpr(e.obj);
+            if (e.field === "collectionSize")
+                return `${obj}.size`;
+            const wrap = e.obj.kind !== "var" && e.obj.kind !== "num" && e.obj.kind !== "bool";
+            return wrap ? `(${obj}).${escapeName(e.field)}` : `${obj}.${escapeName(e.field)}`;
+        }
+        case "toNat": {
+            const inner = emitExpr(e.expr);
+            const wrap = e.expr.kind !== "var" && e.expr.kind !== "num";
+            return wrap ? `(${inner}).toNat` : `${inner}.toNat`;
+        }
+        case "index":
+            return `${emitExpr(e.arr)}[${emitExpr(e.idx)}]!`;
+        case "record": {
+            const fields = e.fields.map(f => `${escapeName(f.name)} := ${emitExpr(f.value)}`);
+            if (e.spread)
+                return `{ ${emitExpr(e.spread)} with ${fields.join(", ")} }`;
+            return `{ ${fields.join(", ")} }`;
+        }
+        case "if":
+            return `if ${emitExpr(e.cond)} then ${emitExpr(e.then)} else ${emitExpr(e.else)}`;
+        case "match": {
+            const arms = e.arms.map(a => `| ${a.pattern} => ${emitExpr(a.body)}`);
+            return `match ${typeof e.scrutinee === "string" ? e.scrutinee : emitExpr(e.scrutinee)} with ${arms.join(" ")}`;
+        }
+        case "forall": return `∀ ${e.var} : ${tyToLean(e.type)}, ${emitExpr(e.body)}`;
+        case "exists": return `∃ ${e.var} : ${tyToLean(e.type)}, ${emitExpr(e.body)}`;
+        case "let": return `let ${e.name} := ${emitExpr(e.value)}\n${emitExpr(e.body)}`;
+        default: throw new Error(`Unsupported Lean expression: ${e.kind}`);
+    }
+}
+// ── Statement emission ──────────────────────────────────────
+function emitStmts(stmts, indent) {
+    const pad = "  ".repeat(indent);
+    return stmts.map(s => emitStmt(s, indent)).join("\n");
+}
+function emitStmt(s, indent) {
+    const pad = "  ".repeat(indent);
+    switch (s.kind) {
+        case "let":
+            return s.mutable
+                ? `${pad}let mut ${escapeName(s.name)} : ${tyToLean(s.type)} := ${emitExpr(s.value)}`
+                : `${pad}let ${escapeName(s.name)} := ${emitExpr(s.value)}`;
+        case "assign": return `${pad}${escapeName(s.target)} := ${emitExpr(s.value)}`;
+        case "ghostLet":
+            return `${pad}let mut ${escapeName(s.name)} : ${tyToLean(s.type)} := ${emitExpr(s.value)}`;
+        case "ghostAssign": return `${pad}${escapeName(s.target)} := ${emitExpr(s.value)}`;
+        case "assert": return `${pad}assertGadget (${emitExpr(s.expr)})`;
+        case "bind": return `${pad}${escapeName(s.target)} ← ${emitExpr(s.value)}`;
+        case "let-bind": return `${pad}let ${s.name} ← ${emitExpr(s.value)}`;
+        case "return": return `${pad}return ${emitExpr(s.value)}`;
+        case "break": return `${pad}break`;
+        case "continue": return `${pad}continue`;
+        case "if": {
+            let out = `${pad}if ${emitExpr(s.cond)} then\n${emitStmts(s.then, indent + 1)}`;
+            if (s.else.length > 0) {
+                if (s.else.length === 1 && s.else[0].kind === "if") {
+                    const ei = s.else[0];
+                    out += `\n${pad}else if ${emitExpr(ei.cond)} then\n${emitStmts(ei.then, indent + 1)}`;
+                    if (ei.else.length > 0)
+                        out += `\n${pad}else\n${emitStmts(ei.else, indent + 1)}`;
+                }
+                else {
+                    out += `\n${pad}else\n${emitStmts(s.else, indent + 1)}`;
+                }
+            }
+            return out;
+        }
+        case "match": {
+            const scrut = typeof s.scrutinee === "string" ? s.scrutinee : emitExpr(s.scrutinee);
+            // Option match (.some/.none) → emit as if/let for WPGen.if compatibility
+            if (s.arms.length === 2) {
+                const someArm = s.arms.find(a => a.pattern.startsWith(".some "));
+                const noneArm = s.arms.find(a => a.pattern === ".none");
+                if (someArm && noneArm) {
+                    const boundVar = someArm.pattern.slice(6); // strip ".some "
+                    const hName = `h_${scrut.replace(/[^a-zA-Z0-9_]/g, "_")}`;
+                    const lines = [
+                        `${pad}if ${hName} : (${scrut}).isSome = true then`,
+                        `${pad}  let ${boundVar} := (${scrut}).get ${hName}`,
+                    ];
+                    if (someArm.body.length === 0) {
+                        lines.push(`${pad}  pure ()`);
+                    }
+                    else {
+                        lines.push(emitStmts(someArm.body, indent + 1));
+                    }
+                    lines.push(`${pad}else`);
+                    if (noneArm.body.length === 0) {
+                        lines.push(`${pad}  pure ()`);
+                    }
+                    else {
+                        lines.push(emitStmts(noneArm.body, indent + 1));
+                    }
+                    return lines.join("\n");
+                }
+            }
+            // General match
+            const lines = [`${pad}match ${scrut} with`];
+            for (const arm of s.arms) {
+                lines.push(`${pad}| ${arm.pattern} =>`);
+                if (arm.body.length === 0) {
+                    lines.push(`${pad}  pure ()`);
+                }
+                else {
+                    lines.push(emitStmts(arm.body, indent + 1));
+                }
+            }
+            return lines.join("\n");
+        }
+        case "while": {
+            const lines = [`${pad}while ${emitExpr(s.cond)}`];
+            for (const inv of s.invariants)
+                lines.push(`${pad}  invariant ${emitExpr(inv)}`);
+            if (s.doneWith)
+                lines.push(`${pad}  done_with ${emitExpr(s.doneWith)}`);
+            if (s.decreasing)
+                lines.push(`${pad}  decreasing ${emitExpr(s.decreasing)}`);
+            lines.push(`${pad}do`);
+            lines.push(emitStmts(s.body, indent + 1));
+            return lines.join("\n");
+        }
+        case "forin": {
+            const lines = [`${pad}for ${s.idx} in [:${emitExpr(s.bound)}]`];
+            for (const inv of s.invariants)
+                lines.push(`${pad}  invariant ${emitExpr(inv)}`);
+            lines.push(`${pad}do`);
+            lines.push(emitStmts(s.body, indent + 1));
+            return lines.join("\n");
+        }
+    }
+}
+// ── Declaration emission ─────────────────────────────────────
+function emitDecl(d) {
+    switch (d.kind) {
+        case "inductive": {
+            const lines = [`inductive ${d.name} where`];
+            for (const c of d.constructors) {
+                if (c.fields.length === 0) {
+                    lines.push(`  | ${c.name} : ${d.name}`);
+                }
+                else {
+                    const params = c.fields.map(f => `(${escapeName(f.name)} : ${tyToLean(f.type)})`).join(" ");
+                    lines.push(`  | ${c.name} ${params} : ${d.name}`);
+                }
+            }
+            if (d.deriving.length > 0)
+                lines.push(`deriving ${d.deriving.join(", ")}`);
+            return lines.join("\n");
+        }
+        case "structure": {
+            const lines = [`structure ${d.name} where`];
+            for (const f of d.fields)
+                lines.push(`  ${escapeName(f.name)} : ${tyToLean(f.type)}`);
+            if (d.deriving.length > 0)
+                lines.push(`deriving ${d.deriving.join(", ")}`);
+            return lines.join("\n");
+        }
+        case "type-alias": {
+            return `abbrev ${d.name} := ${tyToLean(d.target)}`;
+        }
+        case "def": {
+            const params = d.params.map(p => `(${escapeName(p.name)} : ${tyToLean(p.type)})`).join(" ");
+            return `def ${d.name} ${params} : ${tyToLean(d.returnType)} :=\n${emitPureExpr(d.body, 1)}`;
+        }
+        case "method": {
+            const params = d.params.map(p => `(${escapeName(p.name)} : ${tyToLean(p.type)})`).join(" ");
+            const lines = [`method ${d.name} ${params} return (res : ${tyToLean(d.returnType)})`];
+            for (const r of d.requires)
+                lines.push(`  require ${emitExpr(r)}`);
+            for (const e of d.ensures)
+                lines.push(`  ensures ${emitExpr(e)}`);
+            lines.push("  do");
+            lines.push(emitStmts(d.body, 2));
+            return lines.join("\n");
+        }
+        case "namespace": {
+            const lines = [`namespace ${d.name}`];
+            for (const inner of d.decls)
+                lines.push("", emitDecl(inner));
+            lines.push("", `end ${d.name}`);
+            return lines.join("\n");
+        }
+        case "class":
+            throw new Error(`Lean class support not yet implemented: ${d.name}`);
+        case "const":
+            return `def ${escapeName(d.name)} : ${tyToLean(d.type)} := ${emitExpr(d.value)}`;
+    }
+}
+/** Emit a pure expression with indented if/match blocks. */
+function emitPureExpr(e, indent) {
+    const pad = "  ".repeat(indent);
+    switch (e.kind) {
+        case "if":
+            return `${pad}if ${emitExpr(e.cond)} then\n${emitPureExpr(e.then, indent + 1)}\n${pad}else\n${emitPureExpr(e.else, indent + 1)}`;
+        case "match": {
+            const lines = [`${pad}match ${typeof e.scrutinee === "string" ? e.scrutinee : emitExpr(e.scrutinee)} with`];
+            for (const arm of e.arms) {
+                lines.push(`${pad}| ${arm.pattern} =>`);
+                lines.push(emitPureExpr(arm.body, indent + 1));
+            }
+            return lines.join("\n");
+        }
+        case "let":
+            return `${pad}let ${e.name} := ${emitExpr(e.value)}\n${emitPureExpr(e.body, indent)}`;
+        default:
+            return `${pad}${emitExpr(e)}`;
+    }
+}
+// ── File emission ────────────────────────────────────────────
+export function emitLeanFile(file) {
+    _needsJSString = false;
+    // Emit declarations first so _needsJSString is set
+    const declLines = [];
+    for (const decl of file.decls) {
+        declLines.push("");
+        declLines.push(emitDecl(decl));
+    }
+    const lines = [];
+    if (file.comment) {
+        lines.push("/-");
+        lines.push(file.comment);
+        lines.push("-/");
+    }
+    for (const imp of file.imports)
+        lines.push(`import ${imp}`);
+    if (_needsJSString && !file.imports.includes("LemmaScript.JSString"))
+        lines.push("import LemmaScript.JSString");
+    if (file.options.length > 0)
+        lines.push("");
+    for (const opt of file.options)
+        lines.push(`set_option ${opt.key} ${opt.value}`);
+    lines.push(...declLines);
+    return lines.join("\n") + "\n";
+}

package/tools/dist/lsc.js

@@ -4,26 +4,38 @@
  *
  * Pipeline: extract → resolve → transform → emit
  */
-import { Project } from "ts-morph";
-import { existsSync, writeFileSync } from "fs";
-import { execSync } from "child_process";
+import { Project, ScriptTarget } from "ts-morph";
+import { existsSync } from "fs";
 import path from "path";
 import { extractModule } from "./extract.js";
 import { resolveModule } from "./resolve.js";
-import { transformModule } from "./transform.js";
-import { emitFile } from "./emit.js";
-import { transformModuleDafny } from "./transform.js";
+import { transformModuleLean, transformModuleDafny } from "./transform.js";
+import { emitLeanFile } from "./lean-emit.js";
 import { emitDafnyFile } from "./dafny-emit.js";
 import { dafnyGen, dafnyCheckDiff, dafnyVerify, dafnyRegen } from "./dafny-commands.js";
+import { leanGen, leanCheck } from "./lean-commands.js";
 function main() {
     const args = process.argv.slice(2);
-    const backendIdx = args.indexOf("--backend=dafny");
-    const backend = backendIdx >= 0 ? "dafny" : "lean";
-    if (backendIdx >= 0)
+    const backendIdx = args.findIndex(a => a.startsWith("--backend="));
+    let backend = "dafny";
+    if (backendIdx >= 0) {
+        const val = args[backendIdx].split("=")[1];
+        if (val !== "lean" && val !== "dafny") {
+            console.error(`Unknown backend: ${val}. Use --backend=lean or --backend=dafny`);
+            process.exit(1);
+        }
+        backend = val;
         args.splice(backendIdx, 1);
+    }
+    const timeLimitIdx = args.findIndex(a => a.startsWith("--time-limit="));
+    let timeLimit;
+    if (timeLimitIdx >= 0) {
+        timeLimit = parseInt(args[timeLimitIdx].split("=")[1]);
+        args.splice(timeLimitIdx, 1);
+    }
     const [cmd, filePath] = args;
     if (!cmd || !filePath) {
-        console.error("Usage: lsc <gen|check|regen|extract> [--backend=dafny] <file.ts>");
+        console.error("Usage: lsc <gen|check|regen|extract> [--backend=lean|dafny] <file.ts>");
         process.exit(1);
     }
     const absPath = path.resolve(filePath);
@@ -31,8 +43,31 @@ function main() {
         console.error(`File not found: ${absPath}`);
         process.exit(1);
     }
-    const project = new Project({ compilerOptions: { strict: true } });
+    // Find nearest tsconfig.json for import resolution; fall back to bare options
+    function findTsConfig(from) {
+        let dir = path.dirname(from);
+        while (true) {
+            const candidate = path.join(dir, "tsconfig.json");
+            if (existsSync(candidate))
+                return candidate;
+            const parent = path.dirname(dir);
+            if (parent === dir)
+                return undefined;
+            dir = parent;
+        }
+    }
+    const tsConfigFilePath = findTsConfig(absPath);
+    const project = tsConfigFilePath
+        ? new Project({ tsConfigFilePath })
+        : new Project({ compilerOptions: { strict: true, target: ScriptTarget.ESNext, lib: ["lib.esnext.d.ts"] } });
     const sourceFile = project.addSourceFileAtPath(absPath);
+    project.resolveSourceFileDependencies();
+    // Check //@ backend directive — skip if backend doesn't match
+    const backendDirective = sourceFile.getFullText().match(/\/\/@ backend (\w+)/);
+    if (backendDirective && backendDirective[1] !== backend) {
+        console.log(`Skipped: ${path.basename(filePath)} (//@ backend ${backendDirective[1]}, current: ${backend})`);
+        return;
+    }
     // Extract: ts-morph → Raw IR
     const raw = extractModule(sourceFile);
     if (cmd === "extract") {
@@ -46,27 +81,32 @@ function main() {
     // ── Dafny backend ─────────────────────────────────────────
     if (backend === "dafny") {
         const { typesFile, defFile } = transformModuleDafny(typed);
-        // Emit types + def into a single Dafny file
         const allDecls = [...(typesFile?.decls ?? []), ...defFile.decls];
         const merged = { ...defFile, decls: allDecls };
         const text = emitDafnyFile(merged, path.basename(filePath));
         const genPath = path.join(dir, `${base}.dfy.gen`);
         const dfyPath = path.join(dir, `${base}.dfy`);
-        const patchPath = path.join(dir, `${base}.dfy.patch`);
+        const basePath = path.join(dir, `${base}.dfy.base`);
         if (cmd === "gen") {
             dafnyGen(genPath, dfyPath, text);
             return;
         }
+        if (cmd === "gen-check") {
+            dafnyGen(genPath, dfyPath, text);
+            if (!dafnyCheckDiff(genPath, dfyPath))
+                process.exit(1);
+            return;
+        }
         if (cmd === "check") {
             dafnyGen(genPath, dfyPath, text);
             if (!dafnyCheckDiff(genPath, dfyPath))
                 process.exit(1);
-            if (!dafnyVerify(dfyPath, dir))
+            if (!dafnyVerify(dfyPath, dir, timeLimit))
                 process.exit(1);
             return;
         }
         if (cmd === "regen") {
-            dafnyRegen(genPath, dfyPath, patchPath, text, dir);
+            dafnyRegen(genPath, dfyPath, basePath, text, dir);
             return;
         }
         console.error(`Unknown command: ${cmd}`);
@@ -75,41 +115,19 @@ function main() {
     // ── Lean backend ──────────────────────────────────────────
     const specPath = path.join(dir, `${base}.spec.lean`);
     const specImport = existsSync(specPath) ? `«${base}.spec»` : undefined;
-    // Transform: Typed IR → Lean IR
-    const { typesFile, defFile } = transformModule(typed, specImport);
-    // Emit: Lean IR → text
-    if (typesFile) {
-        const typesPath = path.join(dir, `${base}.types.lean`);
-        writeFileSync(typesPath, emitFile(typesFile));
-        console.log(`Generated: ${typesPath}`);
-    }
+    const { typesFile, defFile } = transformModuleLean(typed, specImport);
+    const typesPath = typesFile ? path.join(dir, `${base}.types.lean`) : null;
+    const typesText = typesFile ? emitLeanFile(typesFile) : null;
     const defPath = path.join(dir, `${base}.def.lean`);
+    const defText = emitLeanFile(defFile);
     if (cmd === "gen") {
-        writeFileSync(defPath, emitFile(defFile));
-        console.log(`Generated: ${defPath}`);
+        leanGen(typesPath, defPath, typesText, defText);
         return;
     }
     if (cmd === "check") {
-        writeFileSync(defPath, emitFile(defFile));
-        console.log(`Generated: ${defPath}`);
-        let lakeDir = dir;
-        while (lakeDir !== path.dirname(lakeDir)) {
-            if (existsSync(path.join(lakeDir, "lakefile.lean")))
-                break;
-            lakeDir = path.dirname(lakeDir);
-        }
-        const proofPath = path.join(dir, `${base}.proof.lean`);
-        if (!existsSync(proofPath)) {
-            console.error(`No proof file: ${proofPath}`);
+        leanGen(typesPath, defPath, typesText, defText);
+        if (!leanCheck(dir, base))
             process.exit(1);
-        }
-        console.log("Running lake build...");
-        try {
-            execSync(`lake build`, { cwd: lakeDir, stdio: "inherit" });
-        }
-        catch {
-            process.exit(1);
-        }
         return;
     }
     console.error(`Unknown command: ${cmd}`);