@mercury-fw/cli 0.46.1 → 0.47.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @mercury-fw/cli
 
+## 0.47.1
+
+### Patch Changes
+
+- e005ca4: - `mfw e2e`: a REPL that exits before its stderr has been read no longer reports "exited with code N:" without the reason.
+  - @mercury-fw/core@0.47.1
+  - @mercury-fw/utils@0.47.1
+
+## 0.47.0
+
+### Patch Changes
+
+- Updated dependencies [3d73e59]
+  - @mercury-fw/core@0.47.0
+  - @mercury-fw/utils@0.47.0
+
 ## 0.46.1
 
 ### Patch Changes

package/dist/src/e2e/session.d.ts

@@ -10,6 +10,20 @@ export type ReplSessionOptions = {
     name: string;
     /** How long one turn may take. */
     timeoutMs: number;
+    /** Starts the REPL; a test hands in a stand-in process. */
+    spawn?: (argv: string[], cwd: string) => ReplProcess;
+};
+/** The parts of a spawned process the session uses. */
+export type ReplProcess = {
+    stdin: {
+        write: (text: string) => unknown;
+        flush: () => unknown;
+        end: () => unknown;
+    };
+    stdout: ReadableStream<Uint8Array>;
+    stderr: ReadableStream<Uint8Array>;
+    exited: Promise<number>;
+    kill: () => void;
 };
 /** Starts the REPL and returns the session over it once the REPL is ready
  * (its first prompt is out), so a turn's time is only the turn's; throws

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercury-fw/cli",
-  "version": "0.46.1",
+  "version": "0.47.1",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -41,21 +41,21 @@
   "comment:shape": "The Mercury CLI (`mfw`). `mfw create <dir>` writes a new Mercury app from the template. The framework packages move in lockstep with it, so a new app gets them at the CLI's own version; plugins and channels at the registry's latest. The plugin and channel packages are devDependencies only for the catalog test. `main(argv)` is exported for create-mercury-agent.",
   "dependencies": {
     "@clack/prompts": "^1.8.1",
-    "@mercury-fw/core": "0.46.1",
-    "@mercury-fw/utils": "0.46.1",
+    "@mercury-fw/core": "0.47.1",
+    "@mercury-fw/utils": "0.47.1",
     "commander": "^15.0.0"
   },
   "devDependencies": {
-    "@mercury-fw/auth-oidc": "0.1.1",
+    "@mercury-fw/auth-oidc": "0.2.0",
     "@mercury-fw/auth-static": "0.2.1",
     "@mercury-fw/channel-google-chat": "0.7.0",
-    "@mercury-fw/channel-http": "0.8.2",
+    "@mercury-fw/channel-http": "0.8.3",
     "@mercury-fw/directory-static": "0.1.1",
-    "@mercury-fw/formatter": "0.46.1",
+    "@mercury-fw/formatter": "0.47.1",
     "@mercury-fw/plugin-atlassian-admin": "0.3.2",
     "@mercury-fw/plugin-bitbucket": "0.4.1",
     "@mercury-fw/plugin-jira": "0.6.2",
-    "@mercury-fw/plugin-zitadel": "0.3.1",
+    "@mercury-fw/plugin-zitadel": "0.3.2",
     "@mercury-fw/typescript-config": "*",
     "@types/bun": "^1.4.2",
     "typescript": "^6.0.3"

package/src/e2e/session.ts

@@ -22,13 +22,31 @@ export type ReplSessionOptions = {
   name: string;
   /** How long one turn may take. */
   timeoutMs: number;
+  /** Starts the REPL; a test hands in a stand-in process. */
+  spawn?: (argv: string[], cwd: string) => ReplProcess;
 };
 
+/** The parts of a spawned process the session uses. */
+export type ReplProcess = {
+  stdin: { write: (text: string) => unknown; flush: () => unknown; end: () => unknown };
+  stdout: ReadableStream<Uint8Array>;
+  stderr: ReadableStream<Uint8Array>;
+  exited: Promise<number>;
+  kill: () => void;
+};
+
+/** How long, once the REPL is gone, its stderr may take to be read to its end. */
+const STDERR_DRAIN_MS = 1000;
+
+function spawnRepl(argv: string[], cwd: string): ReplProcess {
+  return Bun.spawn(argv, { cwd, stdin: "pipe", stdout: "pipe", stderr: "pipe" });
+}
+
 /** Starts the REPL and returns the session over it once the REPL is ready
  * (its first prompt is out), so a turn's time is only the turn's; throws
  * when the REPL exits or doesn't get there in time. */
 export async function openReplSession(opts: ReplSessionOptions): Promise<Session<ReplReply>> {
-  const proc = Bun.spawn(opts.argv, { cwd: opts.cwd, stdin: "pipe", stdout: "pipe", stderr: "pipe" });
+  const proc = (opts.spawn ?? spawnRepl)(opts.argv, opts.cwd);
   let stdout = "";
   let stderr = "";
   let exited: number | undefined;
@@ -42,8 +60,11 @@ export async function openReplSession(opts: ReplSessionOptions): Promise<Session
     }
   };
   void pump(proc.stdout, (t) => (stdout += t));
-  void pump(proc.stderr, (t) => (stderr += t));
-  void proc.exited.then((code) => {
+  const stderrRead = pump(proc.stderr, (t) => (stderr += t)).catch(() => {});
+  // The exit counts once stderr is read to its end, or the reason it gives is
+  // lost; a grandchild still holding the pipe open bounds the wait.
+  void proc.exited.then(async (code) => {
+    await Promise.race([stderrRead, new Promise((r) => setTimeout(r, STDERR_DRAIN_MS))]);
     exited = code;
     notify();
   });