@slopus/happy-terminal 0.3.2 → 0.3.3

package/dist/index.js

@@ -889,6 +889,9 @@ function delay2(milliseconds) {
 }
 
 // sources/daemon/runDaemonCommand.ts
+import {
+  HappyAgentApiError
+} from "@slopus/happy-agent-client";
 import { createRootContext as createRootContext2 } from "@steve.kite/stdlib";
 
 // sources/processes/killProcessTree.ts
@@ -1806,7 +1809,7 @@ async function delay3(ms, signal) {
 import { resolve } from "node:path";
 import { setTimeout as sleep } from "node:timers/promises";
 import {
-  HappyAgentApiError
+  HappyAgentApiError as HappyAgentApiError2
 } from "@slopus/happy-agent-client";
 var WORKSPACE_INITIALIZATION_TIMEOUT_MS = 12e4;
 var WORKSPACE_INITIALIZATION_POLL_MS = 50;
@@ -1876,7 +1879,7 @@ async function waitForWorkspaceReady(client, workspaceId) {
     try {
       return (await client.getWorkspace(workspaceId)).workspace;
     } catch (error) {
-      if (!(error instanceof HappyAgentApiError) || error.code !== "not_initialized") {
+      if (!(error instanceof HappyAgentApiError2) || error.code !== "not_initialized") {
         throw error;
       }
       if (Date.now() >= deadline) {

package/dist/main.js

@@ -1799,6 +1799,9 @@ function delay2(milliseconds) {
 // sources/daemon/runDaemonCommand.ts
 init_HappyTerminalUserError();
 import { lstat as lstat2 } from "node:fs/promises";
+import {
+  HappyAgentApiError
+} from "@slopus/happy-agent-client";
 import { createRootContext as createRootContext2 } from "@steve.kite/stdlib";
 
 // sources/processes/killProcessTree.ts
@@ -2768,7 +2771,7 @@ function errorCode(error) {
 
 // sources/daemon/runDaemonCommand.ts
 var DAEMON_SHUTDOWN_TIMEOUT_MS = 3e4;
-var DAEMON_RELOAD_GRACE_TIMEOUT_MS = 5e3;
+var DRAIN_POLL_INTERVAL_MS = 100;
 async function runDaemonCommand(command, log = console.log, ctx = createRootContext2().named("daemon-command")) {
   const paths = getHappyDaemonPaths();
   if (command === "start") {
@@ -2791,10 +2794,7 @@ async function runDaemonCommand(command, log = console.log, ctx = createRootCont
   const observed = await observeLocalProtocolServer(paths);
   if (command === "reload") {
     if (observed !== void 0) {
-      await stopLocalProtocolServer(ctx, observed.client, paths, {
-        forceAfterMs: DAEMON_RELOAD_GRACE_TIMEOUT_MS,
-        onForce: log
-      });
+      await stopLocalProtocolServer(ctx, observed.client, paths, log);
     } else await assertNoUnresponsiveDaemon(paths.pidPath);
     const connection = await ensureLocalProtocolServer();
     log(`Daemon is running at ${connection.paths.socketPath}`);
@@ -2812,8 +2812,13 @@ async function runDaemonCommand(command, log = console.log, ctx = createRootCont
         log("Daemon is not running.");
       }
     } else if (observed.health.ready) {
-      log(`Daemon is running at ${paths.socketPath}`);
+      log(
+        observed.health.draining === true ? `Daemon is draining at ${paths.socketPath}` : `Daemon is running at ${paths.socketPath}`
+      );
       log(`Daemon PID: ${String(pid ?? "unknown")}`);
+      if (observed.health.draining === true) {
+        log(formatDrainProgress(observed.health.drainWaitingFor ?? []));
+      }
     } else {
       log(`Daemon is starting at ${paths.socketPath}`);
       log(`Daemon PID: ${String(pid ?? "unknown")}`);
@@ -2828,28 +2833,25 @@ async function runDaemonCommand(command, log = console.log, ctx = createRootCont
     return;
   }
   log("Daemon is stopping.");
-  await stopLocalProtocolServer(ctx, observed.client, paths);
+  await stopLocalProtocolServer(ctx, observed.client, paths, log);
   log("Daemon stopped.");
 }
-async function stopLocalProtocolServer(ctx, client, paths, options = {}) {
+async function stopLocalProtocolServer(ctx, client, paths, report) {
   let pid = await readDaemonPid(paths.pidPath);
+  await drainLocalProtocolServer(client, report);
   let requestError;
   try {
     pid = (await client.shutdown()).pid;
   } catch (error) {
     requestError = error;
   }
-  const timeoutMs = options.forceAfterMs ?? DAEMON_SHUTDOWN_TIMEOUT_MS;
-  const stopped = await waitForDaemonShutdown(ctx, paths.socketPath, pid, timeoutMs);
+  const stopped = await waitForDaemonShutdown(
+    ctx,
+    paths.socketPath,
+    pid,
+    DAEMON_SHUTDOWN_TIMEOUT_MS
+  );
   if (stopped.socketRemoved && stopped.processExited) return;
-  if (options.forceAfterMs !== void 0 && pid !== void 0) {
-    options.onForce?.(
-      `Daemon did not stop gracefully; forcing process ${String(pid)} to exit.`
-    );
-    if (!stopped.processExited) await killDaemonProcess(ctx, pid);
-    await removeDaemonPid(paths.pidPath, pid);
-    return;
-  }
   if (requestError !== void 0) {
     throw new Error(
       `Could not stop the existing local daemon: ${requestError instanceof Error ? requestError.message : String(requestError)}`
@@ -2864,6 +2866,45 @@ async function stopLocalProtocolServer(ctx, client, paths, options = {}) {
     );
   }
 }
+async function drainLocalProtocolServer(client, report) {
+  try {
+    await client.drain();
+  } catch (error) {
+    if (error instanceof HappyAgentApiError && (error.status === 403 || error.status === 404)) {
+      report("This daemon does not support draining; stopping it directly.");
+      return;
+    }
+    throw error;
+  }
+  let previous;
+  for (; ; ) {
+    const health = await client.getHealth();
+    const waiting = health.drainWaitingFor ?? [];
+    const current = JSON.stringify(waiting);
+    if (current !== previous) {
+      report(formatDrainProgress(waiting));
+      previous = current;
+    }
+    if (waiting.length === 0) return;
+    await new Promise((resolve4) => setTimeout(resolve4, DRAIN_POLL_INTERVAL_MS));
+  }
+}
+function formatDrainProgress(waiting) {
+  if (waiting.length === 0) return "Daemon drain is complete.";
+  return `Draining: ${waiting.map(formatDrainWait).join("; ")}.`;
+}
+function formatDrainWait(wait) {
+  const noun = wait.name === "api-mutations" ? plural(wait.count, "API mutation") : wait.name === "agent-system" ? plural(wait.count, "agent") : wait.name === "auto-agent-system" ? plural(wait.count, "permission reviewer") : `${String(wait.count)} ${wait.name.replaceAll("-", " ")}`;
+  if (wait.agents === void 0 || wait.agents.length === 0) return noun;
+  const agents = wait.agents.map((agent) => `${agent.id}: ${stageLabel(agent.stage)}`).join(", ");
+  return `${noun} (${agents}${wait.truncated === true ? ", \u2026" : ""})`;
+}
+function stageLabel(stage) {
+  return stage === "tools" ? "tool calls" : stage;
+}
+function plural(count2, noun) {
+  return `${String(count2)} ${noun}${count2 === 1 ? "" : "s"}`;
+}
 async function waitForDaemonShutdown(ctx, socketPath, pid, timeoutMs) {
   const [socketRemoved, processExited] = await Promise.all([
     waitForSocketRemoval(socketPath, timeoutMs),
@@ -3017,7 +3058,7 @@ async function delay4(ms, signal) {
 import { resolve } from "node:path";
 import { setTimeout as sleep } from "node:timers/promises";
 import {
-  HappyAgentApiError
+  HappyAgentApiError as HappyAgentApiError2
 } from "@slopus/happy-agent-client";
 var WORKSPACE_INITIALIZATION_TIMEOUT_MS = 12e4;
 var WORKSPACE_INITIALIZATION_POLL_MS = 50;
@@ -3087,7 +3128,7 @@ async function waitForWorkspaceReady(client, workspaceId) {
     try {
       return (await client.getWorkspace(workspaceId)).workspace;
     } catch (error) {
-      if (!(error instanceof HappyAgentApiError) || error.code !== "not_initialized") {
+      if (!(error instanceof HappyAgentApiError2) || error.code !== "not_initialized") {
         throw error;
       }
       if (Date.now() >= deadline) {
@@ -9937,8 +9978,8 @@ var RESET13 = "\x1B[0m";
 var DIM10 = "\x1B[2m";
 function renderBackgroundTerminalSummary(count2, width) {
   if (count2 === 0) return void 0;
-  const plural = count2 === 1 ? "" : "s";
-  const summary = `  ${String(count2)} background terminal${plural} running \xB7 /ps to view \xB7 /stop to close`;
+  const plural2 = count2 === 1 ? "" : "s";
+  const summary = `  ${String(count2)} background terminal${plural2} running \xB7 /ps to view \xB7 /stop to close`;
   return truncateToWidth11(`${DIM10}${summary}${RESET13}`, Math.max(1, width), "", true);
 }
 
@@ -11189,8 +11230,8 @@ var RESET21 = "\x1B[0m";
 var DIM18 = "\x1B[2m";
 function renderSubagentSummary(options) {
   if (options.count === 0) return void 0;
-  const plural = options.count === 1 ? "" : "s";
-  const summary = `  ${String(options.count)} agent${plural} running \xB7 /agents to view \xB7 ${formatActivityElapsedTime(options.elapsedMs)} \xB7 ${formatCompactTokens(options.totalTokens)} context tokens`;
+  const plural2 = options.count === 1 ? "" : "s";
+  const summary = `  ${String(options.count)} agent${plural2} running \xB7 /agents to view \xB7 ${formatActivityElapsedTime(options.elapsedMs)} \xB7 ${formatCompactTokens(options.totalTokens)} context tokens`;
   return truncateToWidth23(`${DIM18}${summary}${RESET21}`, Math.max(1, options.width), "", true);
 }
 
@@ -11213,8 +11254,8 @@ var RESET23 = "\x1B[0m";
 var DIM20 = "\x1B[2m";
 function renderWorkflowSummary(count2, width) {
   if (count2 === 0) return void 0;
-  const plural = count2 === 1 ? "" : "s";
-  const summary = `  ${String(count2)} workflow${plural} running \xB7 /workflows to view`;
+  const plural2 = count2 === 1 ? "" : "s";
+  const summary = `  ${String(count2)} workflow${plural2} running \xB7 /workflows to view`;
   return truncateToWidth25(`${DIM20}${summary}${RESET23}`, Math.max(1, width), "", true);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slopus/happy-terminal",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Happy Terminal, the embeddable terminal client for Happy Agent.",
   "keywords": [
     "coding-agent",
@@ -63,7 +63,7 @@
     "@sinclair/typebox": "^0.34.49",
     "@slopus/ghostty-wasm": "1.3.6",
     "@slopus/ghostty-web": "0.1.3",
-    "@slopus/happy-agent-client": "0.0.17",
+    "@slopus/happy-agent-client": "0.0.20",
     "@slopus/happy-providers": "0.0.11",
     "@slopus/murmur": "0.4.4",
     "@steve.kite/stdlib": "0.0.12",