@pwrdrvr/agent-acp 0.13.0 → 0.14.0

package/dist/index.d.ts

@@ -700,6 +700,15 @@ type DiscoveredAcpAgentInstance = {
     /** Where this candidate came from (user override, `PATH`, or a fallback path). */
     source: AcpAgentInstanceSource;
 };
+/** A detected executable that did not satisfy a strategy's discovery probe.
+ *  It is diagnostic-only: hosts must never use it to launch an ACP session. */
+type RejectedAcpAgentInstance = {
+    command: string;
+    /** Parsed from successful `--version` output when available. */
+    version?: string;
+    source: AcpAgentInstanceSource;
+    reason: "version-probe-failed" | "acp-probe-failed" | "acp-help-mismatch";
+};
 /** Every installed instance of one agent found on this machine. */
 type DiscoveredAcpAgentGroup = {
     strategyId: string;
@@ -711,6 +720,9 @@ type DiscoveredAcpAgentGroup = {
     env: Record<string, string>;
     /** All instances that passed the probe, in candidate order (override → PATH → fallback). */
     instances: DiscoveredAcpAgentInstance[];
+    /** Detected candidates that failed the version or ACP-capability probe. Only
+     *  populated when `includeRejectedCandidates` is enabled. */
+    rejectedInstances?: RejectedAcpAgentInstance[];
     discoveredAt: number;
 };
 type DiscoveredAcpAgent = {
@@ -740,11 +752,15 @@ type LocalAcpDiscoveryOptions = {
     env?: NodeJS.ProcessEnv;
     /** Injectable `PATH` executable lister (real-fs scan by default). */
     listExecutables?: AcpPathExecutableLister;
+    /** Include candidates known to exist but rejected by a discovery probe.
+     *  Defaults false to preserve the legacy installed-only result. */
+    includeRejectedCandidates?: boolean;
 };
 /**
  * Discover every installed instance of each agent (all `PATH` matches +
  * fallbacks + override that pass the probe), grouped per strategy. Groups with
- * no passing instance are omitted.
+ * no passing instance are omitted unless `includeRejectedCandidates` is true
+ * and a detected candidate failed a probe.
  */
 declare function discoverLocalAcpAgentInstances(options?: LocalAcpDiscoveryOptions): Promise<DiscoveredAcpAgentGroup[]>;
 /**
@@ -874,4 +890,4 @@ declare class AcpRegistryService {
 declare function evaluateAcpDistributionPolicy(distribution: AcpRegistryDistribution, allowlist: AcpAllowlistDecision): AcpDistributionPolicy;
 declare function normalizeRegistry(raw: unknown): AcpRegistryAgent[];
 
-export { ACP_REGISTRY_URL, AcpAgentAllowlist, type AcpAgentAllowlistRule, AcpAgentClient, type AcpAgentClientFactory, type AcpAgentClientOptions, AcpAgentClientPool, type AcpAgentClientPoolOptions, type AcpAgentConnection, type AcpAgentConnectionHandle, type AcpAgentInstanceSource, type AcpAgentQuirks, type AcpAgentStrategy, type AcpAllowlistDecision, type AcpApplyContext, type AcpBinaryPlatformDistribution, AcpConnection, type AcpConnectionOptions, type AcpDiscoveryProbe, type AcpDistributionKind, type AcpDistributionPolicy, type AcpHttpMcpServerConfig, type AcpJsonRpcTransport, type AcpLoadThreadOptions, type AcpMcpKeyValue, type AcpMcpKeyValueCollection, type AcpMcpServerConfig, type AcpMcpServerWireConfig, type AcpNormalizeResult, type AcpNormalizerOptions, AcpOneShotClient, type AcpOneShotClientOptions, type AcpOneShotRequest, type AcpOneShotResponse, type AcpPackageDistribution, type AcpPathExecutableLister, type AcpPromptContentBlock, type AcpRegistryAgent, type AcpRegistryAgentWithPolicy, type AcpRegistryAuthDescriptor, type AcpRegistryAuthMethod, type AcpRegistryDistribution, type AcpRegistryFetch, AcpRegistryService, type AcpRegistryServiceOptions, type AcpRegistrySnapshot, type AcpRuntimeAgentCapabilities, type AcpRuntimeAgentInfo, type AcpRuntimeCapabilities, type AcpRuntimeCapabilitiesHandler, type AcpRuntimeCapabilitiesSource, type AcpRuntimeConfigOption, type AcpRuntimeConfigOptionValue, type AcpRuntimeMcpCapabilities, type AcpRuntimeMode, type AcpRuntimeModel, type AcpRuntimeModels, type AcpRuntimeModes, type AcpRuntimeOptionSource, AcpSessionNormalizer, type AcpSessionRuntimeState, type AcpSpawnSpec, type AcpSseMcpServerConfig, type AcpStartThreadOptions, type AcpStartTurnOptions, type AcpStdioMcpServerConfig, type AcpTitleHandler, type AcpVerificationStatus, BANNED_ACP_REGISTRY_IDS, BUILT_IN_ACP_STRATEGIES, DEFAULT_ACP_AGENT_ALLOWLIST, type DiscoveredAcpAgent, type DiscoveredAcpAgentGroup, type DiscoveredAcpAgentInstance, type LocalAcpAgentProbe, type LocalAcpDiscoveryOptions, type LocalAcpProbeResult, acpRuntimeSupportsHttpMcp, acpRuntimeSupportsSessionLoad, acpRuntimeSupportsSseMcp, acpSessionRuntimeStateFromCapabilities, acpSessionRuntimeStateFromUpdate, asRecord, buildAcpBackendId, buildStrategyTable, defaultAcpAgentAllowlist, defaultQuirks, discoverLocalAcpAgentInstances, discoverLocalAcpAgents, evaluateAcpDistributionPolicy, geminiStrategy, grokStrategy, isBannedAcpRegistryId, kimiStrategy, mergeAcpRuntimeState, modeLabelFor, modelConfigOption, modelIdFromCapabilities, modelsFromCapabilities, normalizeAcpMcpServerConfig, normalizeAcpMcpServerConfigs, normalizeAcpRuntimeCapabilities, normalizeRegistry, qwenStrategy, readAcpContentText, readBoolean, readContentText, readFirstLocationPath, readFirstString, readKind, readNonEmptyString, readNumber, readPromptText, readString, readToolCallId, readToolContentText, readToolOutput, readUpdateText, reasoningValueForThoughtLevel, strategyByBackendId, strategyById, toolCallFromUpdate, wellKnownAgentBinDirs };
+export { ACP_REGISTRY_URL, AcpAgentAllowlist, type AcpAgentAllowlistRule, AcpAgentClient, type AcpAgentClientFactory, type AcpAgentClientOptions, AcpAgentClientPool, type AcpAgentClientPoolOptions, type AcpAgentConnection, type AcpAgentConnectionHandle, type AcpAgentInstanceSource, type AcpAgentQuirks, type AcpAgentStrategy, type AcpAllowlistDecision, type AcpApplyContext, type AcpBinaryPlatformDistribution, AcpConnection, type AcpConnectionOptions, type AcpDiscoveryProbe, type AcpDistributionKind, type AcpDistributionPolicy, type AcpHttpMcpServerConfig, type AcpJsonRpcTransport, type AcpLoadThreadOptions, type AcpMcpKeyValue, type AcpMcpKeyValueCollection, type AcpMcpServerConfig, type AcpMcpServerWireConfig, type AcpNormalizeResult, type AcpNormalizerOptions, AcpOneShotClient, type AcpOneShotClientOptions, type AcpOneShotRequest, type AcpOneShotResponse, type AcpPackageDistribution, type AcpPathExecutableLister, type AcpPromptContentBlock, type AcpRegistryAgent, type AcpRegistryAgentWithPolicy, type AcpRegistryAuthDescriptor, type AcpRegistryAuthMethod, type AcpRegistryDistribution, type AcpRegistryFetch, AcpRegistryService, type AcpRegistryServiceOptions, type AcpRegistrySnapshot, type AcpRuntimeAgentCapabilities, type AcpRuntimeAgentInfo, type AcpRuntimeCapabilities, type AcpRuntimeCapabilitiesHandler, type AcpRuntimeCapabilitiesSource, type AcpRuntimeConfigOption, type AcpRuntimeConfigOptionValue, type AcpRuntimeMcpCapabilities, type AcpRuntimeMode, type AcpRuntimeModel, type AcpRuntimeModels, type AcpRuntimeModes, type AcpRuntimeOptionSource, AcpSessionNormalizer, type AcpSessionRuntimeState, type AcpSpawnSpec, type AcpSseMcpServerConfig, type AcpStartThreadOptions, type AcpStartTurnOptions, type AcpStdioMcpServerConfig, type AcpTitleHandler, type AcpVerificationStatus, BANNED_ACP_REGISTRY_IDS, BUILT_IN_ACP_STRATEGIES, DEFAULT_ACP_AGENT_ALLOWLIST, type DiscoveredAcpAgent, type DiscoveredAcpAgentGroup, type DiscoveredAcpAgentInstance, type LocalAcpAgentProbe, type LocalAcpDiscoveryOptions, type LocalAcpProbeResult, type RejectedAcpAgentInstance, acpRuntimeSupportsHttpMcp, acpRuntimeSupportsSessionLoad, acpRuntimeSupportsSseMcp, acpSessionRuntimeStateFromCapabilities, acpSessionRuntimeStateFromUpdate, asRecord, buildAcpBackendId, buildStrategyTable, defaultAcpAgentAllowlist, defaultQuirks, discoverLocalAcpAgentInstances, discoverLocalAcpAgents, evaluateAcpDistributionPolicy, geminiStrategy, grokStrategy, isBannedAcpRegistryId, kimiStrategy, mergeAcpRuntimeState, modeLabelFor, modelConfigOption, modelIdFromCapabilities, modelsFromCapabilities, normalizeAcpMcpServerConfig, normalizeAcpMcpServerConfigs, normalizeAcpRuntimeCapabilities, normalizeRegistry, qwenStrategy, readAcpContentText, readBoolean, readContentText, readFirstLocationPath, readFirstString, readKind, readNonEmptyString, readNumber, readPromptText, readString, readToolCallId, readToolContentText, readToolOutput, readUpdateText, reasoningValueForThoughtLevel, strategyByBackendId, strategyById, toolCallFromUpdate, wellKnownAgentBinDirs };

package/dist/index.js

@@ -6,6 +6,10 @@ import {
   ndJsonStream
 } from "@agentclientprotocol/sdk";
 import { noopLogger } from "@pwrdrvr/agent-core";
+import {
+  createCommandInvocation,
+  prependCommandDirToPath
+} from "@pwrdrvr/agent-transport";
 var AcpConnection = class {
   constructor(options) {
     this.options = options;
@@ -64,9 +68,12 @@ var AcpConnection = class {
     const { command, args, env } = this.options;
     const logger = this.logger;
     return (client) => {
-      const child = spawn(command, args, {
+      const launchEnv = prependCommandDirToPath(command, env ?? process.env);
+      const invocation = createCommandInvocation({ command, args, env: launchEnv });
+      const child = spawn(invocation.command, invocation.args, {
         stdio: ["pipe", "pipe", "pipe"],
-        ...env !== void 0 ? { env } : {}
+        env: launchEnv,
+        windowsVerbatimArguments: invocation.windowsVerbatimArguments
       });
       child.on("error", (error) => {
         logger.error("acp agent process error", { command, message: error.message });
@@ -2302,7 +2309,10 @@ import { readdirSync, realpathSync, statSync } from "fs";
 import { homedir as homedir4 } from "os";
 import path4 from "path";
 import { promisify } from "util";
-import { prependCommandDirToPath } from "@pwrdrvr/agent-transport";
+import {
+  createCommandInvocation as createCommandInvocation2,
+  prependCommandDirToPath as prependCommandDirToPath2
+} from "@pwrdrvr/agent-transport";
 var execFile = promisify(execFileCallback);
 async function discoverLocalAcpAgentInstances(options = {}) {
   const strategies = options.strategies ?? BUILT_IN_ACP_STRATEGIES;
@@ -2318,7 +2328,8 @@ async function discoverLocalAcpAgentInstances(options = {}) {
         now,
         env,
         listExecutables,
-        options.overrides?.[strategy.id]
+        options.overrides?.[strategy.id],
+        options.includeRejectedCandidates === true
       )
     )
   );
@@ -2342,21 +2353,40 @@ async function discoverLocalAcpAgents(options = {}) {
     return [agent];
   });
 }
-async function discoverStrategyInstances(strategy, probe, now, env, listExecutables, override) {
+async function discoverStrategyInstances(strategy, probe, now, env, listExecutables, override, includeRejectedCandidates = false) {
   const candidates = candidateCommands(strategy, env, listExecutables, override);
   const instances = [];
+  const rejectedInstances = [];
   for (const candidate of candidates) {
     const [versionResult, helpResult] = await Promise.all([
       runProbe(probe, candidate.command, strategy.discoveryProbe.versionArgs),
       runProbe(probe, candidate.command, strategy.discoveryProbe.helpArgs)
     ]);
+    const version = versionResult ? parseCliVersion(resultText(versionResult)) : void 0;
     if (!versionResult || !helpResult) {
+      if (includeRejectedCandidates && candidate.detected) {
+        const rejected = {
+          command: candidate.command,
+          source: candidate.source,
+          reason: versionResult ? "acp-probe-failed" : "version-probe-failed"
+        };
+        if (version !== void 0) rejected.version = version;
+        rejectedInstances.push(rejected);
+      }
       continue;
     }
     if (strategy.discoveryProbe.helpMatches !== void 0 && !strategy.discoveryProbe.helpMatches.test(resultText(helpResult))) {
+      if (includeRejectedCandidates && candidate.detected) {
+        const rejected = {
+          command: candidate.command,
+          source: candidate.source,
+          reason: "acp-help-mismatch"
+        };
+        if (version !== void 0) rejected.version = version;
+        rejectedInstances.push(rejected);
+      }
       continue;
     }
-    const version = parseCliVersion(resultText(versionResult));
     const instance = {
       command: candidate.command,
       source: candidate.source
@@ -2364,7 +2394,7 @@ async function discoverStrategyInstances(strategy, probe, now, env, listExecutab
     if (version !== void 0) instance.version = version;
     instances.push(instance);
   }
-  if (instances.length === 0) {
+  if (instances.length === 0 && rejectedInstances.length === 0) {
     return void 0;
   }
   return {
@@ -2374,64 +2404,98 @@ async function discoverStrategyInstances(strategy, probe, now, env, listExecutab
     args: ensureArgs(strategy.spawn.args, strategy.spawn.ensureArgs),
     env: strategy.spawn.env ?? {},
     instances,
+    ...rejectedInstances.length > 0 ? { rejectedInstances } : {},
     discoveredAt: now()
   };
 }
 function candidateCommands(strategy, env, listExecutables, override) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
-  const push = (command, source) => {
+  const push = (command, source, detected) => {
     const trimmed = command.trim();
     if (trimmed.length === 0) return;
     const key = canonicalize(trimmed);
     if (seen.has(key)) return;
     seen.add(key);
-    out.push({ command: trimmed, source });
+    out.push({ command: trimmed, source, detected });
   };
   if (override && override.trim().length > 0) {
-    push(override, "override");
+    push(override, "override", isExecutableFile(override));
   }
   const pathMatches = listExecutables(strategy.discoveryProbe.command, env);
   if (pathMatches.length > 0) {
-    for (const match of pathMatches) push(match, "path");
+    for (const match of pathMatches) push(match, "path", true);
   } else {
-    push(strategy.discoveryProbe.command, "path");
+    push(strategy.discoveryProbe.command, "path", false);
   }
   for (const fallback of strategy.discoveryProbe.fallbackCommands ?? []) {
-    push(fallback, "fallback");
+    push(fallback, "fallback", isExecutableFile(fallback));
   }
   return out;
 }
+function isExecutableFile(command) {
+  try {
+    const stat = statSync(command);
+    return stat.isFile() && (process.platform === "win32" || (stat.mode & 73) !== 0);
+  } catch {
+    return false;
+  }
+}
 function canonicalize(command) {
-  if (!path4.isAbsolute(command)) return command;
+  if (!path4.isAbsolute(command)) {
+    return process.platform === "win32" ? command.toLowerCase() : command;
+  }
   try {
-    return realpathSync(command);
+    const canonical = realpathSync(command);
+    return process.platform === "win32" ? canonical.toLowerCase() : canonical;
   } catch {
-    return command;
+    return process.platform === "win32" ? command.toLowerCase() : command;
   }
 }
 function defaultListExecutables(command, env) {
-  if (process.platform === "win32") return [];
-  if (command.includes(path4.sep)) return [];
+  if (command.includes("/") || command.includes("\\")) return [];
   const found = [];
   const seenDir = /* @__PURE__ */ new Set();
   for (const dir of discoveryDirs(env)) {
-    if (dir.length === 0 || seenDir.has(dir)) continue;
-    seenDir.add(dir);
-    const candidate = path4.join(dir, command);
-    try {
-      const stat = statSync(candidate);
-      if (stat.isFile() && (stat.mode & 73) !== 0) {
-        found.push(candidate);
+    const normalizedDir = normalizePathEntry(dir);
+    const dirKey = process.platform === "win32" ? normalizedDir.toLowerCase() : normalizedDir;
+    if (normalizedDir.length === 0 || seenDir.has(dirKey)) continue;
+    seenDir.add(dirKey);
+    for (const commandName of executableCommandNames(command, env)) {
+      const candidate = path4.join(normalizedDir, commandName);
+      try {
+        const stat = statSync(candidate);
+        if (stat.isFile() && (process.platform === "win32" || (stat.mode & 73) !== 0)) {
+          found.push(candidate);
+        }
+      } catch {
       }
-    } catch {
     }
   }
   return found;
 }
+function executableCommandNames(command, env) {
+  if (process.platform !== "win32") return [command];
+  const extensions = (readWindowsEnv(env, "PATHEXT")?.trim() || ".COM;.EXE;.BAT;.CMD").split(";").map((extension) => extension.trim()).filter(Boolean).map((extension) => extension.startsWith(".") ? extension : `.${extension}`);
+  const commandExtension = path4.win32.extname(command);
+  if (commandExtension.length > 0 && extensions.some((extension) => extension.toLowerCase() === commandExtension.toLowerCase())) {
+    return [command];
+  }
+  return extensions.map((extension) => `${command}${extension}`);
+}
+function readWindowsEnv(env, name) {
+  const key = Object.keys(env).find((candidate) => candidate.toLowerCase() === name.toLowerCase());
+  return key ? env[key] : void 0;
+}
+function normalizePathEntry(entry) {
+  const trimmed = entry.trim();
+  const quoted = trimmed.match(/^"(.*)"$/);
+  return quoted?.[1] ?? trimmed;
+}
 function discoveryDirs(env) {
-  const pathValue = env.PATH ?? env.Path ?? "";
-  return [...pathValue.split(path4.delimiter), ...wellKnownAgentBinDirs(homedir4())];
+  const pathValue = process.platform === "win32" ? readWindowsEnv(env, "PATH") ?? "" : env.PATH ?? "";
+  const pathDirs = pathValue.split(path4.delimiter);
+  return process.platform === "win32" ? pathDirs : [...pathDirs, ...wellKnownAgentBinDirs(homedir4())];
 }
 function wellKnownAgentBinDirs(home = homedir4()) {
   return [
@@ -2469,12 +2533,15 @@ function ensureArgs(args, ensure) {
 }
 function makeDefaultProbe(env) {
   return async (command, args) => {
-    return await execFile(command, args, {
+    const launchEnv = prependCommandDirToPath2(command, env);
+    const invocation = createCommandInvocation2({ command, args, env: launchEnv });
+    return await execFile(invocation.command, invocation.args, {
       timeout: 5e3,
       maxBuffer: 1024 * 1024,
       // Prepend the candidate's own dir so a node-script CLI (e.g. an nvm-
       // installed `qwen`) finds its sibling `node` during the probe.
-      env: prependCommandDirToPath(command, env)
+      env: launchEnv,
+      windowsVerbatimArguments: invocation.windowsVerbatimArguments
     });
   };
 }