@pwrdrvr/agent-acp 0.10.3 → 0.12.0

package/dist/index.d.ts

@@ -212,6 +212,22 @@ declare function normalizeAcpRuntimeCapabilities(params: {
     initialize?: AcpRuntimeCapabilities;
 }): AcpRuntimeCapabilities | undefined;
 declare function acpRuntimeSupportsSessionLoad(capabilities: AcpRuntimeCapabilities | undefined): boolean;
+/** The configOption an agent uses to expose model choice (ACP `category:
+ *  "model"`, falling back to a literal `model` id). Some agents (e.g. Kimi)
+ *  advertise the active model HERE rather than via top-level
+ *  `models.currentModelId`. */
+declare function modelConfigOption(capabilities: AcpRuntimeCapabilities | undefined): AcpRuntimeConfigOption | undefined;
+/** The effective model id the agent will run with, agnostic of HOW it advertises
+ *  it. Prefers a protocol-confirmed `models.currentModelId`; falls back to the
+ *  `model` configOption's `currentValue` for agents that expose model choice as a
+ *  config option (Kimi). Returns undefined when the agent advertises no model at
+ *  all — callers report that as "no model" rather than inventing one. */
+declare function modelIdFromCapabilities(capabilities: AcpRuntimeCapabilities | undefined): string | undefined;
+/** The full model list a host can render/cache, agnostic of advertisement style.
+ *  Returns `models.availableModels` when present; otherwise derives the list from
+ *  the `model` configOption's values (Kimi), preserving labels/descriptions and
+ *  flagging the current value as default. `[]` when no model is advertised. */
+declare function modelsFromCapabilities(capabilities: AcpRuntimeCapabilities | undefined): AcpRuntimeModel[];
 declare function acpSessionRuntimeStateFromCapabilities(capabilities: AcpRuntimeCapabilities | undefined, now: number): AcpSessionRuntimeState | undefined;
 /** Runtime-state change carried inside a session/update (mode/model/config). */
 declare function acpSessionRuntimeStateFromUpdate(update: Record<string, unknown>, now: number): AcpSessionRuntimeState | undefined;
@@ -414,10 +430,16 @@ declare class AcpAgentClient implements AgentBackend {
     private handlePermissionRequest;
     private setRuntimeOption;
     private setRuntimeOptionOnTransport;
-    /** Map a neutral `reasoning` token onto an ACP runtime option. We try to match
-     *  it to an available MODE (by id or label, case-insensitively) and switch via
-     *  `session/set_mode`. ACP has no first-class "reasoning effort" concept, so if
-     *  no mode matches we leave it alone — the caller's `.catch` debug-logs. */
+    /** Map a neutral `reasoning` token onto an ACP runtime option. ACP has no
+     *  first-class "reasoning effort" concept, so we map it to whatever the agent
+     *  exposes, in order:
+     *    1. An available MODE whose id/label matches the token (set_mode).
+     *    2. A "thinking" config option (`category: "thought_level"`, or id
+     *       `thinking`) — map low-effort tokens to its OFF-like value and
+     *       high-effort tokens to its ON-like value (set_config_option). This is
+     *       what lets a one-shot enrichment turn ("low") disable a reasoning
+     *       model's thinking pass, which is dramatically faster.
+     *  If nothing matches we leave it alone — the caller's `.catch` debug-logs. */
     private applyReasoning;
     /** Read an image file and build an ACP `image` content block (base64 + inferred
      *  mimeType). Throws on read failure; the caller catches + skips. */
@@ -429,6 +451,12 @@ declare class AcpAgentClient implements AgentBackend {
     /** Whether the agent advertises session/load support (for hosts that resume). */
     supportsSessionLoad(): boolean;
 }
+/** Pick the value to set on a "thinking" config option for a neutral reasoning
+ *  token: low-effort → the OFF-like value, high-effort → the ON-like value.
+ *  Returns undefined when the token isn't an effort signal we recognize, or the
+ *  option has no value of the needed polarity (caller leaves the option alone).
+ *  Exported for testing. */
+declare function reasoningValueForThoughtLevel(reasoning: string, values: ReadonlyArray<AcpRuntimeConfigOptionValue>): string | undefined;
 
 type AcpAgentClientFactory = () => AcpAgentClient;
 type AcpAgentClientPoolOptions = {
@@ -792,4 +820,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 AcpJsonRpcTransport, type AcpMcpServerConfig, 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 AcpRuntimeMode, type AcpRuntimeModel, type AcpRuntimeModels, type AcpRuntimeModes, type AcpRuntimeOptionSource, AcpSessionNormalizer, type AcpSessionRuntimeState, type AcpSpawnSpec, type AcpStartThreadOptions, type AcpStartTurnOptions, 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, acpRuntimeSupportsSessionLoad, acpSessionRuntimeStateFromCapabilities, acpSessionRuntimeStateFromUpdate, asRecord, buildAcpBackendId, buildStrategyTable, defaultAcpAgentAllowlist, defaultQuirks, discoverLocalAcpAgentInstances, discoverLocalAcpAgents, evaluateAcpDistributionPolicy, geminiStrategy, grokStrategy, isBannedAcpRegistryId, kimiStrategy, mergeAcpRuntimeState, modeLabelFor, normalizeAcpRuntimeCapabilities, normalizeRegistry, qwenStrategy, readAcpContentText, readBoolean, readContentText, readFirstLocationPath, readFirstString, readKind, readNonEmptyString, readNumber, readPromptText, readString, readToolCallId, readToolContentText, readToolOutput, readUpdateText, 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 AcpJsonRpcTransport, type AcpMcpServerConfig, 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 AcpRuntimeMode, type AcpRuntimeModel, type AcpRuntimeModels, type AcpRuntimeModes, type AcpRuntimeOptionSource, AcpSessionNormalizer, type AcpSessionRuntimeState, type AcpSpawnSpec, type AcpStartThreadOptions, type AcpStartTurnOptions, 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, acpRuntimeSupportsSessionLoad, acpSessionRuntimeStateFromCapabilities, acpSessionRuntimeStateFromUpdate, asRecord, buildAcpBackendId, buildStrategyTable, defaultAcpAgentAllowlist, defaultQuirks, discoverLocalAcpAgentInstances, discoverLocalAcpAgents, evaluateAcpDistributionPolicy, geminiStrategy, grokStrategy, isBannedAcpRegistryId, kimiStrategy, mergeAcpRuntimeState, modeLabelFor, modelConfigOption, modelIdFromCapabilities, modelsFromCapabilities, 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

@@ -368,8 +368,12 @@ function toolCallFromUpdate(update, kind, sessionId) {
   if (output !== void 0) {
     call.result = output;
   }
+  const locations = readToolLocations(update);
+  if (locations.length > 0) {
+    call.locations = locations;
+  }
   const explicitDisplay = command ?? readString(update, "title");
-  if (command || output !== void 0 || exitCode !== void 0) {
+  if (command !== void 0 || exitCode !== void 0) {
     const detail = {
       displayCommand: explicitDisplay ?? label
     };
@@ -378,13 +382,23 @@ function toolCallFromUpdate(update, kind, sessionId) {
     if (exitCode !== void 0) detail.exitCode = exitCode;
     call.command = detail;
   }
-  if ((toolKind === "write" || toolKind === "read") && path5) {
-    if (!call.command) {
-      call.command = { displayCommand: label };
-    }
-  }
   return call;
 }
+function readToolLocations(update) {
+  const raw = update.locations;
+  if (!Array.isArray(raw)) return [];
+  const out = [];
+  for (const item of raw) {
+    const record = asRecord(item);
+    const path5 = record ? readString(record, "path") : void 0;
+    if (path5 === void 0) continue;
+    const location = { path: path5 };
+    const line = record ? readNumber(record, "line") : void 0;
+    if (line !== void 0) location.line = line;
+    out.push(location);
+  }
+  return out;
+}
 function readToolArgs(update) {
   const raw = update.rawInput ?? update.raw_input ?? update.input ?? update.arguments ?? update.args;
   return asRecord(raw) ?? (raw === void 0 ? void 0 : raw);
@@ -702,6 +716,26 @@ function normalizeAcpRuntimeCapabilities(params) {
 function acpRuntimeSupportsSessionLoad(capabilities) {
   return capabilities?.agentCapabilities?.loadSession !== false;
 }
+function modelConfigOption(capabilities) {
+  return capabilities?.configOptions?.find(
+    (option) => option.category === "model" || option.id === "model"
+  );
+}
+function modelIdFromCapabilities(capabilities) {
+  return capabilities?.models?.currentModelId ?? modelConfigOption(capabilities)?.currentValue;
+}
+function modelsFromCapabilities(capabilities) {
+  const advertised = capabilities?.models?.availableModels;
+  if (advertised !== void 0 && advertised.length > 0) return advertised;
+  const option = modelConfigOption(capabilities);
+  if (option === void 0) return [];
+  return option.values.map((value) => ({
+    id: value.value,
+    ...value.label !== void 0 ? { label: value.label } : {},
+    ...value.description !== void 0 ? { description: value.description } : {},
+    ...option.currentValue === value.value ? { isDefault: true } : {}
+  }));
+}
 function acpSessionRuntimeStateFromCapabilities(capabilities, now) {
   if (!capabilities) {
     return void 0;
@@ -1146,7 +1180,7 @@ var AcpAgentClient = class {
       resumed: options.bindThreadId !== void 0
     });
     const out = { threadId };
-    const model = runtimeCapabilities?.models?.currentModelId;
+    const model = modelIdFromCapabilities(runtimeCapabilities);
     if (model !== void 0) out.model = model;
     out.modelProvider = this.strategy.id;
     return out;
@@ -1494,21 +1528,45 @@ var AcpAgentClient = class {
       modelId: value
     });
   }
-  /** Map a neutral `reasoning` token onto an ACP runtime option. We try to match
-   *  it to an available MODE (by id or label, case-insensitively) and switch via
-   *  `session/set_mode`. ACP has no first-class "reasoning effort" concept, so if
-   *  no mode matches we leave it alone — the caller's `.catch` debug-logs. */
+  /** Map a neutral `reasoning` token onto an ACP runtime option. ACP has no
+   *  first-class "reasoning effort" concept, so we map it to whatever the agent
+   *  exposes, in order:
+   *    1. An available MODE whose id/label matches the token (set_mode).
+   *    2. A "thinking" config option (`category: "thought_level"`, or id
+   *       `thinking`) — map low-effort tokens to its OFF-like value and
+   *       high-effort tokens to its ON-like value (set_config_option). This is
+   *       what lets a one-shot enrichment turn ("low") disable a reasoning
+   *       model's thinking pass, which is dramatically faster.
+   *  If nothing matches we leave it alone — the caller's `.catch` debug-logs. */
   async applyReasoning(threadId, reasoning) {
-    const modes = this.runtimeCapabilities?.modes?.availableModes ?? [];
     const target = reasoning.toLowerCase();
-    const match = modes.find(
+    const modes = this.runtimeCapabilities?.modes?.availableModes ?? [];
+    const modeMatch = modes.find(
       (mode) => mode.id.toLowerCase() === target || typeof mode.label === "string" && mode.label.toLowerCase() === target
     );
-    if (match === void 0) {
-      this.logger.debug("acp reasoning has no matching mode \u2014 ignored", { reasoning });
+    if (modeMatch !== void 0) {
+      await this.setMode(threadId, modeMatch.id);
+      return;
+    }
+    const thinking = this.runtimeCapabilities?.configOptions?.find(
+      (option) => option.category === "thought_level" || option.id === "thinking"
+    );
+    if (thinking !== void 0) {
+      const value = reasoningValueForThoughtLevel(target, thinking.values);
+      if (value === void 0) {
+        this.logger.debug("acp reasoning has no matching thought-level value \u2014 ignored", {
+          reasoning
+        });
+        return;
+      }
+      if (value !== thinking.currentValue) {
+        await this.setConfigOption(threadId, thinking.id, value);
+      }
       return;
     }
-    await this.setMode(threadId, match.id);
+    this.logger.debug("acp reasoning has no matching mode or thought-level option \u2014 ignored", {
+      reasoning
+    });
   }
   /** Read an image file and build an ACP `image` content block (base64 + inferred
    *  mimeType). Throws on read failure; the caller catches + skips. */
@@ -1541,7 +1599,7 @@ var AcpAgentClient = class {
   }
   emitThreadSettings(session, capabilities, runtimeState) {
     const settings = { threadId: session.threadId };
-    const model = runtimeState?.currentModelId ?? capabilities?.models?.currentModelId;
+    const model = runtimeState?.currentModelId ?? modelIdFromCapabilities(capabilities);
     if (model !== void 0) settings.model = model;
     settings.modelProvider = this.strategy.id;
     const modeId = runtimeState?.currentModeId ?? capabilities?.modes?.currentModeId;
@@ -1564,6 +1622,38 @@ var AcpAgentClient = class {
     return acpRuntimeSupportsSessionLoad(this.runtimeCapabilities);
   }
 };
+var LOW_EFFORT_TOKENS = /* @__PURE__ */ new Set([
+  "off",
+  "none",
+  "minimal",
+  "min",
+  "minimum",
+  "low",
+  "fast"
+]);
+var HIGH_EFFORT_TOKENS = /* @__PURE__ */ new Set([
+  "on",
+  "high",
+  "medium",
+  "max",
+  "maximum",
+  "full",
+  "think"
+]);
+function thoughtLevelPolarity(value) {
+  const haystack = `${value.value} ${value.label ?? ""}`.toLowerCase();
+  if (/\b(off|none|disabled?|no)\b/.test(haystack)) return "off";
+  if (/\b(on|enabled?|high|full|yes)\b/.test(haystack)) return "on";
+  return "other";
+}
+function reasoningValueForThoughtLevel(reasoning, values) {
+  const token = reasoning.toLowerCase();
+  const wantOff = LOW_EFFORT_TOKENS.has(token);
+  const wantOn = HIGH_EFFORT_TOKENS.has(token);
+  if (!wantOff && !wantOn) return void 0;
+  const desired = wantOff ? "off" : "on";
+  return values.find((value) => thoughtLevelPolarity(value) === desired)?.value;
+}
 function buildApprovalRequest(args) {
   const toolCall = asRecord2(args.params.toolCall) ?? {};
   const title = typeof toolCall.title === "string" && toolCall.title.trim() ? toolCall.title.trim() : "ACP tool call";
@@ -1953,8 +2043,8 @@ var AcpOneShotClient = class {
   async listModelsInner() {
     let models = [];
     const unsubscribe = this.client.onRuntimeCapabilities((event) => {
-      const observed = event.runtimeCapabilities.models?.availableModels;
-      if (observed !== void 0 && observed.length > 0) models = observed;
+      const observed = modelsFromCapabilities(event.runtimeCapabilities);
+      if (observed.length > 0) models = observed;
     });
     try {
       await this.client.startThread();
@@ -2678,6 +2768,9 @@ export {
   kimiStrategy,
   mergeAcpRuntimeState,
   modeLabelFor,
+  modelConfigOption,
+  modelIdFromCapabilities,
+  modelsFromCapabilities,
   normalizeAcpRuntimeCapabilities,
   normalizeRegistry,
   qwenStrategy,
@@ -2695,6 +2788,7 @@ export {
   readToolContentText,
   readToolOutput,
   readUpdateText,
+  reasoningValueForThoughtLevel,
   strategyByBackendId,
   strategyById,
   toolCallFromUpdate,