acpx 0.1.14 → 0.1.15

package/dist/cli.js

@@ -7,7 +7,7 @@ import { pathToFileURL } from "url";
 // src/cli-core.ts
 import { Command, CommanderError, InvalidArgumentError as InvalidArgumentError2 } from "commander";
 import fs7 from "fs/promises";
-import path10 from "path";
+import path11 from "path";
 import { findSkillsRoot, maybeHandleSkillflag } from "skillflag";
 
 // src/agent-registry.ts
@@ -908,6 +908,9 @@ var TerminalManager = class {
 var REPLAY_IDLE_MS = 80;
 var REPLAY_DRAIN_TIMEOUT_MS = 5e3;
 var DRAIN_POLL_INTERVAL_MS = 20;
+var AGENT_CLOSE_AFTER_STDIN_END_MS = 100;
+var AGENT_CLOSE_TERM_GRACE_MS = 1500;
+var AGENT_CLOSE_KILL_GRACE_MS = 1e3;
 function shouldSuppressSdkConsoleError(args) {
   if (args.length === 0) {
     return false;
@@ -943,6 +946,38 @@ function waitForSpawn2(child) {
     child.once("error", onError);
   });
 }
+function isChildProcessRunning(child) {
+  return child.exitCode == null && child.signalCode == null;
+}
+function waitForChildExit(child, timeoutMs) {
+  if (!isChildProcessRunning(child)) {
+    return Promise.resolve(true);
+  }
+  return new Promise((resolve) => {
+    let settled = false;
+    const timer = setTimeout(
+      () => {
+        finish(false);
+      },
+      Math.max(0, timeoutMs)
+    );
+    const finish = (value) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      child.off("close", onExitLike);
+      child.off("exit", onExitLike);
+      clearTimeout(timer);
+      resolve(value);
+    };
+    const onExitLike = () => {
+      finish(true);
+    };
+    child.once("close", onExitLike);
+    child.once("exit", onExitLike);
+  });
+}
 function splitCommandLine(value) {
   const parts = [];
   let current = "";
@@ -1417,10 +1452,7 @@ var AcpClient = class {
     await this.terminalManager.shutdown();
     const agent = this.agent;
     if (agent) {
-      if (!agent.killed) {
-        agent.kill();
-      }
-      this.detachAgentHandles(agent);
+      await this.terminateAgentProcess(agent);
     }
     this.sessionUpdateChain = Promise.resolve();
     this.observedSessionUpdates = 0;
@@ -1433,16 +1465,45 @@ var AcpClient = class {
     this.connection = void 0;
     this.agent = void 0;
   }
-  detachAgentHandles(agent) {
+  async terminateAgentProcess(child) {
+    if (!child.stdin.destroyed) {
+      try {
+        child.stdin.end();
+      } catch {
+      }
+    }
+    let exited = await waitForChildExit(child, AGENT_CLOSE_AFTER_STDIN_END_MS);
+    if (!exited && isChildProcessRunning(child)) {
+      try {
+        child.kill("SIGTERM");
+      } catch {
+      }
+      exited = await waitForChildExit(child, AGENT_CLOSE_TERM_GRACE_MS);
+    }
+    if (!exited && isChildProcessRunning(child)) {
+      this.log(
+        `agent did not exit after ${AGENT_CLOSE_TERM_GRACE_MS}ms; forcing SIGKILL`
+      );
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+      exited = await waitForChildExit(child, AGENT_CLOSE_KILL_GRACE_MS);
+    }
+    this.detachAgentHandles(child, !exited);
+  }
+  detachAgentHandles(agent, unref) {
     const stdin = agent.stdin;
     const stdout = agent.stdout;
     const stderr = agent.stderr;
     stdin?.destroy();
     stdout?.destroy();
     stderr?.destroy();
-    try {
-      agent.unref();
-    } catch {
+    if (unref) {
+      try {
+        agent.unref();
+      } catch {
+      }
     }
   }
   getConnection() {
@@ -2418,48 +2479,48 @@ var OPAQUE_VALUE_PATHS = /* @__PURE__ */ new Set([
 function isRecord(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
-function joinPath(path11) {
-  return path11.join(".");
+function joinPath(path12) {
+  return path12.join(".");
 }
-function isAllowedKey(path11, key) {
+function isAllowedKey(path12, key) {
   if (ZED_TAG_KEYS.has(key)) {
     return true;
   }
   return false;
 }
-function shouldSkipKeyRule(path11) {
-  return MAP_OBJECT_PATHS.has(joinPath(path11));
+function shouldSkipKeyRule(path12) {
+  return MAP_OBJECT_PATHS.has(joinPath(path12));
 }
-function shouldSkipDescend(path11) {
-  return OPAQUE_VALUE_PATHS.has(joinPath(path11)) || isToolResultOutputPath(path11);
+function shouldSkipDescend(path12) {
+  return OPAQUE_VALUE_PATHS.has(joinPath(path12)) || isToolResultOutputPath(path12);
 }
-function isToolResultOutputPath(path11) {
-  if (path11.length < 5 || path11[path11.length - 1] !== "output") {
+function isToolResultOutputPath(path12) {
+  if (path12.length < 5 || path12[path12.length - 1] !== "output") {
     return false;
   }
-  const toolResultsIndex = path11.lastIndexOf("tool_results");
-  if (toolResultsIndex === -1 || toolResultsIndex + 2 !== path11.length - 1) {
+  const toolResultsIndex = path12.lastIndexOf("tool_results");
+  if (toolResultsIndex === -1 || toolResultsIndex + 2 !== path12.length - 1) {
     return false;
   }
-  const parentPath = path11.slice(0, toolResultsIndex + 1).join(".");
+  const parentPath = path12.slice(0, toolResultsIndex + 1).join(".");
   return parentPath === "messages.Agent.tool_results";
 }
-function collectViolations(value, path11, violations) {
+function collectViolations(value, path12, violations) {
   if (Array.isArray(value)) {
     for (const entry of value) {
-      collectViolations(entry, path11, violations);
+      collectViolations(entry, path12, violations);
     }
     return;
   }
   if (!isRecord(value)) {
     return;
   }
-  const skipKeyRule = shouldSkipKeyRule(path11);
+  const skipKeyRule = shouldSkipKeyRule(path12);
   for (const [key, child] of Object.entries(value)) {
-    if (!skipKeyRule && !SNAKE_CASE_KEY.test(key) && !isAllowedKey(path11, key)) {
-      violations.push(`${joinPath(path11)}.${key}`.replace(/^\./, ""));
+    if (!skipKeyRule && !SNAKE_CASE_KEY.test(key) && !isAllowedKey(path12, key)) {
+      violations.push(`${joinPath(path12)}.${key}`.replace(/^\./, ""));
     }
-    const childPath = [...path11, key];
+    const childPath = [...path12, key];
     if (shouldSkipDescend(childPath)) {
       continue;
     }
@@ -6587,12 +6648,12 @@ function formatLocations(locations) {
   }
   const unique = /* @__PURE__ */ new Set();
   for (const location of locations) {
-    const path11 = location.path?.trim();
-    if (!path11) {
+    const path12 = location.path?.trim();
+    if (!path12) {
       continue;
     }
     const line = typeof location.line === "number" && Number.isFinite(location.line) ? `:${Math.max(1, Math.trunc(location.line))}` : "";
-    unique.add(`${path11}${line}`);
+    unique.add(`${path12}${line}`);
   }
   const items = [...unique];
   if (items.length === 0) {
@@ -6605,15 +6666,15 @@ function formatLocations(locations) {
   }
   return `${visible.join(", ")}, +${hidden} more`;
 }
-function summarizeDiff(path11, oldText, newText) {
+function summarizeDiff(path12, oldText, newText) {
   const oldLines = oldText ? oldText.split("\n").length : 0;
   const newLines = newText.split("\n").length;
   const delta = newLines - oldLines;
   if (delta === 0) {
-    return `diff ${path11} (line count unchanged)`;
+    return `diff ${path12} (line count unchanged)`;
   }
   const signedDelta = `${delta > 0 ? "+" : ""}${delta}`;
-  return `diff ${path11} (${signedDelta} lines)`;
+  return `diff ${path12} (${signedDelta} lines)`;
 }
 function textFromContentBlock(content) {
   switch (content.type) {
@@ -7069,6 +7130,62 @@ function createOutputFormatter(format, options = {}) {
   }
 }
 
+// src/version.ts
+import { readFileSync } from "fs";
+import path10 from "path";
+import { fileURLToPath } from "url";
+var UNKNOWN_VERSION = "0.0.0-unknown";
+var MODULE_DIR = path10.dirname(fileURLToPath(import.meta.url));
+var cachedVersion = null;
+function parseVersion(value) {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+function readPackageVersion(packageJsonPath) {
+  try {
+    const parsed = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+    return parseVersion(parsed.version);
+  } catch {
+    return null;
+  }
+}
+function resolveVersionFromAncestors(startDir) {
+  let current = startDir;
+  while (true) {
+    const packageVersion = readPackageVersion(path10.join(current, "package.json"));
+    if (packageVersion) {
+      return packageVersion;
+    }
+    const parent = path10.dirname(current);
+    if (parent === current) {
+      return null;
+    }
+    current = parent;
+  }
+}
+function resolveAcpxVersion(params) {
+  const env = params?.env ?? process.env;
+  const envPackageName = parseVersion(env.npm_package_name);
+  const envVersion = parseVersion(env.npm_package_version);
+  if (envPackageName === "acpx" && envVersion) {
+    return envVersion;
+  }
+  if (params?.packageJsonPath) {
+    return readPackageVersion(params.packageJsonPath) ?? UNKNOWN_VERSION;
+  }
+  return resolveVersionFromAncestors(MODULE_DIR) ?? UNKNOWN_VERSION;
+}
+function getAcpxVersion() {
+  if (cachedVersion) {
+    return cachedVersion;
+  }
+  cachedVersion = resolveAcpxVersion();
+  return cachedVersion;
+}
+
 // src/queue-owner-env.ts
 function asRecord7(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
@@ -7151,7 +7268,7 @@ async function readPromptInputFromStdin() {
 }
 async function readPrompt(promptParts, filePath, cwd) {
   if (filePath) {
-    const source = filePath === "-" ? await readPromptInputFromStdin() : await fs7.readFile(path10.resolve(cwd, filePath), "utf8");
+    const source = filePath === "-" ? await readPromptInputFromStdin() : await fs7.readFile(path11.resolve(cwd, filePath), "utf8");
     const pieces = [source.trim(), promptParts.join(" ").trim()].filter(
       (value) => value.length > 0
     );
@@ -7994,14 +8111,14 @@ function detectInitialCwd(argv) {
     if (token === "--cwd") {
       const next = argv[index + 1];
       if (next && next !== "--") {
-        return path10.resolve(next);
+        return path11.resolve(next);
       }
       break;
     }
     if (token.startsWith("--cwd=")) {
       const value = token.slice("--cwd=".length).trim();
       if (value.length > 0) {
-        return path10.resolve(value);
+        return path11.resolve(value);
       }
       break;
     }
@@ -8109,7 +8226,7 @@ async function main(argv = process.argv) {
   );
   const builtInAgents = listBuiltInAgents(config.agents);
   const program = new Command();
-  program.name("acpx").description("Headless CLI client for the Agent Client Protocol").enablePositionalOptions().showHelpAfterError();
+  program.name("acpx").description("Headless CLI client for the Agent Client Protocol").version(getAcpxVersion()).enablePositionalOptions().showHelpAfterError();
   if (requestedJsonStrict) {
     program.configureOutput({
       writeOut: () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acpx",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Headless CLI client for the Agent Client Protocol (ACP) — talk to coding agents from the command line",
   "type": "module",
   "files": [