fix agents numeric params and lsp exits

morluto · morluto · commit 5dd0bd1addee · 2026-07-05T19:50:42.000Z
diff --git a/src/agents/agent-bundle-lsp-runtime.test.ts b/src/agents/agent-bundle-lsp-runtime.test.ts
@@ -47,7 +47,10 @@ class MockChildProcess extends EventEmitter {
   readonly stderr = new PassThrough();
   readonly stdin: Writable;
 
-  constructor(private readonly initializeResponsePrefix = "") {
+  constructor(
+    private readonly initializeResponsePrefix = "",
+    private readonly respondMethods?: ReadonlySet<string>,
+  ) {
     super();
     this.stdin = new Writable({
       write: (chunk, _encoding, callback) => {
@@ -70,6 +73,9 @@ class MockChildProcess extends EventEmitter {
     if (!body || typeof body.id !== "number" || typeof body.method !== "string") {
       return;
     }
+    if (this.respondMethods && !this.respondMethods.has(body.method)) {
+      return;
+    }
     const result = body.method === "initialize" ? { capabilities: { hoverProvider: true } } : null;
     queueMicrotask(() => {
       this.stdout.write(
@@ -138,6 +144,38 @@ describe("bundle LSP runtime", () => {
     expect(killProcessTreeMock).toHaveBeenCalledWith(4321, { graceMs: 1000 });
   });
 
+  it("rejects pending LSP requests immediately when the child process exits", async () => {
+    configureSingleLspServer();
+    const child = new MockChildProcess("", new Set(["initialize"]));
+    spawnMock.mockReturnValue(child);
+    const { createBundleLspToolRuntime } = await import("./agent-bundle-lsp-runtime.js");
+
+    const runtime = await createBundleLspToolRuntime({ workspaceDir: "/tmp/workspace" });
+    const hoverTool = runtime.tools.find((tool) => tool.name === "lsp_hover_typescript");
+    if (!hoverTool) {
+      throw new Error("expected hover tool");
+    }
+
+    const request = hoverTool.execute("call-1", {
+      uri: "file:///tmp/workspace/index.ts",
+      line: 0,
+      character: 0,
+    });
+    child.exitCode = 1;
+    child.emit("exit", 1, null);
+
+    await expect(request).rejects.toThrow('LSP server "typescript" exited (1)');
+    await expect(
+      hoverTool.execute("call-2", {
+        uri: "file:///tmp/workspace/index.ts",
+        line: 0,
+        character: 0,
+      }),
+    ).rejects.toThrow('LSP server "typescript" exited (1)');
+
+    await runtime.dispose();
+  });
+
   it("keeps LSP framing aligned after multibyte messages in the same chunk", async () => {
     configureSingleLspServer();
     const prefix = encodeLspMessage({
diff --git a/src/agents/agent-bundle-lsp-runtime.ts b/src/agents/agent-bundle-lsp-runtime.ts
@@ -110,14 +110,27 @@ function registerActiveLspSession(session: LspSession): void {
   activeBundleLspSessions.add(session);
 }
 
+function failLspSession(session: LspSession, error: Error): void {
+  if (session.failure) {
+    return;
+  }
+  session.failure = error;
+  for (const pending of session.pendingRequests.values()) {
+    clearTimeout(pending.timeout);
+    pending.reject(error);
+  }
+  session.pendingRequests.clear();
+}
+
 function attachLspProcessHandlers(session: LspSession): void {
   session.process.on("error", (error) => {
-    session.failure = error;
-    for (const pending of session.pendingRequests.values()) {
-      clearTimeout(pending.timeout);
-      pending.reject(error);
-    }
-    session.pendingRequests.clear();
+    failLspSession(session, error);
+  });
+  session.process.on("exit", (code, signal) => {
+    failLspSession(
+      session,
+      new Error(`LSP server "${session.serverName}" exited (${signal ?? code ?? "unknown"})`),
+    );
   });
   session.process.stdout?.on("data", (chunk: Buffer | string) =>
     handleIncomingData(session, chunk),
diff --git a/src/agents/tools/common.params.test.ts b/src/agents/tools/common.params.test.ts
@@ -166,6 +166,8 @@ describe("readNumberParam", () => {
   it("throws for invalid present bounded finite number params", () => {
     expect(readFiniteNumberParam({ quality: "0.75" }, "quality")).toBe(0.75);
     expect(readFiniteNumberParam({ quality: null }, "quality")).toBeUndefined();
+    expect(readFiniteNumberParam({ quality: "" }, "quality")).toBeUndefined();
+    expect(readFiniteNumberParam({ quality: " \t\n" }, "quality")).toBeUndefined();
     expect(() => readFiniteNumberParam({ quality: "0.8jpg" }, "quality")).toThrow(
       "quality must be a finite number",
     );
diff --git a/src/agents/tools/common.ts b/src/agents/tools/common.ts
@@ -301,7 +301,8 @@ export function readFiniteNumberParam(
     strict: true,
   });
   if (value === undefined) {
-    if (readParamRaw(params, key) != null) {
+    const raw = readParamRaw(params, key);
+    if (raw != null && !isBlankParamValue(raw)) {
       throw new ToolInputError(options.message ?? `${key} must be a finite number`);
     }
     return undefined;
