acpx 0.1.11 → 0.1.13

package/dist/cli.js

@@ -4,7 +4,7 @@
 import { Command, CommanderError, InvalidArgumentError as InvalidArgumentError3 } from "commander";
 import { realpathSync } from "fs";
 import fs6 from "fs/promises";
-import path7 from "path";
+import path8 from "path";
 import { pathToFileURL } from "url";
 import { findSkillsRoot, maybeHandleSkillflag } from "skillflag";
 
@@ -1053,12 +1053,12 @@ function formatLocations(locations) {
   }
   const unique = /* @__PURE__ */ new Set();
   for (const location of locations) {
-    const path8 = location.path?.trim();
-    if (!path8) {
+    const path9 = location.path?.trim();
+    if (!path9) {
       continue;
     }
     const line = typeof location.line === "number" && Number.isFinite(location.line) ? `:${Math.max(1, Math.trunc(location.line))}` : "";
-    unique.add(`${path8}${line}`);
+    unique.add(`${path9}${line}`);
   }
   const items = [...unique];
   if (items.length === 0) {
@@ -1071,15 +1071,15 @@ function formatLocations(locations) {
   }
   return `${visible.join(", ")}, +${hidden} more`;
 }
-function summarizeDiff(path8, oldText, newText) {
+function summarizeDiff(path9, 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 ${path8} (line count unchanged)`;
+    return `diff ${path9} (line count unchanged)`;
   }
   const signedDelta = `${delta > 0 ? "+" : ""}${delta}`;
-  return `diff ${path8} (${signedDelta} lines)`;
+  return `diff ${path9} (${signedDelta} lines)`;
 }
 function textFromContentBlock(content) {
   switch (content.type) {
@@ -1639,7 +1639,7 @@ function createOutputFormatter(format, options = {}) {
 
 // src/session-runtime.ts
 import fs5 from "fs/promises";
-import path6 from "path";
+import path7 from "path";
 
 // src/client.ts
 import {
@@ -1648,7 +1648,7 @@ import {
   ndJsonStream
 } from "@agentclientprotocol/sdk";
 import { spawn as spawn2 } from "child_process";
-import path3 from "path";
+import path4 from "path";
 import { Readable, Writable } from "stream";
 
 // src/filesystem.ts
@@ -2011,6 +2011,62 @@ function extractAgentSessionId(meta) {
   return void 0;
 }
 
+// src/version.ts
+import { readFileSync } from "fs";
+import path3 from "path";
+import { fileURLToPath } from "url";
+var UNKNOWN_VERSION = "0.0.0-unknown";
+var MODULE_DIR = path3.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(path3.join(current, "package.json"));
+    if (packageVersion) {
+      return packageVersion;
+    }
+    const parent = path3.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/terminal.ts
 import { spawn } from "child_process";
 import { randomUUID } from "crypto";
@@ -2477,7 +2533,7 @@ function splitCommandLine(value) {
   };
 }
 function asAbsoluteCwd(cwd) {
-  return path3.resolve(cwd);
+  return path4.resolve(cwd);
 }
 function toEnvToken(value) {
   return value.trim().replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "").toUpperCase();
@@ -2685,7 +2741,7 @@ var AcpClient = class {
         },
         clientInfo: {
           name: "acpx",
-          version: "0.1.0"
+          version: getAcpxVersion()
         }
       });
       await this.authenticateIfRequired(connection, initResult.authMethods ?? []);
@@ -3112,25 +3168,25 @@ var AcpClient = class {
 import { createHash } from "crypto";
 import fs3 from "fs/promises";
 import os2 from "os";
-import path4 from "path";
+import path5 from "path";
 var PROCESS_EXIT_GRACE_MS = 1500;
 var PROCESS_POLL_MS = 50;
 var QUEUE_OWNER_STALE_HEARTBEAT_MS = 15e3;
 function queueBaseDir() {
-  return path4.join(os2.homedir(), ".acpx", "queues");
+  return path5.join(os2.homedir(), ".acpx", "queues");
 }
 function queueKeyForSession(sessionId) {
   return createHash("sha256").update(sessionId).digest("hex").slice(0, 24);
 }
 function queueLockFilePath(sessionId) {
-  return path4.join(queueBaseDir(), `${queueKeyForSession(sessionId)}.lock`);
+  return path5.join(queueBaseDir(), `${queueKeyForSession(sessionId)}.lock`);
 }
 function queueSocketPath(sessionId) {
   const key = queueKeyForSession(sessionId);
   if (process.platform === "win32") {
     return `\\\\.\\pipe\\acpx-${key}`;
   }
-  return path4.join(queueBaseDir(), `${key}.sock`);
+  return path5.join(queueBaseDir(), `${key}.sock`);
 }
 function parseQueueOwnerRecord(raw) {
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
@@ -4773,14 +4829,14 @@ import { spawn as spawn3 } from "child_process";
 import { statSync } from "fs";
 import fs4 from "fs/promises";
 import os3 from "os";
-import path5 from "path";
+import path6 from "path";
 var DEFAULT_HISTORY_LIMIT = 20;
 function sessionFilePath(id) {
   const safeId = encodeURIComponent(id);
-  return path5.join(sessionBaseDir(), `${safeId}.json`);
+  return path6.join(sessionBaseDir(), `${safeId}.json`);
 }
 function sessionBaseDir() {
-  return path5.join(os3.homedir(), ".acpx", "sessions");
+  return path6.join(os3.homedir(), ".acpx", "sessions");
 }
 async function ensureSessionDir() {
   await fs4.mkdir(sessionBaseDir(), { recursive: true });
@@ -4899,7 +4955,7 @@ async function resolveSessionRecord(sessionId) {
   throw new SessionNotFoundError(sessionId);
 }
 function hasGitDirectory(dir) {
-  const gitPath = path5.join(dir, ".git");
+  const gitPath = path6.join(dir, ".git");
   try {
     return statSync(gitPath).isDirectory();
   } catch {
@@ -4907,15 +4963,15 @@ function hasGitDirectory(dir) {
   }
 }
 function isWithinBoundary(boundary, target) {
-  const relative = path5.relative(boundary, target);
-  return relative.length === 0 || !relative.startsWith("..") && !path5.isAbsolute(relative);
+  const relative = path6.relative(boundary, target);
+  return relative.length === 0 || !relative.startsWith("..") && !path6.isAbsolute(relative);
 }
 function absolutePath(value) {
-  return path5.resolve(value);
+  return path6.resolve(value);
 }
 function findGitRepositoryRoot(startDir) {
   let current = absolutePath(startDir);
-  const root = path5.parse(current).root;
+  const root = path6.parse(current).root;
   for (; ; ) {
     if (hasGitDirectory(current)) {
       return current;
@@ -4923,7 +4979,7 @@ function findGitRepositoryRoot(startDir) {
     if (current === root) {
       return void 0;
     }
-    const parent = path5.dirname(current);
+    const parent = path6.dirname(current);
     if (parent === current) {
       return void 0;
     }
@@ -4948,7 +5004,7 @@ async function listSessions() {
     if (!entry.isFile() || !entry.name.endsWith(".json")) {
       continue;
     }
-    const fullPath = path5.join(sessionBaseDir(), entry.name);
+    const fullPath = path6.join(sessionBaseDir(), entry.name);
     try {
       const payload = await fs4.readFile(fullPath, "utf8");
       const parsed = parseSessionRecord(JSON.parse(payload));
@@ -5009,7 +5065,7 @@ async function findSessionByDirectoryWalk(options) {
     if (dir === walkBoundary) {
       return void 0;
     }
-    const parent = path5.dirname(dir);
+    const parent = path6.dirname(dir);
     if (parent === dir) {
       return void 0;
     }
@@ -6027,9 +6083,9 @@ async function isLikelyMatchingProcess(pid, agentCommand) {
     if (argv.length === 0) {
       return false;
     }
-    const executableBase = path6.basename(argv[0]);
-    const expectedBase = path6.basename(expectedToken);
-    return executableBase === expectedBase || argv.some((entry) => path6.basename(entry) === expectedBase);
+    const executableBase = path7.basename(argv[0]);
+    const expectedBase = path7.basename(expectedToken);
+    return executableBase === expectedBase || argv.some((entry) => path7.basename(entry) === expectedBase);
   } catch {
     return true;
   }
@@ -6153,7 +6209,7 @@ async function readPromptInputFromStdin() {
 }
 async function readPrompt(promptParts, filePath, cwd) {
   if (filePath) {
-    const source = filePath === "-" ? await readPromptInputFromStdin() : await fs6.readFile(path7.resolve(cwd, filePath), "utf8");
+    const source = filePath === "-" ? await readPromptInputFromStdin() : await fs6.readFile(path8.resolve(cwd, filePath), "utf8");
     const pieces = [source.trim(), promptParts.join(" ").trim()].filter(
       (value) => value.length > 0
     );
@@ -6294,7 +6350,7 @@ function resolveAgentInvocation(explicitAgentName, globalFlags, config) {
   return {
     agentName,
     agentCommand,
-    cwd: path7.resolve(globalFlags.cwd)
+    cwd: path8.resolve(globalFlags.cwd)
   };
 }
 function printSessionsByFormat(sessions, format) {
@@ -6433,19 +6489,19 @@ function formatSessionLabel(record) {
   return record.name ?? "cwd";
 }
 function formatRoutedFrom(sessionCwd, currentCwd) {
-  const relative = path7.relative(sessionCwd, currentCwd);
+  const relative = path8.relative(sessionCwd, currentCwd);
   if (!relative || relative === ".") {
     return void 0;
   }
-  return relative.startsWith(".") ? relative : `.${path7.sep}${relative}`;
+  return relative.startsWith(".") ? relative : `.${path8.sep}${relative}`;
 }
 function sessionConnectionStatus(record) {
   return isProcessAlive(record.pid) ? "connected" : "needs reconnect";
 }
 function formatPromptSessionBannerLine(record, currentCwd) {
   const label = formatSessionLabel(record);
-  const normalizedSessionCwd = path7.resolve(record.cwd);
-  const normalizedCurrentCwd = path7.resolve(currentCwd);
+  const normalizedSessionCwd = path8.resolve(record.cwd);
+  const normalizedCurrentCwd = path8.resolve(currentCwd);
   const routedFrom = normalizedSessionCwd === normalizedCurrentCwd ? void 0 : formatRoutedFrom(normalizedSessionCwd, normalizedCurrentCwd);
   const status = sessionConnectionStatus(record);
   if (routedFrom) {
@@ -7257,14 +7313,14 @@ function detectInitialCwd(argv) {
     if (token === "--cwd") {
       const next = argv[index + 1];
       if (next && next !== "--") {
-        return path7.resolve(next);
+        return path8.resolve(next);
       }
       break;
     }
     if (token.startsWith("--cwd=")) {
       const value = token.slice("--cwd=".length).trim();
       if (value.length > 0) {
-        return path7.resolve(value);
+        return path8.resolve(value);
       }
       break;
     }
@@ -7365,7 +7421,7 @@ async function main(argv = process.argv) {
     DEFAULT_QUEUE_OWNER_TTL_MS
   );
   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.11",
+  "version": "0.1.13",
   "description": "Headless CLI client for the Agent Client Protocol (ACP) — talk to coding agents from the command line",
   "type": "module",
   "files": [