create-assistant-ui 0.0.75 → 0.0.76

package/dist/index.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
 import { main } from "./run.js";
 //#region src/index.ts
-process.on("SIGINT", () => process.exit(0));
-process.on("SIGTERM", () => process.exit(0));
 main();
 //#endregion
 

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["#!/usr/bin/env node\nimport { main } from \"./run\";\n\nprocess.on(\"SIGINT\", () => process.exit(0));\nprocess.on(\"SIGTERM\", () => process.exit(0));\n\nvoid main();\n"],"mappings":";;;AAGA,QAAQ,GAAG,gBAAgB,QAAQ,KAAK,CAAC,CAAC;AAC1C,QAAQ,GAAG,iBAAiB,QAAQ,KAAK,CAAC,CAAC;AAEtC,KAAK"}
+{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["#!/usr/bin/env node\nimport { main } from \"./run\";\n\nvoid main();\n"],"mappings":";;;AAGK,KAAK"}

package/dist/run.d.ts

@@ -1,5 +1,6 @@
 //#region src/run.d.ts
+declare function runSpawn(command: string, args: string[]): Promise<void>;
 declare function main(): Promise<void>;
 //#endregion
-export { main };
+export { main, runSpawn };
 //# sourceMappingURL=run.d.ts.map

package/dist/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","names":[],"sources":["../src/run.ts"],"mappings":";iBAoDsB,QAAQ"}
+{"version":3,"file":"run.d.ts","names":[],"sources":["../src/run.ts"],"mappings":";iBA4BgB,SAAS,iBAAiB,iBAAiB;iBAqErC,QAAQ"}

package/dist/run.js

@@ -1,6 +1,7 @@
 import { spawn } from "cross-spawn";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
+import { constants } from "node:os";
 import path from "node:path";
 //#region src/run.ts
 const require = createRequire(import.meta.url);
@@ -11,11 +12,51 @@ var SpawnExitError = class extends Error {
 		this.code = code;
 	}
 };
+var SpawnSignalError = class extends Error {
+	signal;
+	forwarded;
+	constructor(signal, forwarded) {
+		super(`Process terminated by ${signal}`);
+		this.signal = signal;
+		this.forwarded = forwarded;
+	}
+};
 function runSpawn(command, args) {
 	return new Promise((resolve, reject) => {
 		const child = spawn(command, args, { stdio: "inherit" });
-		child.on("error", (error) => reject(error));
-		child.on("close", (code) => {
+		let forwardedSignal = null;
+		const forwardSignal = (signal) => {
+			if (forwardedSignal !== null) {
+				child.kill("SIGKILL");
+				cleanup();
+				reject(new SpawnSignalError(signal, true));
+				return;
+			}
+			forwardedSignal = signal;
+			child.kill(signal);
+		};
+		const onSigint = () => forwardSignal("SIGINT");
+		const onSigterm = () => forwardSignal("SIGTERM");
+		const cleanup = () => {
+			process.off("SIGINT", onSigint);
+			process.off("SIGTERM", onSigterm);
+		};
+		process.on("SIGINT", onSigint);
+		process.on("SIGTERM", onSigterm);
+		child.on("error", (error) => {
+			cleanup();
+			reject(error);
+		});
+		child.on("close", (code, signal) => {
+			cleanup();
+			if (forwardedSignal !== null) {
+				reject(new SpawnSignalError(forwardedSignal, true));
+				return;
+			}
+			if (signal !== null) {
+				reject(new SpawnSignalError(signal, false));
+				return;
+			}
 			if (code !== 0) reject(new SpawnExitError(code || 1));
 			else resolve();
 		});
@@ -36,6 +77,13 @@ async function main() {
 		if (args[0] !== "create") args.unshift("create");
 		await runSpawn(process.execPath, [assistantUiBinPath, ...args]);
 	} catch (error) {
+		if (error instanceof SpawnSignalError) {
+			if (error.forwarded) {
+				process.removeAllListeners(error.signal);
+				process.kill(process.pid, error.signal);
+			}
+			process.exit(128 + (constants.signals[error.signal] ?? 0));
+		}
 		if (error instanceof SpawnExitError) process.exit(error.code);
 		const message = error instanceof Error ? error.message : String(error);
 		console.error(`Error: ${message}`);
@@ -43,6 +91,6 @@ async function main() {
 	}
 }
 //#endregion
-export { main };
+export { main, runSpawn };
 
 //# sourceMappingURL=run.js.map

package/dist/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","names":[],"sources":["../src/run.ts"],"sourcesContent":["import { spawn } from \"cross-spawn\";\nimport { readFile } from \"node:fs/promises\";\nimport { createRequire } from \"node:module\";\nimport path from \"node:path\";\n\nconst require = createRequire(import.meta.url);\n\nclass SpawnExitError extends Error {\n  code: number;\n\n  constructor(code: number) {\n    super(`Process exited with code ${code}`);\n    this.code = code;\n  }\n}\n\nfunction runSpawn(command: string, args: string[]): Promise<void> {\n  return new Promise((resolve, reject) => {\n    const child = spawn(command, args, {\n      stdio: \"inherit\",\n    });\n\n    child.on(\"error\", (error) => reject(error));\n    child.on(\"close\", (code) => {\n      if (code !== 0) {\n        reject(new SpawnExitError(code || 1));\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n\nasync function resolveAssistantUiBinPath(): Promise<string> {\n  const packageJsonPath = require.resolve(\"assistant-ui/package.json\");\n  const packageJsonRaw = await readFile(packageJsonPath, \"utf8\");\n  const packageJson = JSON.parse(packageJsonRaw) as {\n    bin?: string | Record<string, string>;\n  };\n\n  const bin =\n    typeof packageJson.bin === \"string\"\n      ? packageJson.bin\n      : packageJson.bin?.[\"assistant-ui\"];\n\n  if (!bin) {\n    throw new Error(\"assistant-ui package does not expose a binary.\");\n  }\n\n  return path.resolve(path.dirname(packageJsonPath), bin);\n}\n\nexport async function main(): Promise<void> {\n  try {\n    const assistantUiBinPath = await resolveAssistantUiBinPath();\n\n    const args = process.argv.slice(2);\n    if (args[0] !== \"create\") {\n      args.unshift(\"create\");\n    }\n\n    await runSpawn(process.execPath, [assistantUiBinPath, ...args]);\n  } catch (error) {\n    if (error instanceof SpawnExitError) {\n      process.exit(error.code);\n    }\n\n    const message = error instanceof Error ? error.message : String(error);\n    console.error(`Error: ${message}`);\n    process.exit(1);\n  }\n}\n"],"mappings":";;;;;AAKA,MAAM,UAAU,cAAc,YAAY,GAAG;AAE7C,IAAM,iBAAN,cAA6B,MAAM;CACjC;CAEA,YAAY,MAAc;EACxB,MAAM,4BAA4B,MAAM;EACxC,KAAK,OAAO;CACd;AACF;AAEA,SAAS,SAAS,SAAiB,MAA+B;CAChE,OAAO,IAAI,SAAS,SAAS,WAAW;EACtC,MAAM,QAAQ,MAAM,SAAS,MAAM,EACjC,OAAO,UACT,CAAC;EAED,MAAM,GAAG,UAAU,UAAU,OAAO,KAAK,CAAC;EAC1C,MAAM,GAAG,UAAU,SAAS;GAC1B,IAAI,SAAS,GACX,OAAO,IAAI,eAAe,QAAQ,CAAC,CAAC;QAEpC,QAAQ;EAEZ,CAAC;CACH,CAAC;AACH;AAEA,eAAe,4BAA6C;CAC1D,MAAM,kBAAkB,QAAQ,QAAQ,2BAA2B;CACnE,MAAM,iBAAiB,MAAM,SAAS,iBAAiB,MAAM;CAC7D,MAAM,cAAc,KAAK,MAAM,cAAc;CAI7C,MAAM,MACJ,OAAO,YAAY,QAAQ,WACvB,YAAY,MACZ,YAAY,MAAM;CAExB,IAAI,CAAC,KACH,MAAM,IAAI,MAAM,gDAAgD;CAGlE,OAAO,KAAK,QAAQ,KAAK,QAAQ,eAAe,GAAG,GAAG;AACxD;AAEA,eAAsB,OAAsB;CAC1C,IAAI;EACF,MAAM,qBAAqB,MAAM,0BAA0B;EAE3D,MAAM,OAAO,QAAQ,KAAK,MAAM,CAAC;EACjC,IAAI,KAAK,OAAO,UACd,KAAK,QAAQ,QAAQ;EAGvB,MAAM,SAAS,QAAQ,UAAU,CAAC,oBAAoB,GAAG,IAAI,CAAC;CAChE,SAAS,OAAO;EACd,IAAI,iBAAiB,gBACnB,QAAQ,KAAK,MAAM,IAAI;EAGzB,MAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;EACrE,QAAQ,MAAM,UAAU,SAAS;EACjC,QAAQ,KAAK,CAAC;CAChB;AACF"}
+{"version":3,"file":"run.js","names":[],"sources":["../src/run.ts"],"sourcesContent":["import { spawn } from \"cross-spawn\";\nimport { readFile } from \"node:fs/promises\";\nimport { createRequire } from \"node:module\";\nimport { constants } from \"node:os\";\nimport path from \"node:path\";\n\nconst require = createRequire(import.meta.url);\n\nclass SpawnExitError extends Error {\n  code: number;\n\n  constructor(code: number) {\n    super(`Process exited with code ${code}`);\n    this.code = code;\n  }\n}\n\nclass SpawnSignalError extends Error {\n  signal: NodeJS.Signals;\n  forwarded: boolean;\n\n  constructor(signal: NodeJS.Signals, forwarded: boolean) {\n    super(`Process terminated by ${signal}`);\n    this.signal = signal;\n    this.forwarded = forwarded;\n  }\n}\n\nexport function runSpawn(command: string, args: string[]): Promise<void> {\n  return new Promise((resolve, reject) => {\n    const child = spawn(command, args, {\n      stdio: \"inherit\",\n    });\n    let forwardedSignal: NodeJS.Signals | null = null;\n\n    const forwardSignal = (signal: NodeJS.Signals) => {\n      if (forwardedSignal !== null) {\n        child.kill(\"SIGKILL\");\n        cleanup();\n        reject(new SpawnSignalError(signal, true));\n        return;\n      }\n      forwardedSignal = signal;\n      child.kill(signal);\n    };\n    const onSigint = () => forwardSignal(\"SIGINT\");\n    const onSigterm = () => forwardSignal(\"SIGTERM\");\n    const cleanup = () => {\n      process.off(\"SIGINT\", onSigint);\n      process.off(\"SIGTERM\", onSigterm);\n    };\n\n    process.on(\"SIGINT\", onSigint);\n    process.on(\"SIGTERM\", onSigterm);\n\n    child.on(\"error\", (error) => {\n      cleanup();\n      reject(error);\n    });\n    child.on(\"close\", (code, signal) => {\n      cleanup();\n      if (forwardedSignal !== null) {\n        reject(new SpawnSignalError(forwardedSignal, true));\n        return;\n      }\n      if (signal !== null) {\n        reject(new SpawnSignalError(signal, false));\n        return;\n      }\n      if (code !== 0) {\n        reject(new SpawnExitError(code || 1));\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n\nasync function resolveAssistantUiBinPath(): Promise<string> {\n  const packageJsonPath = require.resolve(\"assistant-ui/package.json\");\n  const packageJsonRaw = await readFile(packageJsonPath, \"utf8\");\n  const packageJson = JSON.parse(packageJsonRaw) as {\n    bin?: string | Record<string, string>;\n  };\n\n  const bin =\n    typeof packageJson.bin === \"string\"\n      ? packageJson.bin\n      : packageJson.bin?.[\"assistant-ui\"];\n\n  if (!bin) {\n    throw new Error(\"assistant-ui package does not expose a binary.\");\n  }\n\n  return path.resolve(path.dirname(packageJsonPath), bin);\n}\n\nexport async function main(): Promise<void> {\n  try {\n    const assistantUiBinPath = await resolveAssistantUiBinPath();\n\n    const args = process.argv.slice(2);\n    if (args[0] !== \"create\") {\n      args.unshift(\"create\");\n    }\n\n    await runSpawn(process.execPath, [assistantUiBinPath, ...args]);\n  } catch (error) {\n    if (error instanceof SpawnSignalError) {\n      if (error.forwarded) {\n        process.removeAllListeners(error.signal);\n        process.kill(process.pid, error.signal);\n      }\n      process.exit(128 + (constants.signals[error.signal] ?? 0));\n    }\n\n    if (error instanceof SpawnExitError) {\n      process.exit(error.code);\n    }\n\n    const message = error instanceof Error ? error.message : String(error);\n    console.error(`Error: ${message}`);\n    process.exit(1);\n  }\n}\n"],"mappings":";;;;;;AAMA,MAAM,UAAU,cAAc,YAAY,GAAG;AAE7C,IAAM,iBAAN,cAA6B,MAAM;CACjC;CAEA,YAAY,MAAc;EACxB,MAAM,4BAA4B,MAAM;EACxC,KAAK,OAAO;CACd;AACF;AAEA,IAAM,mBAAN,cAA+B,MAAM;CACnC;CACA;CAEA,YAAY,QAAwB,WAAoB;EACtD,MAAM,yBAAyB,QAAQ;EACvC,KAAK,SAAS;EACd,KAAK,YAAY;CACnB;AACF;AAEA,SAAgB,SAAS,SAAiB,MAA+B;CACvE,OAAO,IAAI,SAAS,SAAS,WAAW;EACtC,MAAM,QAAQ,MAAM,SAAS,MAAM,EACjC,OAAO,UACT,CAAC;EACD,IAAI,kBAAyC;EAE7C,MAAM,iBAAiB,WAA2B;GAChD,IAAI,oBAAoB,MAAM;IAC5B,MAAM,KAAK,SAAS;IACpB,QAAQ;IACR,OAAO,IAAI,iBAAiB,QAAQ,IAAI,CAAC;IACzC;GACF;GACA,kBAAkB;GAClB,MAAM,KAAK,MAAM;EACnB;EACA,MAAM,iBAAiB,cAAc,QAAQ;EAC7C,MAAM,kBAAkB,cAAc,SAAS;EAC/C,MAAM,gBAAgB;GACpB,QAAQ,IAAI,UAAU,QAAQ;GAC9B,QAAQ,IAAI,WAAW,SAAS;EAClC;EAEA,QAAQ,GAAG,UAAU,QAAQ;EAC7B,QAAQ,GAAG,WAAW,SAAS;EAE/B,MAAM,GAAG,UAAU,UAAU;GAC3B,QAAQ;GACR,OAAO,KAAK;EACd,CAAC;EACD,MAAM,GAAG,UAAU,MAAM,WAAW;GAClC,QAAQ;GACR,IAAI,oBAAoB,MAAM;IAC5B,OAAO,IAAI,iBAAiB,iBAAiB,IAAI,CAAC;IAClD;GACF;GACA,IAAI,WAAW,MAAM;IACnB,OAAO,IAAI,iBAAiB,QAAQ,KAAK,CAAC;IAC1C;GACF;GACA,IAAI,SAAS,GACX,OAAO,IAAI,eAAe,QAAQ,CAAC,CAAC;QAEpC,QAAQ;EAEZ,CAAC;CACH,CAAC;AACH;AAEA,eAAe,4BAA6C;CAC1D,MAAM,kBAAkB,QAAQ,QAAQ,2BAA2B;CACnE,MAAM,iBAAiB,MAAM,SAAS,iBAAiB,MAAM;CAC7D,MAAM,cAAc,KAAK,MAAM,cAAc;CAI7C,MAAM,MACJ,OAAO,YAAY,QAAQ,WACvB,YAAY,MACZ,YAAY,MAAM;CAExB,IAAI,CAAC,KACH,MAAM,IAAI,MAAM,gDAAgD;CAGlE,OAAO,KAAK,QAAQ,KAAK,QAAQ,eAAe,GAAG,GAAG;AACxD;AAEA,eAAsB,OAAsB;CAC1C,IAAI;EACF,MAAM,qBAAqB,MAAM,0BAA0B;EAE3D,MAAM,OAAO,QAAQ,KAAK,MAAM,CAAC;EACjC,IAAI,KAAK,OAAO,UACd,KAAK,QAAQ,QAAQ;EAGvB,MAAM,SAAS,QAAQ,UAAU,CAAC,oBAAoB,GAAG,IAAI,CAAC;CAChE,SAAS,OAAO;EACd,IAAI,iBAAiB,kBAAkB;GACrC,IAAI,MAAM,WAAW;IACnB,QAAQ,mBAAmB,MAAM,MAAM;IACvC,QAAQ,KAAK,QAAQ,KAAK,MAAM,MAAM;GACxC;GACA,QAAQ,KAAK,OAAO,UAAU,QAAQ,MAAM,WAAW,EAAE;EAC3D;EAEA,IAAI,iBAAiB,gBACnB,QAAQ,KAAK,MAAM,IAAI;EAGzB,MAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;EACrE,QAAQ,MAAM,UAAU,SAAS;EACjC,QAAQ,KAAK,CAAC;CAChB;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-assistant-ui",
-  "version": "0.0.75",
+  "version": "0.0.76",
   "description": "Create assistant-ui apps with one command",
   "keywords": [
     "cli",
@@ -25,12 +25,13 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "cross-spawn": "^7.0.6",
-    "assistant-ui": "0.0.112"
+    "assistant-ui": "0.0.113",
+    "cross-spawn": "^7.0.6"
   },
   "devDependencies": {
+    "@assistant-ui/x-buildutils": "0.0.24",
     "@types/cross-spawn": "^6.0.6",
-    "@assistant-ui/x-buildutils": "0.0.23"
+    "vitest": "^4.1.11"
   },
   "publishConfig": {
     "access": "public",
@@ -46,6 +47,7 @@
     "url": "https://github.com/assistant-ui/assistant-ui/issues"
   },
   "scripts": {
-    "build": "aui-build"
+    "build": "aui-build",
+    "test": "vitest run"
   }
 }

package/src/index.ts

@@ -1,7 +1,4 @@
 #!/usr/bin/env node
 import { main } from "./run";
 
-process.on("SIGINT", () => process.exit(0));
-process.on("SIGTERM", () => process.exit(0));
-
 void main();

package/src/run.test.ts

@@ -0,0 +1,155 @@
+import { EventEmitter } from "node:events";
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  spawn: vi.fn(),
+}));
+
+vi.mock("cross-spawn", async (importOriginal) => ({
+  ...(await importOriginal()),
+  spawn: mocks.spawn,
+}));
+
+import { main, runSpawn } from "./run";
+
+const createChild = () =>
+  Object.assign(new EventEmitter(), {
+    kill: vi.fn(() => true),
+  });
+
+describe("runSpawn", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+    vi.clearAllMocks();
+  });
+
+  it("forwards termination signals to the child", async () => {
+    const child = createChild();
+    mocks.spawn.mockReturnValue(child);
+    const existingListeners = new Set(process.listeners("SIGTERM"));
+    const initialListeners = process.listenerCount("SIGTERM");
+    const result = runSpawn("assistant-ui", ["create"]);
+    const signalHandler = process
+      .listeners("SIGTERM")
+      .find((listener) => !existingListeners.has(listener));
+
+    expect(signalHandler).toBeDefined();
+    signalHandler?.();
+    expect(child.kill).toHaveBeenCalledWith("SIGTERM");
+
+    child.emit("close", 0, null);
+    await expect(result).rejects.toMatchObject({
+      signal: "SIGTERM",
+      forwarded: true,
+    });
+    expect(process.listenerCount("SIGTERM")).toBe(initialListeners);
+  });
+
+  it("force-stops the child after a repeated termination signal", async () => {
+    const child = createChild();
+    mocks.spawn.mockReturnValue(child);
+    const existingListeners = new Set(process.listeners("SIGTERM"));
+    const initialListeners = process.listenerCount("SIGTERM");
+    const result = runSpawn("assistant-ui", ["create"]);
+    const signalHandler = process
+      .listeners("SIGTERM")
+      .find((listener) => !existingListeners.has(listener));
+
+    expect(signalHandler).toBeDefined();
+    signalHandler?.();
+    signalHandler?.();
+
+    expect(child.kill).toHaveBeenNthCalledWith(1, "SIGTERM");
+    expect(child.kill).toHaveBeenNthCalledWith(2, "SIGKILL");
+    await expect(result).rejects.toMatchObject({
+      signal: "SIGTERM",
+      forwarded: true,
+    });
+    expect(process.listenerCount("SIGTERM")).toBe(initialListeners);
+  });
+
+  it("distinguishes child crash signals from forwarded signals", async () => {
+    const child = createChild();
+    mocks.spawn.mockReturnValue(child);
+    const result = runSpawn("assistant-ui", ["create"]);
+
+    child.emit("close", null, "SIGSEGV");
+
+    await expect(result).rejects.toMatchObject({
+      signal: "SIGSEGV",
+      forwarded: false,
+    });
+  });
+
+  it("removes signal forwarding after normal completion", async () => {
+    const child = createChild();
+    mocks.spawn.mockReturnValue(child);
+    const initialSigintListeners = process.listenerCount("SIGINT");
+    const initialSigtermListeners = process.listenerCount("SIGTERM");
+    const result = runSpawn("assistant-ui", ["create"]);
+
+    child.emit("close", 0, null);
+    await expect(result).resolves.toBeUndefined();
+
+    expect(process.listenerCount("SIGINT")).toBe(initialSigintListeners);
+    expect(process.listenerCount("SIGTERM")).toBe(initialSigtermListeners);
+  });
+});
+
+describe("main", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+    vi.clearAllMocks();
+  });
+
+  it("re-raises a signal forwarded to the child", async () => {
+    const child = createChild();
+    mocks.spawn.mockReturnValue(child);
+    const existingListeners = new Set(process.listeners("SIGTERM"));
+    const kill = vi.spyOn(process, "kill").mockReturnValue(true);
+    const removeAllListeners = vi
+      .spyOn(process, "removeAllListeners")
+      .mockReturnValue(process);
+    const exit = vi.spyOn(process, "exit").mockImplementation(() => {
+      throw new Error("process.exit");
+    });
+    const result = main();
+
+    await vi.waitFor(() => expect(mocks.spawn).toHaveBeenCalledOnce());
+    const signalHandler = process
+      .listeners("SIGTERM")
+      .find((listener) => !existingListeners.has(listener));
+    expect(signalHandler).toBeDefined();
+    signalHandler?.();
+    child.emit("close", null, "SIGTERM");
+
+    await expect(result).rejects.toThrow("process.exit");
+    expect(removeAllListeners).toHaveBeenCalledWith("SIGTERM");
+    expect(kill).toHaveBeenCalledWith(process.pid, "SIGTERM");
+    expect(removeAllListeners.mock.invocationCallOrder[0]).toBeLessThan(
+      kill.mock.invocationCallOrder[0]!,
+    );
+    expect(exit).toHaveBeenCalledWith(143);
+  });
+
+  it("does not re-raise a signal received only by the child", async () => {
+    const child = createChild();
+    mocks.spawn.mockReturnValue(child);
+    const kill = vi.spyOn(process, "kill").mockReturnValue(true);
+    const removeAllListeners = vi
+      .spyOn(process, "removeAllListeners")
+      .mockReturnValue(process);
+    const exit = vi.spyOn(process, "exit").mockImplementation(() => {
+      throw new Error("process.exit");
+    });
+    const result = main();
+
+    await vi.waitFor(() => expect(mocks.spawn).toHaveBeenCalledOnce());
+    child.emit("close", null, "SIGSEGV");
+
+    await expect(result).rejects.toThrow("process.exit");
+    expect(removeAllListeners).not.toHaveBeenCalled();
+    expect(kill).not.toHaveBeenCalled();
+    expect(exit).toHaveBeenCalledWith(139);
+  });
+});

package/src/run.ts

@@ -1,6 +1,7 @@
 import { spawn } from "cross-spawn";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
+import { constants } from "node:os";
 import path from "node:path";
 
 const require = createRequire(import.meta.url);
@@ -14,14 +15,58 @@ class SpawnExitError extends Error {
   }
 }
 
-function runSpawn(command: string, args: string[]): Promise<void> {
+class SpawnSignalError extends Error {
+  signal: NodeJS.Signals;
+  forwarded: boolean;
+
+  constructor(signal: NodeJS.Signals, forwarded: boolean) {
+    super(`Process terminated by ${signal}`);
+    this.signal = signal;
+    this.forwarded = forwarded;
+  }
+}
+
+export function runSpawn(command: string, args: string[]): Promise<void> {
   return new Promise((resolve, reject) => {
     const child = spawn(command, args, {
       stdio: "inherit",
     });
+    let forwardedSignal: NodeJS.Signals | null = null;
+
+    const forwardSignal = (signal: NodeJS.Signals) => {
+      if (forwardedSignal !== null) {
+        child.kill("SIGKILL");
+        cleanup();
+        reject(new SpawnSignalError(signal, true));
+        return;
+      }
+      forwardedSignal = signal;
+      child.kill(signal);
+    };
+    const onSigint = () => forwardSignal("SIGINT");
+    const onSigterm = () => forwardSignal("SIGTERM");
+    const cleanup = () => {
+      process.off("SIGINT", onSigint);
+      process.off("SIGTERM", onSigterm);
+    };
+
+    process.on("SIGINT", onSigint);
+    process.on("SIGTERM", onSigterm);
 
-    child.on("error", (error) => reject(error));
-    child.on("close", (code) => {
+    child.on("error", (error) => {
+      cleanup();
+      reject(error);
+    });
+    child.on("close", (code, signal) => {
+      cleanup();
+      if (forwardedSignal !== null) {
+        reject(new SpawnSignalError(forwardedSignal, true));
+        return;
+      }
+      if (signal !== null) {
+        reject(new SpawnSignalError(signal, false));
+        return;
+      }
       if (code !== 0) {
         reject(new SpawnExitError(code || 1));
       } else {
@@ -61,6 +106,14 @@ export async function main(): Promise<void> {
 
     await runSpawn(process.execPath, [assistantUiBinPath, ...args]);
   } catch (error) {
+    if (error instanceof SpawnSignalError) {
+      if (error.forwarded) {
+        process.removeAllListeners(error.signal);
+        process.kill(process.pid, error.signal);
+      }
+      process.exit(128 + (constants.signals[error.signal] ?? 0));
+    }
+
     if (error instanceof SpawnExitError) {
       process.exit(error.code);
     }