fix: enforce pnpm-only UI runner (#1002) (thanks @tosh-hamburg)

CHANGELOG.md

@@ -49,6 +49,7 @@
 - Fix: list model picker entries as provider/model pairs for explicit selection. (#970) — thanks @mcinteerj.
 - Fix: align OpenAI image-gen defaults with DALL-E 3 standard quality and document output formats. (#880) — thanks @mkbehr.
 - Fix: persist `gateway.mode=local` after selecting Local run mode in `clawdbot configure`, even if no other sections are chosen.
+- Fix: run UI install/build with pnpm only (Docker avoids bun failures). (#1002) — thanks @tosh-hamburg.
 - Daemon: fix profile-aware service label resolution (env-driven) and add coverage for launchd/systemd/schtasks. (#969) — thanks @bjesuiter.
 - Agents: avoid false positives when logging unsupported Google tool schema keywords.
 - Agents: skip Gemini history downgrades for google-antigravity to preserve tool calls. (#894) — thanks @mukhtharcm.
@@ -66,7 +67,6 @@
 - Fix: normalize pairing CLI aliases, allow extension channels, and harden Zalo webhook payload parsing. (#991) — thanks @longmaba.
 - Fix: allow local Tailscale Serve hostnames without treating tailnet clients as direct. (#885) — thanks @oswalpalash.
 - Fix: reset sessions after role-ordering conflicts to recover from consecutive user turns. (#998)
-- Fix: keep background exec aborts from killing backgrounded sessions while honoring timeouts. (#1000) — thanks @roshanasingh4.
 
 ## 2026.1.14-1
 

Dockerfile

@@ -1,9 +1,5 @@
 FROM node:22-bookworm
 
-# Install Bun (required for build scripts)
-RUN curl -fsSL https://bun.sh/install | bash
-ENV PATH="/root/.bun/bin:${PATH}"
-
 RUN corepack enable
 
 WORKDIR /app

README.md

@@ -492,5 +492,5 @@ Thanks to all clawtributors:
   <a href="https://github.com/MSch"><img src="https://avatars.githubusercontent.com/u/7475?v=4&s=48" width="48" height="48" alt="MSch" title="MSch"/></a> <a href="https://github.com/search?q=Mustafa%20Tag%20Eldeen"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mustafa Tag Eldeen" title="Mustafa Tag Eldeen"/></a> <a href="https://github.com/ndraiman"><img src="https://avatars.githubusercontent.com/u/12609607?v=4&s=48" width="48" height="48" alt="ndraiman" title="ndraiman"/></a> <a href="https://github.com/nexty5870"><img src="https://avatars.githubusercontent.com/u/3869659?v=4&s=48" width="48" height="48" alt="nexty5870" title="nexty5870"/></a> <a href="https://github.com/prathamdby"><img src="https://avatars.githubusercontent.com/u/134331217?v=4&s=48" width="48" height="48" alt="prathamdby" title="prathamdby"/></a> <a href="https://github.com/reeltimeapps"><img src="https://avatars.githubusercontent.com/u/637338?v=4&s=48" width="48" height="48" alt="reeltimeapps" title="reeltimeapps"/></a> <a href="https://github.com/RLTCmpe"><img src="https://avatars.githubusercontent.com/u/10762242?v=4&s=48" width="48" height="48" alt="RLTCmpe" title="RLTCmpe"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a> <a href="https://github.com/search?q=Rony%20Kelner"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rony Kelner" title="Rony Kelner"/></a> <a href="https://github.com/search?q=Samrat%20Jha"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Samrat Jha" title="Samrat Jha"/></a>
   <a href="https://github.com/siraht"><img src="https://avatars.githubusercontent.com/u/73152895?v=4&s=48" width="48" height="48" alt="siraht" title="siraht"/></a> <a href="https://github.com/snopoke"><img src="https://avatars.githubusercontent.com/u/249606?v=4&s=48" width="48" height="48" alt="snopoke" title="snopoke"/></a> <a href="https://github.com/search?q=The%20Admiral"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="The Admiral" title="The Admiral"/></a> <a href="https://github.com/voidserf"><img src="https://avatars.githubusercontent.com/u/477673?v=4&s=48" width="48" height="48" alt="voidserf" title="voidserf"/></a> <a href="https://github.com/wes-davis"><img src="https://avatars.githubusercontent.com/u/16506720?v=4&s=48" width="48" height="48" alt="wes-davis" title="wes-davis"/></a> <a href="https://github.com/wstock"><img src="https://avatars.githubusercontent.com/u/1394687?v=4&s=48" width="48" height="48" alt="wstock" title="wstock"/></a> <a href="https://github.com/YuriNachos"><img src="https://avatars.githubusercontent.com/u/19365375?v=4&s=48" width="48" height="48" alt="YuriNachos" title="YuriNachos"/></a> <a href="https://github.com/search?q=Zach%20Knickerbocker"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Zach Knickerbocker" title="Zach Knickerbocker"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a>
   <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/cpojer"><img src="https://avatars.githubusercontent.com/u/13352?v=4&s=48" width="48" height="48" alt="cpojer" title="cpojer"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a> <a href="https://github.com/longmaba"><img src="https://avatars.githubusercontent.com/u/9361500?v=4&s=48" width="48" height="48" alt="longmaba" title="longmaba"/></a> <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a>
-  <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
+  <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/thesash"><img src="https://avatars.githubusercontent.com/u/1166151?v=4&s=48" width="48" height="48" alt="thesash" title="thesash"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a> <a href="https://github.com/tosh-hamburg"><img src="https://avatars.githubusercontent.com/u/58424326?v=4&s=48" width="48" height="48" alt="tosh-hamburg" title="tosh-hamburg"/></a>
 </p>

scripts/ui.js

@@ -45,10 +45,8 @@ function which(cmd) {
 }
 
 function resolveRunner() {
-  const bun = which("bun");
-  if (bun) return { cmd: bun, kind: "bun" };
   const pnpm = which("pnpm");
-  if (pnpm) return { cmd: pnpm, kind: "pnpm" };
+  if (pnpm) return pnpm;
   return null;
 }
 
@@ -99,7 +97,7 @@ if (!action) {
 const runner = resolveRunner();
 if (!runner) {
   process.stderr.write(
-    "Missing UI runner: install bun or pnpm, then retry.\n",
+    "Missing UI runner: install pnpm, then retry.\n",
   );
   process.exit(1);
 }
@@ -120,32 +118,15 @@ if (action !== "install" && !script) {
   process.exit(2);
 }
 
-if (runner.kind === "bun") {
-  if (action === "install") run(runner.cmd, ["install", ...rest]);
-  else {
-    if (!depsInstalled(action === "test" ? "test" : "build")) {
-      const installEnv =
-        action === "build"
-          ? { ...process.env, NODE_ENV: "production" }
-          : process.env;
-      const installArgs =
-        action === "build" ? ["install", "--production"] : ["install"];
-      runSync(runner.cmd, installArgs, installEnv);
-    }
-    run(runner.cmd, ["run", script, ...rest]);
-  }
-} else {
-  if (action === "install") run(runner.cmd, ["install", ...rest]);
-  else {
-    if (!depsInstalled(action === "test" ? "test" : "build")) {
-      const installEnv =
-        action === "build"
-          ? { ...process.env, NODE_ENV: "production" }
-          : process.env;
-      const installArgs =
-        action === "build" ? ["install", "--prod"] : ["install"];
-      runSync(runner.cmd, installArgs, installEnv);
-    }
-    run(runner.cmd, ["run", script, ...rest]);
+if (action === "install") run(runner, ["install", ...rest]);
+else {
+  if (!depsInstalled(action === "test" ? "test" : "build")) {
+    const installEnv =
+      action === "build"
+        ? { ...process.env, NODE_ENV: "production" }
+        : process.env;
+    const installArgs = action === "build" ? ["install", "--prod"] : ["install"];
+    runSync(runner, installArgs, installEnv);
   }
+  run(runner, ["run", script, ...rest]);
 }

src/agents/bash-tools.exec.background-abort.test.ts

@@ -1,76 +0,0 @@
-import { afterEach, expect, test } from "vitest";
-
-import { getFinishedSession, getSession, resetProcessRegistryForTests } from "./bash-process-registry.js";
-import { createExecTool } from "./bash-tools.exec.js";
-import { killProcessTree } from "./shell-utils.js";
-
-const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
-
-afterEach(() => {
-  resetProcessRegistryForTests();
-});
-
-test("background exec is not killed when tool signal aborts", async () => {
-  const tool = createExecTool({ allowBackground: true, backgroundMs: 0 });
-  const abortController = new AbortController();
-
-  const result = await tool.execute(
-    "toolcall",
-    { command: "node -e \"setTimeout(() => {}, 5000)\"", background: true },
-    abortController.signal,
-  );
-
-  expect(result.details.status).toBe("running");
-  const sessionId = (result.details as { sessionId: string }).sessionId;
-
-  abortController.abort();
-
-  await new Promise((resolve) => setTimeout(resolve, 150));
-
-  const running = getSession(sessionId);
-  const finished = getFinishedSession(sessionId);
-
-  try {
-    expect(finished).toBeUndefined();
-    expect(running?.exited).toBe(false);
-  } finally {
-    const pid = running?.pid;
-    if (pid) killProcessTree(pid);
-  }
-});
-
-test("background exec still times out after tool signal abort", async () => {
-  const tool = createExecTool({ allowBackground: true, backgroundMs: 0 });
-  const abortController = new AbortController();
-
-  const result = await tool.execute(
-    "toolcall",
-    {
-      command: "node -e \"setTimeout(() => {}, 5000)\"",
-      background: true,
-      timeout: 0.2,
-    },
-    abortController.signal,
-  );
-
-  expect(result.details.status).toBe("running");
-  const sessionId = (result.details as { sessionId: string }).sessionId;
-
-  abortController.abort();
-
-  let finished = getFinishedSession(sessionId);
-  const deadline = Date.now() + 2000;
-  while (!finished && Date.now() < deadline) {
-    await sleep(20);
-    finished = getFinishedSession(sessionId);
-  }
-
-  const running = getSession(sessionId);
-
-  try {
-    expect(finished?.status).toBe("failed");
-  } finally {
-    const pid = running?.pid;
-    if (pid) killProcessTree(pid);
-  }
-});

src/agents/bash-tools.exec.ts

@@ -262,28 +262,21 @@ export function createExecTool(
         fn();
       };
 
-      // Tool-call abort should not kill backgrounded sessions; timeouts still must.
-      const onAbortSignal = () => {
-        if (yielded || session.backgrounded) return;
+      const onAbort = () => {
         killSession(session);
       };
 
-      // Timeouts always terminate, even for backgrounded sessions.
-      const onTimeout = () => {
-        timedOut = true;
-        killSession(session);
-      };
-
-      if (signal?.aborted) onAbortSignal();
+      if (signal?.aborted) onAbort();
       else if (signal) {
-        signal.addEventListener("abort", onAbortSignal, { once: true });
+        signal.addEventListener("abort", onAbort, { once: true });
       }
 
       const effectiveTimeout =
         typeof params.timeout === "number" ? params.timeout : defaultTimeoutSec;
       if (effectiveTimeout > 0) {
         timeoutTimer = setTimeout(() => {
-          onTimeout();
+          timedOut = true;
+          onAbort();
         }, effectiveTimeout * 1000);
       }
 

src/scripts/ui-script.test.ts

@@ -0,0 +1,38 @@
+import { spawnSync } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { describe, expect, it } from "vitest";
+
+function runUi(args: string[], env: NodeJS.ProcessEnv) {
+  return spawnSync(process.execPath, ["scripts/ui.js", ...args], {
+    env: { ...process.env, ...env },
+    encoding: "utf8",
+  });
+}
+
+function writeStubPnpm(dir: string) {
+  const isWin = process.platform === "win32";
+  const name = isWin ? "pnpm.cmd" : "pnpm";
+  const target = path.join(dir, name);
+  const contents = isWin ? "@echo off\r\nexit /B 0\r\n" : "#!/bin/sh\nexit 0\n";
+  fs.writeFileSync(target, contents);
+  if (!isWin) fs.chmodSync(target, 0o755);
+  return target;
+}
+
+describe("scripts/ui.js", () => {
+  it("fails with a pnpm-only error when pnpm is missing", () => {
+    const result = runUi(["install"], { PATH: "" });
+    expect(result.status).toBe(1);
+    expect(result.stderr).toContain("install pnpm");
+    expect(result.stderr.toLowerCase()).not.toContain("bun");
+  });
+
+  it("runs pnpm when available", () => {
+    const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "clawdbot-ui-"));
+    writeStubPnpm(tmp);
+    const result = runUi(["install"], { PATH: tmp });
+    expect(result.status).toBe(0);
+  });
+});