ic-mops 2.16.0 → 2.16.1

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next
 
+## 2.16.1
+
+- Fix `mops bench` crashing on moc 0.15+ with the default `--gc copying`: `--copying-gc` is rejected under enhanced orthogonal persistence, which became the default persistence mode in 2.16.0. The default GC is now `incremental` (moc's default and the only collector available under EOP). Selecting a legacy collector (`copying`, `compacting`, `generational`) now implies `--legacy-persistence`, since moc only accepts them there.
+- `mops build`, `mops check`, `mops generate`, and `mops check-stable` now tunnel `moc`'s exit code instead of always exiting `1`. moc exits `2` on a compiler crash (uncaught internal error) versus `1` for normal user errors (type/compile errors, stable-compat mismatch, bad args), so CI and scripts can now distinguish "file a Motoko bug" from "fix your code" via `$?`. `mops test` likewise exits `2` when a `moc` process crashes during a test run, instead of reporting it as an ordinary test failure.
+
 ## 2.16.0
 
 - `mops bench` now compiles benchmark canisters under **enhanced orthogonal persistence** (moc's default) instead of forcing `--legacy-persistence` — measuring the persistence mode real canisters run. Pass `--legacy-persistence` to opt back into legacy persistence.

package/cli.ts

@@ -544,9 +544,12 @@ program
     ).choices(["dfx", "pocket-ic"]),
   )
   .addOption(
-    new Option("--gc <gc>", "Garbage collector")
+    new Option(
+      "--gc <gc>",
+      "Garbage collector. Under enhanced orthogonal persistence (the default) the GC is fixed to `incremental`; selecting `copying`, `compacting`, or `generational` implies `--legacy-persistence`",
+    )
       .choices(["copying", "compacting", "generational", "incremental"])
-      .default("copying"),
+      .default("incremental"),
   )
   .addOption(
     new Option("--save", "Save benchmark results to .bench/<filename>.json"),
@@ -573,7 +576,7 @@ program
   .addOption(
     new Option(
       "--verbose",
-      "Print the benchmark pipeline (compiler, replica, GC, optimization) and stream compiler/replica output, including dfx optimization warnings",
+      "Print the benchmark pipeline (compiler, replica, GC, context, persistence, profile, optimization) and stream compiler/replica output, including dfx optimization warnings",
     ),
   )
   .action(async (filter, options) => {

package/commands/bench.ts

@@ -61,7 +61,7 @@ export async function bench(
     replicaVersion: "",
     compiler: "moc",
     compilerVersion: getMocVersion(true),
-    gc: "copying",
+    gc: "incremental",
     forceGc: true,
     query: false,
     legacyPersistence: false,
@@ -112,6 +112,8 @@ export async function bench(
       replicaType === "dfx" || replicaType === "dfx-pocket-ic"
         ? 'dfx `optimize: "cycles"` (ic-wasm) on deploy'
         : "none (raw moc output)";
+    let legacyGc = isLegacyGc(options.gc);
+    let effectiveLegacyPersistence = options.legacyPersistence || legacyGc;
     console.log(chalk.gray("Benchmark pipeline:"));
     console.log(chalk.gray(`  compiler:  moc ${options.compilerVersion}`));
     console.log(
@@ -129,9 +131,16 @@ export async function bench(
     );
     console.log(
       chalk.gray(
-        `  persistence: ${options.legacyPersistence ? "legacy" : "enhanced"}`,
+        `  persistence: ${effectiveLegacyPersistence ? "legacy" : "enhanced"}`,
       ),
     );
+    if (legacyGc && !options.legacyPersistence) {
+      console.log(
+        chalk.gray(
+          `  (gc '${options.gc}' only exists under legacy persistence; enabling --legacy-persistence)`,
+        ),
+      );
+    }
     console.log(chalk.gray(`  profile:   ${options.profile}`));
     console.log(chalk.gray(`  optimize:  ${optimize}`));
   }
@@ -279,18 +288,25 @@ function computeDiffAll(
   return diff;
 }
 
+// Collectors that only exist under legacy persistence. moc 0.15+ fixes the GC to
+// incremental under enhanced orthogonal persistence and rejects these there.
+function isLegacyGc(gc: BenchOptions["gc"]): boolean {
+  return gc === "copying" || gc === "compacting" || gc === "generational";
+}
+
 function getMocArgs(options: BenchOptions): string {
   let args = "";
 
-  // Benchmarks compile under enhanced orthogonal persistence (moc's default
-  // since 0.15) — the mode real canisters run. Pass `--legacy-persistence`
-  // only when the user opts in, and only where moc supports the flag (>= 0.15;
-  // legacy is already the default below it).
-  if (
-    options.legacyPersistence &&
-    options.compilerVersion &&
-    new SemVer(options.compilerVersion).compare("0.15.0") >= 0
-  ) {
+  let mocAtLeast015 =
+    !!options.compilerVersion &&
+    new SemVer(options.compilerVersion).compare("0.15.0") >= 0;
+
+  // Legacy collectors require legacy persistence; moc < 0.15 is already legacy
+  // and has no --legacy-persistence flag.
+  let useLegacyPersistence =
+    options.legacyPersistence || isLegacyGc(options.gc);
+
+  if (useLegacyPersistence && mocAtLeast015) {
     args += " --legacy-persistence";
   }
 
@@ -298,7 +314,8 @@ function getMocArgs(options: BenchOptions): string {
     args += " --force-gc";
   }
 
-  if (options.gc) {
+  // Under EOP the GC is fixed; only pass a collector flag where it's selectable.
+  if (options.gc && (useLegacyPersistence || !mocAtLeast015)) {
     args += ` --${options.gc}-gc`;
   }
 

package/commands/build.ts

@@ -4,7 +4,7 @@ import { exists } from "fs-extra";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { lock, unlockSync } from "proper-lockfile";
-import { cliError } from "../error.js";
+import { cliError, cliExit } from "../error.js";
 import { isCandidCompatible } from "../helpers/is-candid-compatible.js";
 import {
   filterCanisters,
@@ -136,7 +136,8 @@ export async function build(
               console.error(result.stdout);
             }
           }
-          cliError(
+          cliExit(
+            result.exitCode ?? 1,
             `Build failed for canister ${canisterName} (exit code: ${result.exitCode})`,
           );
         }

package/commands/check-stable.ts

@@ -3,7 +3,7 @@ import { existsSync, mkdirSync, mkdtempSync } from "node:fs";
 import { rm } from "node:fs/promises";
 import chalk from "chalk";
 import { execa } from "execa";
-import { cliError } from "../error.js";
+import { cliError, cliExit } from "../error.js";
 import {
   getCheckLimitPendingIssue,
   prepareMigrationArgs,
@@ -261,7 +261,8 @@ export async function runStableCheck(
       if (result.stderr) {
         console.error(result.stderr);
       }
-      cliError(
+      cliExit(
+        result.exitCode ?? 1,
         `✗ Stable compatibility check failed for canister '${canisterName}'`,
       );
     }
@@ -314,7 +315,8 @@ async function generateStableTypes(
     if (result.stderr) {
       console.error(result.stderr);
     }
-    cliError(
+    cliExit(
+      result.exitCode ?? 1,
       `Failed to generate stable types for ${moFile} (exit code: ${result.exitCode})`,
     );
   }

package/commands/check.ts

@@ -1,7 +1,7 @@
 import path from "node:path";
 import chalk from "chalk";
 import { execa } from "execa";
-import { cliError } from "../error.js";
+import { cliError, cliExit } from "../error.js";
 import {
   getGlobalMocArgs,
   getRootDir,
@@ -208,7 +208,8 @@ async function checkCanisters(
         });
 
         if (result.exitCode !== 0) {
-          cliError(
+          cliExit(
+            result.exitCode ?? 1,
             `✗ Check failed for canister ${canisterName} (exit code: ${result.exitCode})`,
           );
         }
@@ -285,7 +286,8 @@ async function checkFiles(
       });
 
       if (result.exitCode !== 0) {
-        cliError(
+        cliExit(
+          result.exitCode ?? 1,
           `✗ Check failed for file ${file} (exit code: ${result.exitCode})`,
         );
       }

package/commands/generate.ts

@@ -2,7 +2,7 @@ import chalk from "chalk";
 import { execa } from "execa";
 import { mkdir } from "node:fs/promises";
 import path from "node:path";
-import { cliError } from "../error.js";
+import { cliError, cliExit } from "../error.js";
 import {
   filterCanisters,
   resolveCanisterConfigs,
@@ -104,7 +104,8 @@ export async function generateCandid(
             console.error(result.stdout);
           }
         }
-        cliError(
+        cliExit(
+          result.exitCode ?? 1,
           `Failed to generate Candid for canister ${canisterName} (exit code: ${result.exitCode})`,
         );
       }

package/commands/test/test.ts

@@ -159,7 +159,7 @@ export async function test(filter = "", options: Partial<TestOptions> = {}) {
       explicitReplica,
     );
     if (!passed) {
-      process.exit(1);
+      process.exit(maxMocExit >= 2 ? 2 : 1);
     }
   }
 }
@@ -167,6 +167,13 @@ export async function test(filter = "", options: Partial<TestOptions> = {}) {
 let mocPath = "";
 let wasmtimePath = "";
 
+let maxMocExit = 0;
+const trackMocExit = (code: number | null) => {
+  if (code && code >= 2) {
+    maxMocExit = Math.max(maxMocExit, code);
+  }
+};
+
 async function runAll(
   reporterName: ReporterName | undefined,
   filter = "",
@@ -197,6 +204,7 @@ export async function testWithReporter(
   signal?: AbortSignal,
   explicitReplica = false,
 ): Promise<boolean> {
+  maxMocExit = 0;
   let rootDir = getRootDir();
   let files: string[] = [];
   let libFiles = globSync("**/test?(s)/lib.mo", MOTOKO_GLOB_CONFIG);
@@ -328,7 +336,7 @@ export async function testWithReporter(
           }
           throw error;
         });
-        pipeMMF(proc, mmf).then(resolve);
+        pipeMMF(proc, mmf, trackMocExit).then(resolve);
       }
       // build and run wasm
       else if (mode === "wasi") {
@@ -346,7 +354,7 @@ export async function testWithReporter(
           }
           throw error;
         });
-        pipeMMF(buildProc, mmf)
+        pipeMMF(buildProc, mmf, trackMocExit)
           .then(async () => {
             if (mmf.failed > 0) {
               return;
@@ -413,7 +421,7 @@ export async function testWithReporter(
           throw error;
         });
 
-        pipeMMF(buildProc, mmf)
+        pipeMMF(buildProc, mmf, trackMocExit)
           .then(async () => {
             if (mmf.failed > 0) {
               return;

package/commands/test/utils.ts

@@ -68,18 +68,22 @@ export function pipeStderrToMMF(stderr: Readable, mmf: MMF1, dir = "") {
   });
 }
 
-export function pipeMMF(proc: ChildProcessWithoutNullStreams, mmf: MMF1) {
+export function pipeMMF(
+  proc: ChildProcessWithoutNullStreams,
+  mmf: MMF1,
+  onClose?: (code: number | null) => void,
+) {
   return new Promise<void>((resolve) => {
     pipeStdoutToMMF(proc.stdout, mmf);
     pipeStderrToMMF(proc.stderr, mmf);
 
-    // exit
     proc.on("close", (code) => {
       if (code === 0) {
         mmf.strategy !== "print" && mmf.pass();
       } else if (code !== 1) {
         mmf.fail(`unknown exit code: ${code}`);
       }
+      onClose?.(code ?? null);
       resolve();
     });
   });

package/dist/cli.js

@@ -395,15 +395,15 @@ program
     .command("bench [filter]")
     .description("Run benchmarks")
     .addOption(new Option("--replica <replica>", "Which replica to use to run benchmarks (`dfx` is deprecated; prefer `pocket-ic`)").choices(["dfx", "pocket-ic"]))
-    .addOption(new Option("--gc <gc>", "Garbage collector")
+    .addOption(new Option("--gc <gc>", "Garbage collector. Under enhanced orthogonal persistence (the default) the GC is fixed to `incremental`; selecting `copying`, `compacting`, or `generational` implies `--legacy-persistence`")
     .choices(["copying", "compacting", "generational", "incremental"])
-    .default("copying"))
+    .default("incremental"))
     .addOption(new Option("--save", "Save benchmark results to .bench/<filename>.json"))
     .addOption(new Option("--compare", "Run benchmark and compare results with .bench/<filename>.json"))
     // .addOption(new Option('--force-gc', 'Force GC'))
     .addOption(new Option("--query", "Measure each cell in a query call (how `query` methods run on the IC: no GC). Only for benchmarks whose runner is synchronous (no inter-canister calls)"))
     .addOption(new Option("--legacy-persistence", "Compile benchmark canisters under legacy persistence instead of enhanced orthogonal persistence (the default)"))
-    .addOption(new Option("--verbose", "Print the benchmark pipeline (compiler, replica, GC, optimization) and stream compiler/replica output, including dfx optimization warnings"))
+    .addOption(new Option("--verbose", "Print the benchmark pipeline (compiler, replica, GC, context, persistence, profile, optimization) and stream compiler/replica output, including dfx optimization warnings"))
     .action(async (filter, options) => {
     checkConfigFile(true);
     await installAll({

package/dist/commands/bench.js

@@ -29,7 +29,7 @@ export async function bench(filter = "", optionsArg = {}) {
         replicaVersion: "",
         compiler: "moc",
         compilerVersion: getMocVersion(true),
-        gc: "copying",
+        gc: "incremental",
         forceGc: true,
         query: false,
         legacyPersistence: false,
@@ -69,12 +69,17 @@ export async function bench(filter = "", optionsArg = {}) {
         let optimize = replicaType === "dfx" || replicaType === "dfx-pocket-ic"
             ? 'dfx `optimize: "cycles"` (ic-wasm) on deploy'
             : "none (raw moc output)";
+        let legacyGc = isLegacyGc(options.gc);
+        let effectiveLegacyPersistence = options.legacyPersistence || legacyGc;
         console.log(chalk.gray("Benchmark pipeline:"));
         console.log(chalk.gray(`  compiler:  moc ${options.compilerVersion}`));
         console.log(chalk.gray(`  replica:   ${replicaType}${options.replicaVersion ? ` ${options.replicaVersion}` : ""}`));
         console.log(chalk.gray(`  gc:        ${options.gc}${options.forceGc ? " (forced)" : ""}`));
         console.log(chalk.gray(`  context:   ${options.query ? "query" : "update"}`));
-        console.log(chalk.gray(`  persistence: ${options.legacyPersistence ? "legacy" : "enhanced"}`));
+        console.log(chalk.gray(`  persistence: ${effectiveLegacyPersistence ? "legacy" : "enhanced"}`));
+        if (legacyGc && !options.legacyPersistence) {
+            console.log(chalk.gray(`  (gc '${options.gc}' only exists under legacy persistence; enabling --legacy-persistence)`));
+        }
         console.log(chalk.gray(`  profile:   ${options.profile}`));
         console.log(chalk.gray(`  optimize:  ${optimize}`));
     }
@@ -190,21 +195,26 @@ function computeDiffAll(currentResults, prevResults, rows, cols) {
     }
     return diff;
 }
+// Collectors that only exist under legacy persistence. moc 0.15+ fixes the GC to
+// incremental under enhanced orthogonal persistence and rejects these there.
+function isLegacyGc(gc) {
+    return gc === "copying" || gc === "compacting" || gc === "generational";
+}
 function getMocArgs(options) {
     let args = "";
-    // Benchmarks compile under enhanced orthogonal persistence (moc's default
-    // since 0.15) — the mode real canisters run. Pass `--legacy-persistence`
-    // only when the user opts in, and only where moc supports the flag (>= 0.15;
-    // legacy is already the default below it).
-    if (options.legacyPersistence &&
-        options.compilerVersion &&
-        new SemVer(options.compilerVersion).compare("0.15.0") >= 0) {
+    let mocAtLeast015 = !!options.compilerVersion &&
+        new SemVer(options.compilerVersion).compare("0.15.0") >= 0;
+    // Legacy collectors require legacy persistence; moc < 0.15 is already legacy
+    // and has no --legacy-persistence flag.
+    let useLegacyPersistence = options.legacyPersistence || isLegacyGc(options.gc);
+    if (useLegacyPersistence && mocAtLeast015) {
         args += " --legacy-persistence";
     }
     if (options.forceGc) {
         args += " --force-gc";
     }
-    if (options.gc) {
+    // Under EOP the GC is fixed; only pass a collector flag where it's selectable.
+    if (options.gc && (useLegacyPersistence || !mocAtLeast015)) {
         args += ` --${options.gc}-gc`;
     }
     if (options.profile === "Debug") {

package/dist/commands/build.js

@@ -4,7 +4,7 @@ import { exists } from "fs-extra";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { lock, unlockSync } from "proper-lockfile";
-import { cliError } from "../error.js";
+import { cliError, cliExit } from "../error.js";
 import { isCandidCompatible } from "../helpers/is-candid-compatible.js";
 import { filterCanisters, resolveCanisterConfigs, } from "../helpers/resolve-canisters.js";
 import { BUILD_MANAGED_FLAGS, prepareMocArgs } from "../helpers/moc-args.js";
@@ -107,7 +107,7 @@ export async function build(canisterNames, options) {
                             console.error(result.stdout);
                         }
                     }
-                    cliError(`Build failed for canister ${canisterName} (exit code: ${result.exitCode})`);
+                    cliExit(result.exitCode ?? 1, `Build failed for canister ${canisterName} (exit code: ${result.exitCode})`);
                 }
                 if (options.verbose && result.stdout && result.stdout.trim()) {
                     console.log(result.stdout);

package/dist/commands/check-stable.js

@@ -3,7 +3,7 @@ import { existsSync, mkdirSync, mkdtempSync } from "node:fs";
 import { rm } from "node:fs/promises";
 import chalk from "chalk";
 import { execa } from "execa";
-import { cliError } from "../error.js";
+import { cliError, cliExit } from "../error.js";
 import { getCheckLimitPendingIssue, prepareMigrationArgs, reportCheckLimitPendingIssue, } from "../helpers/migrations.js";
 import { getGlobalMocArgs, readConfig, resolveConfigPath } from "../mops.js";
 import { filterCanisters, looksLikeFile, resolveCanisterConfigs, resolveSingleCanister, validateCanisterArgs, } from "../helpers/resolve-canisters.js";
@@ -146,7 +146,7 @@ export async function runStableCheck(params) {
             if (result.stderr) {
                 console.error(result.stderr);
             }
-            cliError(`✗ Stable compatibility check failed for canister '${canisterName}'`);
+            cliExit(result.exitCode ?? 1, `✗ Stable compatibility check failed for canister '${canisterName}'`);
         }
         console.log(chalk.green(`✓ Stable compatibility check passed for canister '${canisterName}'`));
     }
@@ -178,7 +178,7 @@ async function generateStableTypes(mocPath, moFile, outputPath, sources, globalM
         if (result.stderr) {
             console.error(result.stderr);
         }
-        cliError(`Failed to generate stable types for ${moFile} (exit code: ${result.exitCode})`);
+        cliExit(result.exitCode ?? 1, `Failed to generate stable types for ${moFile} (exit code: ${result.exitCode})`);
     }
     await rm(wasmPath, { force: true });
     return outputPath;

package/dist/commands/check.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import chalk from "chalk";
 import { execa } from "execa";
-import { cliError } from "../error.js";
+import { cliError, cliExit } from "../error.js";
 import { getGlobalMocArgs, getRootDir, readConfig, resolveConfigPath, } from "../mops.js";
 import { autofixMotoko } from "../helpers/autofix-motoko.js";
 import { withFixLock } from "../helpers/fix-lock.js";
@@ -127,7 +127,7 @@ async function checkCanisters(config, canisters, options) {
                     reject: false,
                 });
                 if (result.exitCode !== 0) {
-                    cliError(`✗ Check failed for canister ${canisterName} (exit code: ${result.exitCode})`);
+                    cliExit(result.exitCode ?? 1, `✗ Check failed for canister ${canisterName} (exit code: ${result.exitCode})`);
                 }
                 console.log(chalk.green(`✓ ${canisterName}`));
             }
@@ -189,7 +189,7 @@ async function checkFiles(config, files, options) {
                 reject: false,
             });
             if (result.exitCode !== 0) {
-                cliError(`✗ Check failed for file ${file} (exit code: ${result.exitCode})`);
+                cliExit(result.exitCode ?? 1, `✗ Check failed for file ${file} (exit code: ${result.exitCode})`);
             }
             console.log(chalk.green(`✓ ${file}`));
         }

package/dist/commands/generate.js

@@ -2,7 +2,7 @@ import chalk from "chalk";
 import { execa } from "execa";
 import { mkdir } from "node:fs/promises";
 import path from "node:path";
-import { cliError } from "../error.js";
+import { cliError, cliExit } from "../error.js";
 import { filterCanisters, resolveCanisterConfigs, } from "../helpers/resolve-canisters.js";
 import { GENERATE_CANDID_MANAGED_FLAGS, prepareMocArgs, } from "../helpers/moc-args.js";
 import { getRootDir, readConfig, resolveConfigPath, writeConfig, } from "../mops.js";
@@ -60,7 +60,7 @@ export async function generateCandid(canisterNames, options) {
                         console.error(result.stdout);
                     }
                 }
-                cliError(`Failed to generate Candid for canister ${canisterName} (exit code: ${result.exitCode})`);
+                cliExit(result.exitCode ?? 1, `Failed to generate Candid for canister ${canisterName} (exit code: ${result.exitCode})`);
             }
             if (dest.configPath !== null) {
                 const c = (config.canisters ??= {});

package/dist/commands/test/test.js

@@ -98,17 +98,24 @@ export async function test(filter = "", options = {}) {
     else {
         let passed = await runAll(options.reporter, filter, options.mode, replicaType, false, undefined, explicitReplica);
         if (!passed) {
-            process.exit(1);
+            process.exit(maxMocExit >= 2 ? 2 : 1);
         }
     }
 }
 let mocPath = "";
 let wasmtimePath = "";
+let maxMocExit = 0;
+const trackMocExit = (code) => {
+    if (code && code >= 2) {
+        maxMocExit = Math.max(maxMocExit, code);
+    }
+};
 async function runAll(reporterName, filter = "", mode = "interpreter", replicaType, watch = false, signal, explicitReplica = false) {
     let done = await testWithReporter(reporterName, filter, mode, replicaType, watch, signal, explicitReplica);
     return done;
 }
 export async function testWithReporter(reporterName, filter = "", defaultMode = "interpreter", replicaType, watch = false, signal, explicitReplica = false) {
+    maxMocExit = 0;
     let rootDir = getRootDir();
     let files = [];
     let libFiles = globSync("**/test?(s)/lib.mo", MOTOKO_GLOB_CONFIG);
@@ -217,7 +224,7 @@ export async function testWithReporter(reporterName, filter = "", defaultMode =
                     }
                     throw error;
                 });
-                pipeMMF(proc, mmf).then(resolve);
+                pipeMMF(proc, mmf, trackMocExit).then(resolve);
             }
             // build and run wasm
             else if (mode === "wasi") {
@@ -230,7 +237,7 @@ export async function testWithReporter(reporterName, filter = "", defaultMode =
                     }
                     throw error;
                 });
-                pipeMMF(buildProc, mmf)
+                pipeMMF(buildProc, mmf, trackMocExit)
                     .then(async () => {
                     if (mmf.failed > 0) {
                         return;
@@ -288,7 +295,7 @@ export async function testWithReporter(reporterName, filter = "", defaultMode =
                     }
                     throw error;
                 });
-                pipeMMF(buildProc, mmf)
+                pipeMMF(buildProc, mmf, trackMocExit)
                     .then(async () => {
                     if (mmf.failed > 0) {
                         return;

package/dist/commands/test/utils.d.ts

@@ -4,4 +4,4 @@ import { MMF1 } from "./mmf1.js";
 export declare function absToRel(p: string): string;
 export declare function pipeStdoutToMMF(stdout: Readable, mmf: MMF1): void;
 export declare function pipeStderrToMMF(stderr: Readable, mmf: MMF1, dir?: string): void;
-export declare function pipeMMF(proc: ChildProcessWithoutNullStreams, mmf: MMF1): Promise<void>;
+export declare function pipeMMF(proc: ChildProcessWithoutNullStreams, mmf: MMF1, onClose?: (code: number | null) => void): Promise<void>;

package/dist/commands/test/utils.js

@@ -49,11 +49,10 @@ export function pipeStderrToMMF(stderr, mmf, dir = "") {
         mmf.fail(text);
     });
 }
-export function pipeMMF(proc, mmf) {
+export function pipeMMF(proc, mmf, onClose) {
     return new Promise((resolve) => {
         pipeStdoutToMMF(proc.stdout, mmf);
         pipeStderrToMMF(proc.stderr, mmf);
-        // exit
         proc.on("close", (code) => {
             if (code === 0) {
                 mmf.strategy !== "print" && mmf.pass();
@@ -61,6 +60,7 @@ export function pipeMMF(proc, mmf) {
             else if (code !== 1) {
                 mmf.fail(`unknown exit code: ${code}`);
             }
+            onClose?.(code ?? null);
             resolve();
         });
     });

package/dist/error.d.ts

@@ -1 +1,2 @@
 export declare function cliError(...args: unknown[]): never;
+export declare function cliExit(code: number, ...args: unknown[]): never;

package/dist/error.js

@@ -3,3 +3,7 @@ export function cliError(...args) {
     console.error(chalk.red(...args));
     process.exit(1);
 }
+export function cliExit(code, ...args) {
+    console.error(chalk.red(...args));
+    process.exit(code || 1);
+}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "2.16.0",
+  "version": "2.16.1",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",

package/dist/tests/bench.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/bench.test.js

@@ -0,0 +1,21 @@
+import { describe, expect, jest, test } from "@jest/globals";
+import { rmSync } from "node:fs";
+import path from "path";
+import { cli } from "./helpers";
+// Pin moc 1.3.0 (≥ 0.15) to exercise the EOP path — this repo's own mops.toml
+// uses moc 0.14.14, so the default bench run is never EOP-tested here.
+describe("bench", () => {
+    jest.setTimeout(180_000);
+    test("runs under EOP with the default gc", async () => {
+        const cwd = path.join(import.meta.dirname, "bench");
+        try {
+            const result = await cli(["bench"], { cwd });
+            expect(result.stderr).not.toContain("--copying-gc is not supported");
+            expect(result.stderr).not.toContain("Invalid compiler flag combination");
+            expect(result.exitCode).toBe(0);
+        }
+        finally {
+            rmSync(path.join(cwd, ".mops"), { recursive: true, force: true });
+        }
+    });
+});

package/error.ts

@@ -4,3 +4,8 @@ export function cliError(...args: unknown[]): never {
   console.error(chalk.red(...args));
   process.exit(1);
 }
+
+export function cliExit(code: number, ...args: unknown[]): never {
+  console.error(chalk.red(...args));
+  process.exit(code || 1);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "2.16.0",
+  "version": "2.16.1",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",

package/tests/bench/bench/sanity.bench.mo

@@ -0,0 +1,27 @@
+// Exercises the bench pipeline under EOP; the template only needs
+// init() -> { getVersion; getSchema; runCell }, so no mo:bench dep.
+module {
+  type Schema = {
+    name : Text;
+    description : Text;
+    rows : [Text];
+    cols : [Text];
+  };
+
+  class Bench(schema : Schema, run : (Nat, Nat) -> ()) {
+    public func getVersion() : Nat = 1;
+    public func getSchema() : Schema = schema;
+    public let runCell = run;
+  };
+
+  public func init() : Bench {
+    let schema : Schema = {
+      name = "Sanity";
+      description = "Trivial bench to exercise the mops bench pipeline under EOP";
+      rows = ["a"];
+      cols = ["1"];
+    };
+    func run(_ri : Nat, _ci : Nat) {};
+    Bench(schema, run);
+  };
+};

package/tests/bench/mops.toml

@@ -0,0 +1,6 @@
+[dependencies]
+core = "2.0.0"
+
+[toolchain]
+moc = "1.3.0"
+pocket-ic = "12.0.0"

package/tests/bench.test.ts

@@ -0,0 +1,22 @@
+import { describe, expect, jest, test } from "@jest/globals";
+import { rmSync } from "node:fs";
+import path from "path";
+import { cli } from "./helpers";
+
+// Pin moc 1.3.0 (≥ 0.15) to exercise the EOP path — this repo's own mops.toml
+// uses moc 0.14.14, so the default bench run is never EOP-tested here.
+describe("bench", () => {
+  jest.setTimeout(180_000);
+
+  test("runs under EOP with the default gc", async () => {
+    const cwd = path.join(import.meta.dirname, "bench");
+    try {
+      const result = await cli(["bench"], { cwd });
+      expect(result.stderr).not.toContain("--copying-gc is not supported");
+      expect(result.stderr).not.toContain("Invalid compiler flag combination");
+      expect(result.exitCode).toBe(0);
+    } finally {
+      rmSync(path.join(cwd, ".mops"), { recursive: true, force: true });
+    }
+  });
+});