opencode-anthropic-fix 2.1.1 → 2.2.1

package/lib/mimicry/response-stream.mjs

@@ -143,30 +143,32 @@ export function stripMcpPrefixFromSSE(text) {
  * Built from the outgoing OC_TO_CC_TOOL_NAMES map (defined in transformRequestBody).
  * Must stay in sync with that map.
  */
-export const CC_TO_OC_TOOL_NAMES = {
-  Bash: "bash",
-  Read: "read",
-  Glob: "glob",
-  Grep: "grep",
-  Edit: "edit",
-  Write: "write",
-  WebFetch: "webfetch",
-  TodoWrite: "todowrite",
-  Skill: "skill",
-  Task: "task",
-  Compress: "compress",
-};
+export const CC_TO_OC_TOOL_NAMES = new Map(
+  Object.entries({
+    Bash: "bash",
+    Read: "read",
+    Glob: "glob",
+    Grep: "grep",
+    Edit: "edit",
+    Write: "write",
+    WebFetch: "webfetch",
+    TodoWrite: "todowrite",
+    Skill: "skill",
+    Task: "task",
+    Compress: "compress",
+  }),
+);
 
 /**
  * Reverse-map a tool name from CC PascalCase back to opencode lowercase,
  * and strip `mcp_` prefix if present. Returns the original name if no mapping exists.
  * @param {string} name
+ * @param {Map<string, string>} [toolNameMap] - Per-request restoration of host tool names.
  * @returns {string}
  */
-export function reverseMapToolName(name) {
-  if (CC_TO_OC_TOOL_NAMES[name]) return CC_TO_OC_TOOL_NAMES[name];
-  if (name.startsWith("mcp_")) return name.slice(4);
-  return name;
+export function reverseMapToolName(name, toolNameMap) {
+  const mapped = CC_TO_OC_TOOL_NAMES.get(name) ?? (name.startsWith("mcp_") ? name.slice(4) : name);
+  return toolNameMap?.get(mapped) ?? mapped;
 }
 
 /**
@@ -175,9 +177,10 @@ export function reverseMapToolName(name) {
  * Returns true if any modification was made.
  *
  * @param {any} parsed
+ * @param {Map<string, string>} [toolNameMap]
  * @returns {boolean}
  */
-export function stripMcpPrefixFromParsedEvent(parsed) {
+export function stripMcpPrefixFromParsedEvent(parsed, toolNameMap) {
   if (!parsed || typeof parsed !== "object") return false;
 
   let modified = false;
@@ -188,7 +191,7 @@ export function stripMcpPrefixFromParsedEvent(parsed) {
     (parsed.content_block.type === "tool_use" || parsed.content_block.type === "tool_reference") &&
     typeof parsed.content_block.name === "string"
   ) {
-    const mapped = reverseMapToolName(parsed.content_block.name);
+    const mapped = reverseMapToolName(parsed.content_block.name, toolNameMap);
     if (mapped !== parsed.content_block.name) {
       parsed.content_block.name = mapped;
       modified = true;
@@ -199,7 +202,7 @@ export function stripMcpPrefixFromParsedEvent(parsed) {
   if (parsed.message && Array.isArray(parsed.message.content)) {
     for (const block of parsed.message.content) {
       if ((block.type === "tool_use" || block.type === "tool_reference") && typeof block.name === "string") {
-        const mapped = reverseMapToolName(block.name);
+        const mapped = reverseMapToolName(block.name, toolNameMap);
         if (mapped !== block.name) {
           block.name = mapped;
           modified = true;
@@ -212,7 +215,7 @@ export function stripMcpPrefixFromParsedEvent(parsed) {
   if (Array.isArray(parsed.content)) {
     for (const block of parsed.content) {
       if ((block.type === "tool_use" || block.type === "tool_reference") && typeof block.name === "string") {
-        const mapped = reverseMapToolName(block.name);
+        const mapped = reverseMapToolName(block.name, toolNameMap);
         if (mapped !== block.name) {
           block.name = mapped;
           modified = true;
@@ -803,6 +806,7 @@ function createPassthroughStream(reader, idleTimeoutMs) {
  *
  * @param {Response} response
  * @param {object} options
+ * @param {Map<string, string>} [options.toolNameMap] - Host aliases specific to this request.
  * @param {((stats: UsageStats) => void) | null} [options.onUsage]
  * @param {((details: {reason: import('../backoff.mjs').RateLimitReason, invalidateToken: boolean}) => void) | null} [options.onAccountError]
  * @param {((stats: {blockTypeFallbacks: number, deltasDropped: number, eventsDropped: number, dryRun?: boolean}) => void) | null} [options.onHostCompatShim]
@@ -839,6 +843,7 @@ export function createTransformedSSEStream(
     onAccountError,
     onHostCompatShim,
     hostCompatShim = true,
+    toolNameMap,
     correlationId,
     idleTimeoutMs,
     captureEnabled,
@@ -939,7 +944,7 @@ export function createTransformedSSEStream(
     }
     if (shimAction === "drop") return [];
 
-    const mcpModified = stripMcpPrefixFromParsedEvent(parsed);
+    const mcpModified = stripMcpPrefixFromParsedEvent(parsed, toolNameMap);
     if (shimAction === "rewrite" || mcpModified) {
       // Re-serialize only the `data:` line(s) this event actually changed;
       // every other line in the block (event:, id:, comments) is untouched.

package/lib/oauth.mjs

@@ -179,9 +179,21 @@ function buildTokenHeaders() {
  * @param {number} ms
  * @returns {Promise<void>}
  */
-function sleep(ms) {
+function sleep(ms, signal) {
+  signal?.throwIfAborted();
   if (ms <= 0) return Promise.resolve();
-  return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise((resolve, reject) => {
+    const abort = () => {
+      clearTimeout(timer);
+      signal.removeEventListener("abort", abort);
+      reject(signal.reason);
+    };
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", abort);
+      resolve();
+    }, ms);
+    signal?.addEventListener("abort", abort, { once: true });
+  });
 }
 
 /**
@@ -442,7 +454,7 @@ export function parseOAuthCallback(input) {
  * Exchange an authorization code for tokens.
  * @param {string} code
  * @param {string} verifier
- * @param {{ sdkTokenUserAgent?: boolean }} [options] - `sdkTokenUserAgent` is
+ * @param {{ sdkTokenUserAgent?: boolean, signal?: AbortSignal }} [options] - `sdkTokenUserAgent` is
  *   accepted and ignored. It is retained so existing call sites keep type-
  *   checking; there is only one token fingerprint. See §7 divergence D2.
  * @returns {Promise<
@@ -458,7 +470,7 @@ export function parseOAuthCallback(input) {
  *     }
  * >}
  */
-export async function exchange(code, verifier, _options = {}) {
+export async function exchange(code, verifier, options = {}) {
   const tokenHeaders = buildTokenHeaders();
   const fail = (status, rawText = "", cooldownHint = { retryAfterMs: null }) => {
     const { errorCode, reason } = parseOAuthErrorBody(rawText);
@@ -486,6 +498,7 @@ export async function exchange(code, verifier, _options = {}) {
   const { code: authCode, state: authState } = parseOAuthCallback(code);
   let result;
   for (let attempt = 0; attempt <= OAUTH_MAX_RETRIES; attempt++) {
+    options.signal?.throwIfAborted();
     try {
       // SHAPE IS INPUT-DEPENDENT (D8). `state` is present only when the pasted
       // callback carried one, so this body is five keys for a bare code and six
@@ -504,11 +517,16 @@ export async function exchange(code, verifier, _options = {}) {
         method: "POST",
         headers: tokenHeaders,
         body: JSON.stringify(exchangeBody),
-        signal: AbortSignal.timeout(15_000),
+        // Match the runtime's AbortSignal.any baseline; a caller signal must
+        // not replace the independent per-attempt network deadline.
+        signal: options.signal
+          ? AbortSignal.any([options.signal, AbortSignal.timeout(15_000)])
+          : AbortSignal.timeout(15_000),
       });
     } catch (err) {
+      options.signal?.throwIfAborted();
       if (attempt < OAUTH_MAX_RETRIES) {
-        await sleep(Math.min(500 * 2 ** attempt, 2000));
+        await sleep(Math.min(500 * 2 ** attempt, 2000), options.signal);
         continue;
       }
       return fail(undefined, err instanceof Error ? err.message : String(err));
@@ -524,7 +542,7 @@ export async function exchange(code, verifier, _options = {}) {
           : "";
 
       if (attempt < OAUTH_MAX_RETRIES && isRetryableTokenStatus(result.status)) {
-        await sleep(getRetryDelayMs(result, attempt));
+        await sleep(getRetryDelayMs(result, attempt), options.signal);
         continue;
       }
 
@@ -638,6 +656,7 @@ export async function refreshToken(refreshTokenValue, options = {}) {
   const tokenHeaders = buildTokenHeaders();
 
   for (let attempt = 0; attempt <= OAUTH_MAX_RETRIES; attempt++) {
+    options.signal?.throwIfAborted();
     let resp;
     // A single AbortSignal.timeout() created outside the loop starts counting at
     // creation, so a slow first attempt would leave the retries with no budget
@@ -658,8 +677,9 @@ export async function refreshToken(refreshTokenValue, options = {}) {
         signal,
       });
     } catch (err) {
+      options.signal?.throwIfAborted();
       if (attempt < OAUTH_MAX_RETRIES) {
-        await sleep(Math.min(500 * 2 ** attempt, 2000));
+        await sleep(Math.min(500 * 2 ** attempt, 2000), options.signal);
         continue;
       }
       throw err;
@@ -670,7 +690,7 @@ export async function refreshToken(refreshTokenValue, options = {}) {
       const retryAfterMs = getRetryDelayMs(resp, attempt);
 
       if (attempt < OAUTH_MAX_RETRIES && isRetryableTokenStatus(resp.status)) {
-        await sleep(retryAfterMs);
+        await sleep(retryAfterMs, options.signal);
         continue;
       }
 

package/lib/refresh-lock.mjs

@@ -11,8 +11,20 @@ const DEFAULT_STALE_LOCK_MS = 20_000;
  * @param {number} ms
  * @returns {Promise<void>}
  */
-function delay(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+function delay(ms, signal) {
+  signal?.throwIfAborted();
+  return new Promise((resolve, reject) => {
+    const abort = () => {
+      clearTimeout(timer);
+      signal.removeEventListener("abort", abort);
+      reject(signal.reason);
+    };
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", abort);
+      resolve();
+    }, ms);
+    signal?.addEventListener("abort", abort, { once: true });
+  });
 }
 
 /**
@@ -27,10 +39,11 @@ function getLockPath(accountId) {
 /**
  * Try to acquire a per-account cross-process lock.
  * @param {string} accountId
- * @param {{ timeoutMs?: number, backoffMs?: number, staleMs?: number }} [options]
+ * @param {{ timeoutMs?: number, backoffMs?: number, staleMs?: number, signal?: AbortSignal }} [options]
  * @returns {Promise<{ acquired: boolean, lockPath: string | null, owner: string | null, lockInode: number | null }>}
  */
 export async function acquireRefreshLock(accountId, options = {}) {
+  options.signal?.throwIfAborted();
   const timeoutMs = options.timeoutMs ?? DEFAULT_LOCK_TIMEOUT_MS;
   const backoffMs = options.backoffMs ?? DEFAULT_LOCK_BACKOFF_MS;
   const staleMs = options.staleMs ?? DEFAULT_STALE_LOCK_MS;
@@ -42,6 +55,7 @@ export async function acquireRefreshLock(accountId, options = {}) {
   await fs.mkdir(lockDir, { recursive: true });
 
   while (Date.now() <= deadline) {
+    options.signal?.throwIfAborted();
     try {
       const handle = await fs.open(lockPath, "wx", 0o600);
       try {
@@ -79,7 +93,7 @@ export async function acquireRefreshLock(accountId, options = {}) {
       const remaining = deadline - Date.now();
       if (remaining <= 0) break;
       const jitter = Math.floor(Math.random() * 25);
-      await delay(Math.min(remaining, backoffMs + jitter));
+      await delay(Math.min(remaining, backoffMs + jitter), options.signal);
     }
   }
 

package/lib/session-metrics.mjs

@@ -2,12 +2,9 @@
 // Session-level cache & cost tracking (Phase 4)
 // ---------------------------------------------------------------------------
 //
-// Extracted from index.mjs (W3·P3.3). `sessionMetrics` is a process-lifetime
-// singleton shared BY REFERENCE across the plugin and the extracted lib
-// modules: importers mutate `sessionMetrics.<field>` in place and it is never
-// reassigned, so a plain `import { sessionMetrics }` observes the same live
-// object everywhere. The test reset helper mutates in place (delete keys +
-// Object.assign) precisely to preserve this shared identity.
+// Each host runtime creates and injects its own metrics object. The exported
+// singleton remains the default for legacy standalone helper consumers; running
+// plugin instances never share it.
 
 /**
  * Factory for the initial sessionMetrics shape. Returns a fresh object each
@@ -68,8 +65,8 @@ export const sessionMetrics = createInitialSessionMetrics();
  * Get rolling average cache hit rate over last 5 turns.
  * @returns {number} 0-1
  */
-export function getAverageCacheHitRate() {
-  const rates = sessionMetrics.recentCacheRates;
+export function getAverageCacheHitRate(metrics = sessionMetrics) {
+  const rates = metrics.recentCacheRates;
   if (rates.length === 0) return 0;
   return rates.reduce((a, b) => a + b, 0) / rates.length;
 }

package/lib/unicode-text.mjs

@@ -60,10 +60,10 @@
  * Performance: `text` is segmented at most once. If `text.length <=
  * maxUnits`, segmentation is skipped entirely (fast path) — no reason to pay
  * for it when no truncation can possibly be needed. When truncation IS
- * needed, the segments are walked forward exactly once, accumulating length
- * until the next segment would exceed the budget; this is O(n) in the length
- * of `text`, never quadratic, and always terminates because the walk is a
- * single forward pass over a finite iterator.
+ * needed, containing() locates the cluster at the cut directly, without
+ * allocating a segment record for every preceding grapheme. ICU may inspect
+ * surrounding text to determine boundaries; no JS prefix walk or repeated
+ * concatenation is needed, even for large inputs on Node 20.
  *
  * @param {string} text
  * @param {number} maxUnits - budget in UTF-16 code units (`.length`).
@@ -99,13 +99,9 @@ export function truncateGraphemes(text, maxUnits, options) {
   }
 
   const segmenter = new Intl.Segmenter(undefined, { granularity: "grapheme" });
-  let prefix = "";
-  let used = 0;
-  for (const { segment } of segmenter.segment(input)) {
-    const segmentLength = segment.length;
-    if (used + segmentLength > budgetForPrefix) break;
-    prefix += segment;
-    used += segmentLength;
-  }
-  return prefix + suffix;
+  // The input is longer than the limit, so this index is always in bounds.
+  // At a boundary containing() returns the next cluster; inside a cluster it
+  // returns that cluster's start. Both are exactly the longest valid prefix.
+  const { index } = segmenter.segment(input).containing(Math.floor(budgetForPrefix));
+  return input.slice(0, index) + suffix;
 }

package/licenses/Apache-2.0.txt

@@ -0,0 +1,201 @@
+                                 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-anthropic-fix",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "license": "GPL-3.0-or-later",
   "repository": {
     "type": "git",
@@ -11,12 +11,30 @@
     "url": "https://github.com/marco-jardim/opencode-anthropic-fix/issues"
   },
   "main": "./index.mjs",
+  "exports": {
+    ".": "./index.mjs",
+    "./server": "./server.mjs",
+    "./tui": "./tui.mjs",
+    "./rpc": "./lib/host/command-rpc.mjs",
+    "./index.mjs": "./index.mjs",
+    "./cli.mjs": "./cli.mjs",
+    "./lib/*": "./lib/*",
+    "./README.md": "./README.md",
+    "./LICENSE": "./LICENSE",
+    "./package.json": "./package.json"
+  },
   "files": [
     "index.mjs",
+    "server.mjs",
+    "tui.mjs",
     "cli.mjs",
     "lib/**/*.mjs",
     "!lib/**/*.test.mjs",
     "README.md",
+    "docs/opencode-v2.md",
+    "docs/opencode-v2-architecture.md",
+    "licenses/",
+    "NOTICE",
     "LICENSE"
   ],
   "scripts": {
@@ -48,6 +66,7 @@
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@opencode-ai/plugin": "^1.2.27",
+    "@opencode/plugin": "2.0.21",
     "@vitest/coverage-v8": "^4.0.18",
     "esbuild": "^0.27.3",
     "eslint": "^10.0.0",
@@ -57,6 +76,7 @@
     "vitest": "^4.0.18"
   },
   "dependencies": {
+    "@ai-sdk/anthropic": "3.0.111",
     "@tormentalabs/claude-code-wire-compat": "latest"
   }
 }

package/server.mjs

@@ -0,0 +1,15 @@
+/**
+ * The modern hosts resolve ./server. Older v1 releases still load index.mjs.
+ * Keep each implementation lazy so neither host initializes the other runtime.
+ */
+export default {
+  id: "opencode-anthropic-fix",
+  async server(context) {
+    const { AnthropicAuthPlugin } = await import("./index.mjs");
+    return AnthropicAuthPlugin(context);
+  },
+  async setup(context) {
+    const { setupV2 } = await import("./lib/host/v2.mjs");
+    return setupV2(context);
+  },
+};