5843a78dbf
Moved the tiny title/memory worker from a Bun Worker thread into a child process spawned via Bun.spawn IPC. The agent CLI gains a hidden --tiny-worker dispatch the parent invokes through process.execPath; the parent SIGKILLs the child on dispose so onnxruntime-node's NAPI finalizer never runs in any address space the agent owns. On Windows that finalizer was segfaulting Bun at shutdown after the tiny title model loaded (issue #1606). Drops the now-dead 'close'/'closed' handshake and the unused parentPort bootstrap, and removes tiny/worker.ts from --compile worker entries in both build scripts plus the regression test that pinned them. Fixes #1606
124 lines
4.6 KiB
TypeScript
Executable File
124 lines
4.6 KiB
TypeScript
Executable File
#!/usr/bin/env bun
|
|
// Strip macOS malloc-stack-logging vars in the parent entrypoint, before any
|
|
// subprocess/worker spawn. libmalloc reads MallocStackLogging /
|
|
// MallocStackLoggingNoCompact during malloc bootstrap (pre-main) in every child
|
|
// and warns when they're present but set to "off"; a child cannot suppress its
|
|
// own warning, so the only fix is to keep them out of the inherited env here.
|
|
// (They must be unset, not set — presence is the trigger.)
|
|
try {
|
|
delete process.env.MallocStackLogging;
|
|
delete process.env.MallocStackLoggingNoCompact;
|
|
} catch {}
|
|
|
|
/**
|
|
* CLI entry point — registers all commands explicitly and delegates to the
|
|
* lightweight CLI runner from pi-utils.
|
|
*/
|
|
import { type CliConfig, run } from "@oh-my-pi/pi-utils/cli";
|
|
import { APP_NAME, MIN_BUN_VERSION, VERSION } from "@oh-my-pi/pi-utils/dirs";
|
|
import { commands, isSubcommand } from "./cli-commands";
|
|
|
|
if (Bun.semver.order(Bun.version, MIN_BUN_VERSION) < 0) {
|
|
process.stderr.write(
|
|
`error: Bun runtime must be >= ${MIN_BUN_VERSION} (found v${Bun.version}). Please upgrade: bun upgrade\n`,
|
|
);
|
|
process.exit(1);
|
|
}
|
|
|
|
process.title = APP_NAME;
|
|
|
|
async function showHelp(config: CliConfig): Promise<void> {
|
|
const { renderRootHelp } = await import("@oh-my-pi/pi-utils/cli");
|
|
const { getExtraHelpText } = await import("./cli/args");
|
|
renderRootHelp(config);
|
|
const extra = getExtraHelpText();
|
|
if (extra.trim().length > 0) {
|
|
process.stdout.write(`\n${extra}\n`);
|
|
}
|
|
}
|
|
/**
|
|
* Smoke-test entry. Spawns bundled workers, pings them, exits.
|
|
*
|
|
* Purpose: catch the silent worker-load regressions that hit compiled
|
|
* binaries (issues #1011 and #1027). Version/help paths do not spawn worker
|
|
* modules on a fresh install, so this probe is the minimal end-to-end test
|
|
* that proves `new Worker(...)` resolves and bundled worker modules evaluate.
|
|
* Wired into `scripts/install-tests/run-ci.sh` so binary / source-link /
|
|
* tarball installs all exercise it on every CI run.
|
|
*/
|
|
async function runSmokeTest(): Promise<void> {
|
|
const { smokeTestSyncWorker } = await import("@oh-my-pi/omp-stats");
|
|
const { smokeTestTinyTitleWorker } = await import("./tiny/title-client");
|
|
await smokeTestSyncWorker();
|
|
await smokeTestTinyTitleWorker();
|
|
process.stdout.write("smoke-test: ok\n");
|
|
}
|
|
|
|
/**
|
|
* Hidden subcommand that boots the tiny-model worker inside this process
|
|
* over the parent's IPC channel. The agent's main process spawns the same
|
|
* binary with this flag so `onnxruntime-node` (loaded transitively by
|
|
* `@huggingface/transformers`) lives in a child address space. The parent
|
|
* `SIGKILL`s the child on shutdown so the NAPI finalizer never runs in
|
|
* either process — that finalizer segfaults Bun on Windows (issue #1606).
|
|
*/
|
|
async function runTinyWorker(): Promise<void> {
|
|
const { startTinyTitleWorker } = await import("./tiny/worker");
|
|
const { promise: shuttingDown, resolve: shutdown } = Promise.withResolvers<void>();
|
|
const send = (message: unknown): void => {
|
|
// `process.send` only exists when spawned with an IPC channel; the
|
|
// parent always spawns us that way. If it's missing, the parent
|
|
// vanished and there's no one to talk to.
|
|
const sender = (process as NodeJS.Process & { send?: (m: unknown) => boolean }).send;
|
|
if (!sender) {
|
|
shutdown();
|
|
return;
|
|
}
|
|
try {
|
|
sender.call(process, message);
|
|
} catch {
|
|
shutdown();
|
|
}
|
|
};
|
|
startTinyTitleWorker({
|
|
send,
|
|
onMessage(handler) {
|
|
const wrap = (data: unknown): void => handler(data as never);
|
|
process.on("message", wrap);
|
|
return () => {
|
|
process.off("message", wrap);
|
|
};
|
|
},
|
|
});
|
|
// Parent went away (crashed, SIGKILL, etc.) — commit suicide so we don't
|
|
// linger as an orphan. SIGKILL via `process.kill` keeps us symmetrical
|
|
// with the parent's hard-kill on shutdown: skip every JS/native finalizer.
|
|
process.on("disconnect", () => shutdown());
|
|
await shuttingDown;
|
|
process.kill(process.pid, "SIGKILL");
|
|
}
|
|
|
|
/** Run the CLI with the given argv (no `process.argv` prefix). */
|
|
export async function runCli(argv: string[]): Promise<void> {
|
|
if (argv[0] === "--smoke-test") {
|
|
await runSmokeTest();
|
|
return;
|
|
}
|
|
if (argv[0] === "--tiny-worker") {
|
|
await runTinyWorker();
|
|
return;
|
|
}
|
|
// --help and --version are handled by run() directly, don't rewrite those.
|
|
// Everything else that isn't a known subcommand routes to "launch".
|
|
const first = argv[0];
|
|
const runArgv =
|
|
first === "--help" || first === "-h" || first === "--version" || first === "-v" || first === "help"
|
|
? argv
|
|
: isSubcommand(first)
|
|
? argv
|
|
: ["launch", ...argv];
|
|
return run({ bin: APP_NAME, version: VERSION, argv: runArgv, commands, help: showHelp });
|
|
}
|
|
|
|
await runCli(process.argv.slice(2));
|