@agentproto/acp 0.3.0 → 0.5.0

package/LICENSE

@@ -1,21 +1,202 @@
-MIT License
-
-Copyright (c) 2026 agentproto contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/client/index.d.ts

@@ -1,5 +1,5 @@
 import { ClientSideConnection, Client } from '@agentclientprotocol/sdk';
-import { S as StreamEvent } from '../types-DC2phPNG.js';
+import { S as StreamEvent, e as AcpPermissionResolution } from '../types-DQCJO97x.js';
 
 /**
  * AIP-44 ACP client — drives a subprocess agent via stdio JSON-RPC.
@@ -12,14 +12,14 @@ import { S as StreamEvent } from '../types-DC2phPNG.js';
  */
 
 /**
- * Map our internal `AcpMcpServer` (`{ name, transport, ref }`) onto the
- * `@agentclientprotocol/sdk` wire shape expected by
+ * Map our internal `AcpMcpServer` (`{ name, transport, ref, headers, credentialRef }`)
+ * onto the `@agentclientprotocol/sdk` wire shape expected by
  * `session/new.mcpServers` (and `session/load.mcpServers`).
  *
  * The ACP `McpServer` union is transport-tagged and field-named
  * differently from our compact internal form:
- *   - http → `{ type: "http", name, url, headers: [] }`
- *   - sse  → `{ type: "sse",  name, url, headers: [] }`
+ *   - http → `{ type: "http", name, url, headers: [{ name, value }, …] }`
+ *   - sse  → `{ type: "sse",  name, url, headers: [{ name, value }, …] }`
  *   - stdio → `{ name, command, args: [], env: [] }` (untagged variant)
  *
  * Without this mapping the raw `{ transport, ref }` entry reaches the
@@ -53,6 +53,16 @@ interface AcpClientOptions {
     };
     /** Optional handlers for agent-initiated requests beyond fs / terminal. */
     handlers?: Partial<Client>;
+    /**
+     * When true, every `session/request_permission` the agent raises is
+     * SURFACED (emitted as an `agent-prompt` StreamEvent on the session's
+     * stream) and HELD — the RPC does not resolve until the host calls
+     * `respondPermission(requestId, ...)`. `handlers.requestPermission` is
+     * bypassed while this is set. Undefined/false (the default) is unchanged:
+     * requests go straight to `handlers.requestPermission`. Used by the
+     * daemon's cross-session permission inbox.
+     */
+    permissionHold?: boolean;
     /** Protocol version to negotiate. Defaults to the SDK's current. */
     protocolVersion?: number;
     /**
@@ -97,6 +107,11 @@ interface AcpClient {
          * Model to select via `session/set_config_option` immediately after
          * `newSession`. The claude-agent-acp wrapper supports this as
          * `configId:"model"`. Omit to keep the agent's own default.
+         *
+         * Best-effort: a value the agent can't resolve (a stale/gated/typo'd id)
+         * is warned about and dropped — the session still starts on the agent's
+         * default model rather than crashing the spawn. See the reject handler
+         * in `newSession` for the reasoning (agentproto#186).
          */
         model?: string;
         /**
@@ -106,6 +121,15 @@ interface AcpClient {
          * Omit to keep the model's own default.
          */
         effort?: string;
+        /**
+         * Mode to select via `session/set_config_option` after `newSession`,
+         * for ACP servers that model mode selection as a session config
+         * option (`configId:"mode"`) instead of a CLI flag — e.g. opencode.
+         * Best-effort, same as `model`/`effort`: a rejection is warned about
+         * and dropped rather than failing the spawn. Omit to keep the
+         * agent's own default mode.
+         */
+        mode?: string;
     }): Promise<AcpClientSession>;
     /**
      * Reattach to an existing session by id. Available only when the
@@ -124,6 +148,15 @@ interface AcpClient {
         cwd: string;
         mcpServers?: unknown[];
     }): Promise<AcpClientSession>;
+    /**
+     * Resolve a permission request parked by permission-hold mode. `requestId`
+     * is the `toolCallId` carried on the `agent-prompt` StreamEvent that
+     * surfaced the request. Returns true when a matching parked request was
+     * found and resolved, false when the id is unknown or already resolved
+     * (idempotent — a duplicate response is a no-op). No-op returning false
+     * when `permissionHold` was never enabled.
+     */
+    respondPermission(requestId: string, resolution: AcpPermissionResolution): boolean;
     close(): Promise<void>;
 }
 interface AcpClientSession {
@@ -137,4 +170,4 @@ interface AcpClientSession {
 }
 declare function createAcpClient(options: AcpClientOptions): Promise<AcpClient>;
 
-export { type AcpClient, type AcpClientOptions, type AcpClientSession, createAcpClient, toAcpMcpServers };
+export { type AcpClient, type AcpClientOptions, type AcpClientSession, AcpPermissionResolution, createAcpClient, toAcpMcpServers };

package/dist/client/index.mjs

@@ -15,23 +15,59 @@ function toAcpMcpServer(server) {
   if ("type" in entry || "url" in entry || "command" in entry) return entry;
   const transport = entry.transport;
   if (typeof transport !== "string") return entry;
-  const { name, ref } = entry;
+  const name = entry.name;
+  const ref = entry.ref;
+  const headers = entry.headers;
   switch (transport) {
     case "http":
-      return { type: "http", name, url: ref ?? "", headers: [] };
+      return { type: "http", name, url: ref ?? "", headers: toAcpHeaders(headers) };
     case "sse":
-      return { type: "sse", name, url: ref ?? "", headers: [] };
+      return { type: "sse", name, url: ref ?? "", headers: toAcpHeaders(headers) };
     case "stdio":
       return { name, command: ref ?? "", args: [], env: [] };
     default:
       return entry;
   }
 }
+function toAcpHeaders(headers) {
+  if (!headers || typeof headers !== "object") return [];
+  return Object.entries(headers).map(([name, value]) => ({
+    name,
+    value: typeof value === "string" ? value : String(value)
+  }));
+}
 async function createAcpClient(options) {
   const sessions = /* @__PURE__ */ new Map();
+  const pendingPermissions = /* @__PURE__ */ new Map();
+  let permissionSeq = 0;
+  const respondPermission = (requestId, resolution) => {
+    const held = pendingPermissions.get(requestId);
+    if (!held) return false;
+    pendingPermissions.delete(requestId);
+    held.resolve(
+      "cancelled" in resolution ? { outcome: { outcome: "cancelled" } } : { outcome: { outcome: "selected", optionId: resolution.optionId } }
+    );
+    return true;
+  };
+  const cancelPermissionsForSession = (sessionId) => {
+    const ids = [];
+    for (const [id, held] of pendingPermissions) {
+      if (held.sessionId === sessionId) ids.push(id);
+    }
+    for (const id of ids) {
+      const held = pendingPermissions.get(id);
+      if (!held) continue;
+      pendingPermissions.delete(id);
+      held.resolve({ outcome: { outcome: "cancelled" } });
+    }
+  };
   const stream = ndJsonStream(options.output, options.input);
   const connection = new ClientSideConnection(
-    () => buildClientHandlers(options.handlers ?? {}, sessions, options.onActivity),
+    () => buildClientHandlers(options.handlers ?? {}, sessions, options.onActivity, {
+      permissionHold: options.permissionHold ?? false,
+      pendingPermissions,
+      nextRequestId: () => `perm_${++permissionSeq}`
+    }),
     stream
   );
   const initResponse = await connection.initialize({
@@ -61,12 +97,18 @@ async function createAcpClient(options) {
       };
       sessions.set(sessionId, state);
       if (params.model) {
-        await connection.setSessionConfigOption({
-          configId: "model",
-          value: params.model,
-          sessionId
-        });
-        options.onActivity?.();
+        try {
+          await connection.setSessionConfigOption({
+            configId: "model",
+            value: params.model,
+            sessionId
+          });
+          options.onActivity?.();
+        } catch (err) {
+          console.warn(
+            `[acp] set_config_option model="${params.model}" rejected by server \u2014 keeping the agent's default model. Reason: ${configOptionErrorDetail(err)}`
+          );
+        }
       }
       if (params.effort) {
         try {
@@ -78,8 +120,21 @@ async function createAcpClient(options) {
           options.onActivity?.();
         } catch (err) {
           console.warn(
-            `[acp] set_config_option effort="${params.effort}" rejected by server (best-effort):`,
-            err instanceof Error ? err.message : err
+            `[acp] set_config_option effort="${params.effort}" rejected by server (best-effort): ${configOptionErrorDetail(err)}`
+          );
+        }
+      }
+      if (params.mode) {
+        try {
+          await connection.setSessionConfigOption({
+            configId: "mode",
+            value: params.mode,
+            sessionId
+          });
+          options.onActivity?.();
+        } catch (err) {
+          console.warn(
+            `[acp] set_config_option mode="${params.mode}" rejected by server (best-effort): ${configOptionErrorDetail(err)}`
           );
         }
       }
@@ -89,7 +144,8 @@ async function createAcpClient(options) {
         state,
         sessions,
         options.onActivity,
-        options.turnIdleTimeoutMs
+        options.turnIdleTimeoutMs,
+        cancelPermissionsForSession
       );
     },
     async loadSession(params) {
@@ -112,10 +168,16 @@ async function createAcpClient(options) {
         state,
         sessions,
         options.onActivity,
-        options.turnIdleTimeoutMs
+        options.turnIdleTimeoutMs,
+        cancelPermissionsForSession
       );
     },
+    respondPermission,
     async close() {
+      for (const [, held] of pendingPermissions) {
+        held.resolve({ outcome: { outcome: "cancelled" } });
+      }
+      pendingPermissions.clear();
       sessions.clear();
     }
   };
@@ -130,7 +192,7 @@ function clientCapabilitiesFromOptions(options) {
     terminal: caps.terminal ?? false
   };
 }
-function buildSession(connection, sessionId, state, sessions, onActivity, turnIdleTimeoutMs) {
+function buildSession(connection, sessionId, state, sessions, onActivity, turnIdleTimeoutMs, cancelPermissionsForSession) {
   return {
     sessionId,
     prompt(input) {
@@ -217,6 +279,7 @@ function buildSession(connection, sessionId, state, sessions, onActivity, turnId
       onActivity?.();
     },
     async close() {
+      cancelPermissionsForSession(sessionId);
       sessions.delete(sessionId);
     }
   };
@@ -259,8 +322,47 @@ function flush(state) {
     r(void 0);
   }
 }
-function buildClientHandlers(partial, sessions, onActivity) {
+function holdPermissionRequest(rawParams, sessions, ctx) {
+  const params = rawParams ?? {};
+  const sessionId = params.sessionId ?? "";
+  const requestId = ctx.nextRequestId();
+  const options = Array.isArray(params.options) ? params.options.filter(
+    (o) => typeof o?.optionId === "string"
+  ).map((o) => ({
+    optionId: o.optionId,
+    ...typeof o.name === "string" ? { name: o.name } : {},
+    ...typeof o.kind === "string" ? { kind: o.kind } : {}
+  })) : [];
+  const toolName = params.toolCall?.title ?? params.toolCall?.kind;
+  const text = toolName ? `Allow "${toolName}"?` : "The agent is requesting permission to run a tool.";
+  const state = sessions.get(sessionId);
+  if (state) {
+    enqueue(state, {
+      kind: "agent-prompt",
+      sessionId,
+      toolCallId: requestId,
+      options,
+      text,
+      ...toolName ? { toolName } : {}
+    });
+  } else {
+    console.warn(
+      `[acp] permission-hold: no session state for sessionId="${sessionId}" (request ${requestId}) \u2014 parking the RPC but not surfacing an agent-prompt event.`
+    );
+  }
+  return new Promise((resolve) => {
+    ctx.pendingPermissions.set(requestId, { sessionId, resolve });
+  });
+}
+function buildClientHandlers(partial, sessions, onActivity, hold) {
   return {
+    // Spread the caller-supplied handlers FIRST so the named methods defined
+    // below always win. This matters for `requestPermission`: the arm always
+    // passes a `requestPermission` handler, and if that spread came last it
+    // would clobber the permission-hold guard below — silently bypassing hold
+    // mode. With the spread first, our guard stays in control and still falls
+    // through to `partial.requestPermission` when hold mode is OFF.
+    ...partial,
     async sessionUpdate(params) {
       onActivity?.();
       const sid = params.sessionId;
@@ -275,6 +377,10 @@ function buildClientHandlers(partial, sessions, onActivity) {
       if (partial.sessionUpdate) await partial.sessionUpdate(params);
     },
     async requestPermission(params) {
+      onActivity?.();
+      if (hold.permissionHold) {
+        return holdPermissionRequest(params, sessions, hold);
+      }
       if (partial.requestPermission) return partial.requestPermission(params);
       throw new Error("AcpClient.requestPermission: no handler configured");
     },
@@ -285,8 +391,41 @@ function buildClientHandlers(partial, sessions, onActivity) {
     async writeTextFile(params) {
       if (partial.writeTextFile) return partial.writeTextFile(params);
       throw new Error("AcpClient.writeTextFile: capability not advertised");
-    },
-    ...partial
+    }
+  };
+}
+function isEmptyish(value) {
+  if (value == null) return true;
+  if (Array.isArray(value)) return value.length === 0;
+  if (typeof value === "object") return Object.keys(value).length === 0;
+  return false;
+}
+function toolCallArguments(update) {
+  const rawInput = update.rawInput;
+  if (!isEmptyish(rawInput)) return rawInput;
+  const locations = update.locations;
+  if (locations && locations.length > 0) {
+    const first = locations[0];
+    return locations.length === 1 ? { path: first.path, ...first.line != null ? { line: first.line } : {} } : { paths: locations.map((location) => location.path) };
+  }
+  if (!isEmptyish(update.content)) return update.content;
+  return rawInput != null ? rawInput : void 0;
+}
+function toolCallEnrichment(sessionId, update) {
+  const toolCallId = update.toolCallId;
+  if (!toolCallId) return null;
+  const args = toolCallArguments(update);
+  const title = typeof update.title === "string" ? update.title : void 0;
+  if (args === void 0 && title === void 0) return null;
+  return {
+    kind: "tool-call",
+    sessionId,
+    toolCallId,
+    // "" when the update carried no title — consumers merge only non-empty
+    // names, so an untitled enrichment can't erase the announced one.
+    toolName: title ?? "",
+    arguments: args,
+    isUpdate: true
   };
 }
 function translateSessionUpdate(sessionId, update) {
@@ -306,20 +445,12 @@ function translateSessionUpdate(sessionId, update) {
     case "tool_call": {
       const toolCallId = update.toolCallId ?? "";
       const toolName = update.title ?? update.kind ?? "tool";
-      const locations = update.locations;
-      let args = update.rawInput ?? update.content ?? {};
-      if (update.rawInput == null && locations && locations.length > 0) {
-        args = locations.length === 1 ? {
-          path: locations[0].path,
-          ...locations[0].line != null ? { line: locations[0].line } : {}
-        } : { paths: locations.map((location) => location.path) };
-      }
       return {
         kind: "tool-call",
         sessionId,
         toolCallId,
         toolName,
-        arguments: args
+        arguments: toolCallArguments(update) ?? {}
       };
     }
     case "tool_call_update": {
@@ -333,7 +464,7 @@ function translateSessionUpdate(sessionId, update) {
           isError: status === "failed"
         };
       }
-      return null;
+      return toolCallEnrichment(sessionId, update);
     }
     case "plan": {
       const entries = update.entries ?? [];
@@ -349,12 +480,23 @@ function translateSessionUpdate(sessionId, update) {
     }
     case "usage_update": {
       const cost = update.cost;
+      const numeric = (...keys) => {
+        for (const key of keys) {
+          const v = update[key];
+          if (typeof v === "number") return v;
+        }
+        return void 0;
+      };
+      const tokensIn = numeric("tokensIn", "input_tokens", "inputTokens");
+      const tokensOut = numeric("tokensOut", "output_tokens", "outputTokens");
       return {
         kind: "usage_update",
         sessionId,
         size: update.size ?? 0,
         used: update.used ?? 0,
-        ...cost ? { cost } : {}
+        ...cost ? { cost } : {},
+        ...tokensIn !== void 0 ? { tokensIn } : {},
+        ...tokensOut !== void 0 ? { tokensOut } : {}
       };
     }
     case "user_message_chunk":
@@ -363,6 +505,20 @@ function translateSessionUpdate(sessionId, update) {
       return null;
   }
 }
+function configOptionErrorDetail(err) {
+  if (typeof err === "object" && err !== null) {
+    if ("data" in err && typeof err.data === "object" && err.data !== null) {
+      const data = err.data;
+      if ("details" in data && typeof data.details === "string" && data.details.length > 0) {
+        return data.details;
+      }
+    }
+    if ("message" in err && typeof err.message === "string" && err.message.length > 0) {
+      return err.message;
+    }
+  }
+  return String(err);
+}
 function extractText(content) {
   if (!content) return "";
   if (typeof content === "string") return content;