@khalilgharbaoui/opencode-claude-code-plugin 0.64.0 → 0.64.1

package/README.md

@@ -18,8 +18,6 @@
 [![License](https://img.shields.io/github/license/khalilgharbaoui/opencode-claude-code-plugin?style=flat-square&label=license&labelColor=15181E&color=FFC46B)](./LICENSE)
 [![Buy me a coffee](https://img.shields.io/badge/support-buy%20me%20a%20coffee-FFC46B?style=flat-square&labelColor=15181E&logo=buymeacoffee&logoColor=FFC46B)](https://www.buymeacoffee.com/khalilgharbaoui)
 
-<a href="https://www.buymeacoffee.com/khalilgharbaoui"><img src="site/public/buy-me-a-coffee.png" alt="Buy me a coffee" width="214" height="60"></a>
-
 **Claude Code is the provider.** This opencode plugin runs Anthropic's Claude models through the official **Claude Code CLI** (`claude`) as a subprocess instead of calling the HTTP API. opencode inherits whatever that CLI is logged in as (a Claude subscription, an API key, Bedrock or Vertex), gets Claude's own tools, MCP servers and skills, and keeps running the tools that touch your machine itself, behind its own permission prompts. One package serves opencode 1.x and 2.x.
 
 - **Your CLI's login, untouched.** The plugin never reads, stores or replays a token. Lifting the OAuth session out of the official client is what proxy-style plugins do, and Anthropic disallowed that for third-party Claude use in February 2026. This plugin structurally cannot do it.
@@ -46,9 +44,13 @@
    }
    ```
 
-   `~/.config/opencode/opencode.json` on opencode 1.x. opencode 2 reads the same key; its native spelling is `plugins`.
+   `~/.config/opencode/opencode.json`, on opencode 1.x and 2.x alike. opencode 2's native key is `plugins`, and `opencode plugin add @khalilgharbaoui/opencode-claude-code-plugin` writes that entry and installs the package for you.
+
+3. **Quit opencode fully and relaunch.** Plugins load once, at process start. The model picker now has a **Claude Code** provider (opencode 1.x labels it with its id, `claude-code`) with entries such as `Claude Sonnet 5.5 (2×)` and `Claude Opus 5 (5×)`; the suffix is each model's list price relative to Haiku. A model's full id is `claude-code/<model>`, so one line checks it from a terminal:
 
-3. **Quit opencode fully and relaunch.** Plugins load once, at process start. The model picker now has a **Claude Code (Default)** provider with entries such as `Claude Sonnet 5.5 (2×)` and `Claude Opus 5 (5×)`; the suffix is each model's list price relative to Haiku.
+   ```bash
+   opencode run -m claude-code/claude-haiku-5-5 "reply with ok"
+   ```
 
 Nothing in the picker? [Troubleshooting](./docs/troubleshooting/symptoms.md) is keyed on the first thing you see. `/claude-code-doctor` in any session prints what the plugin thinks is happening, without calling a model.
 
@@ -70,12 +72,14 @@ Nothing in the picker? [Troubleshooting](./docs/troubleshooting/symptoms.md) is
 | | opencode's native `anthropic` provider | This plugin | Proxy and token-reuse plugins |
 |---|---|---|---|
 | **Authentication** | A Platform API key in opencode's auth store. | Whatever the official `claude` CLI holds. No token is read, stored or replayed. | The Claude OAuth session, used outside the official client. |
-| **Terms-of-service status** | The ordinary API route. | Sanctioned: the official client does the authenticating. | Disallowed. Anthropic disallowed reusing subscription authentication for third-party Claude use in February 2026, and each of those projects carries its own disclaimer. |
+| **Terms-of-service status** | The ordinary API route. | Uses the official client: Claude Code does the authenticating, the same as running `claude -p` yourself. Anthropic's [legal page](https://code.claude.com/docs/en/legal-and-compliance) allows signing in to the unmodified binary; it has not approved or endorsed this plugin. | Disallowed. Anthropic disallowed reusing subscription authentication for third-party Claude use in February 2026, and each of those projects carries its own disclaimer. |
 | **Who runs Bash, Edit, Write** | opencode. | opencode, by default; `Read`, `Grep`, `Glob` run in Claude Code. | opencode. |
 | **What it costs you** | Baseline. | A `claude` child per conversation under a cap of 16; Claude Code may compact its own context behind opencode's back. | One more moving part, plus the account risk above. |
 
 The [full comparison](./docs/comparison.md) has nine rows, names the projects in the third column, and quotes their own READMEs.
 
+On opencode 2.2.3 or later with one Claude login, also look at opencode's own **Claude Agent** provider: it drives your own `claude` too, runs every tool in opencode, and leaves your `~/.claude` setup out. The comparison has [a section on it](./docs/comparison.md#opencodes-built-in-claude-agent-provider), including what this plugin still adds (opencode 1.x, several accounts, your Claude Code setup, fast mode, `/btw`, the sidebar).
+
 ## Built from measurements
 
 A dozen test files drive a fake `claude` through real turns: the stream parser, the proxy broker, both watchdogs, abort, respawn, account failover and the model fallback chain are exercised end to end. Every rule in [`AGENTS.md`](./AGENTS.md) names the probe, the version and the number that produced it, and the evidence lives in [`docs/agents-history.md`](./docs/agents-history.md). Two runtime dependencies. The [site](https://opencode-claude-code-plugin.dev/) reports the live numbers: it rebuilds itself after every release, on every push that moves a figure, and every six hours.

package/dist/index.js

@@ -4059,6 +4059,15 @@ function forkSiblingSignature(sessionKey2) {
   blanked[3] = "*";
   return blanked.join("::");
 }
+function withoutSpawnSettings(segment) {
+  if (!segment.startsWith("context=")) return segment;
+  try {
+    const context = JSON.parse(segment.slice("context=".length));
+    if (Array.isArray(context)) return `context=${JSON.stringify(context.slice(0, 2))}`;
+  } catch {
+  }
+  return segment;
+}
 function modelSiblingSignature(sessionKey2, accountProviders) {
   const parts = sessionKey2.split("::");
   if (parts.length < 5) return null;
@@ -4067,6 +4076,7 @@ function modelSiblingSignature(sessionKey2, accountProviders) {
   if (withoutEffort.length < 5) return null;
   const blanked = [...withoutEffort];
   blanked[1] = "*";
+  blanked[blanked.length - 1] = withoutSpawnSettings(blanked[blanked.length - 1]);
   const signature = blanked.join("::");
   return accountProviders && accountProviders.size > 0 ? blankAccountProvider(signature, accountProviders) : signature;
 }
@@ -8460,9 +8470,9 @@ async function releaseIdleForHandover(sessionID) {
   }
   return released;
 }
-function transferClaudeSession(fromKey, toKey) {
+function transferClaudeSession(fromKey, toKey, recorded) {
   if (fromKey === toKey) return void 0;
-  const claudeSessionId = claudeSessions.get(fromKey);
+  const claudeSessionId = claudeSessions.get(fromKey) ?? recorded;
   if (!claudeSessionId) return void 0;
   if (claudeSessions.has(toKey)) return void 0;
   claudeSessions.delete(fromKey);
@@ -8485,14 +8495,7 @@ function effortSessionKey(baseKey, effort) {
 function spawnIdentity(key) {
   const parts = key.split("::");
   if (parts.length > 1 && parts[parts.length - 1].startsWith("effort=")) parts.pop();
-  const last = parts.length - 1;
-  if (parts[last].startsWith("context=")) {
-    try {
-      const context = JSON.parse(parts[last].slice("context=".length));
-      if (Array.isArray(context)) parts[last] = `context=${JSON.stringify(context.slice(0, 2))}`;
-    } catch {
-    }
-  }
+  parts[parts.length - 1] = withoutSpawnSettings(parts[parts.length - 1]);
   return parts.join("::");
 }
 function spawnHasPendingWork(key) {
@@ -8548,7 +8551,8 @@ function invalidateOtherSpawnVariants(currentKey, options = {}) {
       clearBackgroundTasks(key);
       continue;
     }
-    deleteClaudeSessionId(key);
+    if (carry && !claudeSessions.has(key)) forgetClaudeSessionInMemory(key);
+    else deleteClaudeSessionId(key);
     clearCompression(key);
     clearBackgroundTasks(key);
   }
@@ -19109,7 +19113,7 @@ var ClaudeCodeLanguageModel = class {
             });
           } else {
             deleteActiveProcess(sibling.siblingKey);
-            const carried = transferClaudeSession(sibling.siblingKey, sk);
+            const carried = transferClaudeSession(sibling.siblingKey, sk, sibling.claudeSessionId);
             if (carried) {
               if (carriedSessionId && carriedSessionId !== carried) {
                 setClaudeSessionId(sk, carriedSessionId);