@justin06lee/yagami 0.8.1 → 0.8.2

package/README.md

@@ -122,7 +122,7 @@ const engine = new YagamiEngine({
 const { response, costUsd } = await engine.complete({ messages: [{ role: "user", content: "hello" }] });
 ```
 
-Every provider implements one small `Provider` contract (`run(turn)` → normalized `session`/`text`/`thinking`/`done` events, plus `listModels()` and `version()`), so adding a harness that isn't ACP-capable is one file. Failures are typed: `AuthRequiredError` (carries the login command), `ProviderNotInstalledError` (carries the install hint), `ProviderError`.
+Every provider implements one small `Provider` contract (`run(turn)` → normalized `session`/`text`/`thinking`/`done` events, plus `listModels()` and `version()`), so adding a harness that isn't ACP-capable is one file. Failures are typed: `AuthRequiredError` (carries the login command), `ProviderNotInstalledError` (carries the install hint), `ProviderError`. Every CLI yagami starts is ended with everything it started in turn — a launcher that re-executes itself, an npm shim, an agent's MCP servers — and nothing is left waiting on an agent that never answers: an ACP handshake has 30 seconds, a model-list or version probe 20, and a turn aborted before its session exists closes the agent. A consumer that stops reading a turn early ends its process too.
 
 ### Building a UI on Claude Code
 

package/dist/{chunk-U3RFT7QV.js → chunk-EKN223KD.js}

@@ -183,10 +183,10 @@ function resolveClaudeExecutable(explicit) {
 }
 
 // src/version.ts
-var VERSION = "0.8.1";
+var VERSION = "0.8.2";
 
 // src/core/providers/acp.ts
-import { spawn, spawnSync } from "child_process";
+import { spawn, spawnSync as spawnSync2 } from "child_process";
 import * as fs2 from "fs";
 import * as os2 from "os";
 import * as path2 from "path";
@@ -288,12 +288,75 @@ function elicitationResponse(response) {
   return response.action === "accept" ? { action: "accept", content: response.values ?? null } : { action: response.action };
 }
 
+// src/core/providers/process.ts
+import { execFileSync, spawnSync } from "child_process";
+var GRACE_MS = 3e3;
+var ending = /* @__PURE__ */ new WeakSet();
+function descendants(root) {
+  let listing;
+  try {
+    listing = execFileSync("ps", ["-A", "-o", "pid=,ppid="], { encoding: "utf8", timeout: 2e3 });
+  } catch {
+    return [];
+  }
+  const children = /* @__PURE__ */ new Map();
+  for (const line of listing.split("\n")) {
+    const [pid, ppid] = line.trim().split(/\s+/).map(Number);
+    if (!pid || ppid === void 0 || Number.isNaN(ppid)) continue;
+    const list = children.get(ppid);
+    if (list) list.push(pid);
+    else children.set(ppid, [pid]);
+  }
+  const found = [];
+  const stack = [root];
+  while (stack.length > 0) {
+    for (const child of children.get(stack.pop()) ?? []) {
+      found.push(child);
+      stack.push(child);
+    }
+  }
+  return found;
+}
+function isAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err.code === "EPERM";
+  }
+}
+function signal(pid, sig) {
+  try {
+    process.kill(pid, sig);
+  } catch {
+  }
+}
+function killTree(child, graceMs = GRACE_MS) {
+  if (!child || child.pid === void 0 || ending.has(child)) return;
+  if (child.exitCode !== null || child.signalCode !== null) return;
+  ending.add(child);
+  const pid = child.pid;
+  if (process.platform === "win32") {
+    spawnSync("taskkill", ["/pid", String(pid), "/T", "/F"], { stdio: "ignore" });
+    return;
+  }
+  const tree = [pid, ...descendants(pid)];
+  for (const member of tree) signal(member, "SIGTERM");
+  const timer = setTimeout(() => {
+    for (const member of tree) if (isAlive(member)) signal(member, "SIGKILL");
+  }, graceMs);
+  timer.unref?.();
+}
+
 // src/core/providers/queue.ts
 var AsyncQueue = class {
   buffer = [];
   waiting = null;
   ended = false;
   error = void 0;
+  /** Called once if the consumer stops iterating before the queue ends —
+   *  the producer's cue to stop whatever is feeding it. */
+  onReturn;
   push(value) {
     if (this.ended) return;
     if (this.waiting) {
@@ -341,7 +404,10 @@ var AsyncQueue = class {
         });
       },
       return: () => {
+        const stop = this.ended ? void 0 : this.onReturn;
+        this.onReturn = void 0;
         this.ended = true;
+        stop?.();
         return Promise.resolve({ value: void 0, done: true });
       }
     };
@@ -349,6 +415,8 @@ var AsyncQueue = class {
 };
 
 // src/core/providers/acp.ts
+var HANDSHAKE_TIMEOUT_MS = 3e4;
+var PROBE_TIMEOUT_MS = 2e4;
 function rejectOption(p) {
   const pick = p.options.find((o) => o.kind === "reject_once") ?? p.options.find((o) => o.kind === "reject_always") ?? p.options[0];
   if (!pick) return { outcome: { outcome: "cancelled" } };
@@ -377,6 +445,8 @@ var AcpProvider = class {
   appName;
   modelConfigId;
   connectImpl;
+  handshakeTimeoutMs;
+  probeTimeoutMs;
   constructor(options) {
     this.id = options.id;
     this.label = options.label;
@@ -390,6 +460,8 @@ var AcpProvider = class {
     this.appName = options.appName ?? "yagami";
     this.modelConfigId = options.modelConfigId ?? "model";
     this.connectImpl = options.connect ?? ((cwd) => this.spawnConnection(cwd));
+    this.handshakeTimeoutMs = options.handshakeTimeoutMs ?? HANDSHAKE_TIMEOUT_MS;
+    this.probeTimeoutMs = options.probeTimeoutMs ?? PROBE_TIMEOUT_MS;
     fs2.mkdirSync(this.workDir, { recursive: true });
   }
   spawnConnection(cwd) {
@@ -425,14 +497,23 @@ var AcpProvider = class {
         stream
       );
       let settled = false;
+      const handshake = setTimeout(() => {
+        if (settled) return;
+        settled = true;
+        killTree(child);
+        reject(new ProviderError(this.id, `${this.label} did not finish the ACP handshake within ${Math.round(this.handshakeTimeoutMs / 1e3)}s`));
+      }, this.handshakeTimeoutMs);
+      handshake.unref?.();
       child.on("error", (err) => {
         if (settled) return;
         settled = true;
+        clearTimeout(handshake);
         reject(classifyProviderFailure(this.id, this.loginCommand, err));
       });
       child.on("exit", (code) => {
         if (settled) return;
         settled = true;
+        clearTimeout(handshake);
         reject(classifyProviderFailure(this.id, this.loginCommand, new Error(`${this.executable} exited with code ${code}${stderr ? `: ${stderr.trim().slice(-400)}` : ""}`)));
       });
       agent.initialize({
@@ -448,20 +529,20 @@ var AcpProvider = class {
       }).then((init) => {
         if (settled) return;
         settled = true;
+        clearTimeout(handshake);
         resolve({
           agent,
           init,
           setHandlers: (h) => {
             handlers = h;
           },
-          close: () => {
-            child.kill("SIGTERM");
-          }
+          close: () => killTree(child)
         });
       }).catch((err) => {
         if (settled) return;
         settled = true;
-        child.kill("SIGTERM");
+        clearTimeout(handshake);
+        killTree(child);
         reject(this.classify(err, stderr));
       });
     });
@@ -482,7 +563,13 @@ var AcpProvider = class {
     const onAbort = () => {
       if (sessionId) void conn.agent.cancel({ sessionId }).catch(() => {
       });
+      else conn.close();
     };
+    if (req.signal?.aborted) {
+      conn.close();
+      return;
+    }
+    req.signal?.addEventListener("abort", onAbort, { once: true });
     try {
       let configOptions;
       let modes;
@@ -528,7 +615,6 @@ var AcpProvider = class {
           }
         }
       });
-      req.signal?.addEventListener("abort", onAbort, { once: true });
       conn.agent.prompt({ sessionId, prompt: toAcpBlocks(req.prompt, req.media ?? [], this.id) }).then((res) => {
         queue.push({
           type: "done",
@@ -581,9 +667,34 @@ var AcpProvider = class {
       throw this.classify(err);
     });
   }
-  async listModels() {
+  /**
+   * Run a short question against a fresh agent and close it, whatever
+   * happens. The deadline covers the whole exchange: an agent that answers
+   * the handshake and then sits on newSession forever (Gemini, signed out
+   * or mid-update) used to hold the probe open — and its process alive —
+   * for as long as the host ran.
+   */
+  async probe(ask) {
     const conn = await this.connectImpl(this.workDir);
+    let timer;
     try {
+      return await Promise.race([
+        ask(conn),
+        new Promise((_, reject) => {
+          timer = setTimeout(
+            () => reject(new ProviderError(this.id, `${this.label} did not answer within ${Math.round(this.probeTimeoutMs / 1e3)}s`)),
+            this.probeTimeoutMs
+          );
+          timer.unref?.();
+        })
+      ]);
+    } finally {
+      if (timer) clearTimeout(timer);
+      conn.close();
+    }
+  }
+  async listModels() {
+    return this.probe(async (conn) => {
       const created = await conn.agent.newSession({ cwd: this.workDir, mcpServers: [] }).catch((err) => {
         throw this.classify(err);
       });
@@ -603,9 +714,7 @@ var AcpProvider = class {
         ...efforts.length > 0 ? { reasoning_efforts: efforts } : {},
         ...effortOption?.type === "select" ? { default_reasoning_effort: effortOption.currentValue } : {}
       }));
-    } finally {
-      conn.close();
-    }
+    });
   }
   /**
    * The agent's self-reported name/version from the ACP handshake. When the
@@ -628,7 +737,7 @@ var AcpProvider = class {
     }
     let plain;
     try {
-      const out = spawnSync(this.executable, ["--version"], { encoding: "utf8", timeout: 1e4 });
+      const out = spawnSync2(this.executable, ["--version"], { encoding: "utf8", timeout: 1e4 });
       plain = out.stdout?.trim().split("\n")[0] || void 0;
     } catch {
       plain = void 0;
@@ -925,7 +1034,7 @@ function jsonLinesOnly(input, onNoise) {
 
 // src/core/providers/claude.ts
 import { createRequire } from "module";
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync as spawnSync3 } from "child_process";
 import * as fs3 from "fs";
 import * as os3 from "os";
 import * as path3 from "path";
@@ -1094,7 +1203,7 @@ var ClaudeProvider = class {
   }
   async version() {
     try {
-      const out = spawnSync2(this.executable, ["--version"], { encoding: "utf8", timeout: 1e4 });
+      const out = spawnSync3(this.executable, ["--version"], { encoding: "utf8", timeout: 1e4 });
       return out.stdout?.trim().split("\n")[0] || void 0;
     } catch {
       return void 0;
@@ -1168,7 +1277,7 @@ function mediaPrompt(text, media) {
 }
 
 // src/core/providers/codex.ts
-import { spawn as spawn4, spawnSync as spawnSync3 } from "child_process";
+import { spawn as spawn4, spawnSync as spawnSync4 } from "child_process";
 import * as fs4 from "fs";
 import * as os4 from "os";
 import * as path4 from "path";
@@ -1553,17 +1662,17 @@ var CodexAgentSession = class {
     }
   }
   // ── approvals: forwarded to the host, answered like the TUI would ──
-  async decide(request, signal) {
-    if (signal?.aborted) return "deny";
+  async decide(request, signal2) {
+    if (signal2?.aborted) return "deny";
     try {
-      const decision = await this.config.options.permissions.decide(request, signal);
+      const decision = await this.config.options.permissions.decide(request, signal2);
       this.push({ type: "permission", request, decision });
       return decision;
     } catch {
       return "deny";
     }
   }
-  async handleServerRequest(method, id, params, signal) {
+  async handleServerRequest(method, id, params, signal2) {
     switch (method) {
       case "item/commandExecution/requestApproval": {
         const decision = await this.decide({
@@ -1574,7 +1683,7 @@ var CodexAgentSession = class {
           title: String(params["command"] ?? "command"),
           input: { command: params["command"], cwd: params["cwd"], reason: params["reason"] },
           raw: params
-        }, signal);
+        }, signal2);
         this.respond(id, {
           decision: decision === "allow" ? "accept" : decision === "allow_always" ? "acceptForSession" : "decline"
         });
@@ -1589,7 +1698,7 @@ var CodexAgentSession = class {
           title: String(params["reason"] ?? "apply file changes"),
           input: { reason: params["reason"], grantRoot: params["grantRoot"] },
           raw: params
-        }, signal);
+        }, signal2);
         this.respond(id, {
           decision: decision === "allow" ? "accept" : decision === "allow_always" ? "acceptForSession" : "decline"
         });
@@ -1605,7 +1714,7 @@ var CodexAgentSession = class {
           title: String(params["reason"] ?? "extra permissions"),
           input: requested,
           raw: params
-        }, signal);
+        }, signal2);
         const granted = decision === "allow" || decision === "allow_always";
         this.respond(id, {
           permissions: granted ? { network: requested?.["network"] ?? void 0, fileSystem: requested?.["fileSystem"] ?? void 0 } : {},
@@ -1624,14 +1733,14 @@ var CodexAgentSession = class {
           title: String(params["command"] ?? params["reason"] ?? "approval"),
           input: params,
           raw: params
-        }, signal);
+        }, signal2);
         this.respond(id, {
           decision: decision === "allow" ? "approved" : decision === "allow_always" ? "approved_for_session" : { denied: { rejection: "denied by the user" } }
         });
         break;
       }
       case "item/tool/requestUserInput": {
-        const response = await this.input(codexQuestionRequest(this.threadId, params), signal);
+        const response = await this.input(codexQuestionRequest(this.threadId, params), signal2);
         const values = response.action === "accept" ? response.values ?? {} : {};
         this.respond(id, {
           answers: Object.fromEntries(
@@ -1644,7 +1753,7 @@ var CodexAgentSession = class {
         break;
       }
       case "mcpServer/elicitation/request": {
-        const response = await this.input(elicitationRequest("codex", this.threadId, params), signal);
+        const response = await this.input(elicitationRequest("codex", this.threadId, params), signal2);
         this.respond(id, { ...elicitationResponse(response), _meta: null });
         break;
       }
@@ -1661,12 +1770,12 @@ var CodexAgentSession = class {
       }
     }
   }
-  async input(request, signal) {
+  async input(request, signal2) {
     const handler = this.config.options.input;
     if (!handler) return declineInput();
     try {
-      if (signal?.aborted) return { action: "cancel" };
-      return await handler.respond(request, signal);
+      if (signal2?.aborted) return { action: "cancel" };
+      return await handler.respond(request, signal2);
     } catch {
       return { action: "cancel" };
     }
@@ -1733,7 +1842,7 @@ var CodexAgentSession = class {
     if (this.closed) return;
     this.closed = true;
     this.fail(new ProviderError("codex", "session closed"));
-    this.child?.kill("SIGTERM");
+    killTree(this.child);
     this.child = void 0;
   }
 };
@@ -1824,12 +1933,17 @@ function spawnJsonl(options) {
     }
   });
   const onAbort = () => {
-    child.kill("SIGTERM");
+    killTree(child);
     queue.end();
   };
   options.signal?.addEventListener("abort", onAbort, { once: true });
+  queue.onReturn = () => {
+    options.signal?.removeEventListener("abort", onAbort);
+    killTree(child);
+  };
   child.on("error", (err) => queue.fail(err));
   child.on("close", (code) => {
+    queue.onReturn = void 0;
     options.signal?.removeEventListener("abort", onAbort);
     if (options.signal?.aborted) return queue.end();
     if (code !== 0) queue.fail(new ProcessExitError(code, stderr));
@@ -1955,7 +2069,7 @@ var CodexProvider = class {
         if (settled) return;
         settled = true;
         clearTimeout(timer);
-        child.kill("SIGTERM");
+        killTree(child);
         fn();
       };
       const timer = setTimeout(() => finish(() => reject(new ProviderError(this.id, "timed out listing models via app-server"))), 15e3);
@@ -2028,7 +2142,7 @@ var CodexProvider = class {
   }
   async version() {
     try {
-      const out = spawnSync3(this.executable, ["--version"], { encoding: "utf8", timeout: 1e4 });
+      const out = spawnSync4(this.executable, ["--version"], { encoding: "utf8", timeout: 1e4 });
       return out.stdout?.trim().split("\n")[0] || void 0;
     } catch {
       return void 0;
@@ -2817,7 +2931,7 @@ ${promptText}`;
     };
   }
   async *runStream(req, prepared, streamOptions) {
-    const { signal } = streamOptions;
+    const { signal: signal2 } = streamOptions;
     let emitted = false;
     try {
       for await (const ev of this.attemptStream(prepared, streamOptions)) {
@@ -2826,7 +2940,7 @@ ${promptText}`;
       }
       return;
     } catch (err) {
-      if (signal?.aborted) return;
+      if (signal2?.aborted) return;
       const fallback = emitted ? void 0 : this.prepareResumeFallback(req, prepared);
       if (!fallback) {
         yield { event: "error", data: toApiError(err).toBody() };
@@ -2835,13 +2949,13 @@ ${promptText}`;
       try {
         yield* this.attemptStream(fallback, streamOptions);
       } catch (err2) {
-        if (!signal?.aborted) yield { event: "error", data: toApiError(err2).toBody() };
+        if (!signal2?.aborted) yield { event: "error", data: toApiError(err2).toBody() };
       }
     }
   }
   async *attemptStream(prepared, streamOptions) {
     const { provider, turn, norm, requestedModel } = prepared;
-    const { signal } = streamOptions;
+    const { signal: signal2 } = streamOptions;
     const stripper = norm.prefill ? new PrefillStripper(norm.prefill) : void 0;
     const sse = new SseSynthesizer(`msg_${randomUUID().replace(/-/g, "")}`, requestedModel);
     let sessionId;
@@ -2853,7 +2967,7 @@ ${promptText}`;
       started = true;
       return sse.start();
     };
-    for await (const ev of provider.run({ ...turn, ...signal ? { signal } : {} })) {
+    for await (const ev of provider.run({ ...turn, ...signal2 ? { signal: signal2 } : {} })) {
       if (ev.type === "session") {
         sessionId = ev.sessionId;
       } else if (ev.type === "text") {
@@ -2868,7 +2982,7 @@ ${promptText}`;
         done = ev;
       }
     }
-    if (signal?.aborted) return;
+    if (signal2?.aborted) return;
     if (!done) throw new ProviderError(provider.id, "turn ended without a result");
     yield* start();
     if (stripper) {
@@ -3179,4 +3293,4 @@ export {
   ChatChunkTranslator,
   modelListBody
 };
-//# sourceMappingURL=chunk-U3RFT7QV.js.map
+//# sourceMappingURL=chunk-EKN223KD.js.map