@khalilgharbaoui/opencode-claude-code-plugin 0.26.2 → 0.26.3

package/README.md

@@ -250,6 +250,7 @@ What a pick does, in full:
 - **The conversation is replayed, not resumed.** Claude transcripts live under each account's own `CLAUDE_CONFIG_DIR`, so `--resume` cannot cross accounts. The plugin starts a fresh Claude session on the target and replays the thread from opencode's history, then tells it to carry on. That costs input tokens on the new account, and anything the CLI held but opencode did not is gone.
 - **Per-profile MCP servers do not come along.** A server configured only in the limited account's Claude profile is simply absent on the target.
 - **`stop`, dismissing the form, or any answer that is not one of the offered accounts** ends the turn exactly the way the rate-limit error ends it today.
+- **An account that cannot serve at all gets the same form.** When Claude Code reports that an account's login expired (`authentication_failed`), or that it is on hold, unverified or has a billing problem, the plugin writes a note naming the account and what to do, and offers the switch if another account is configured. For an expired login the note gives the exact command, for example `CLAUDE_CONFIG_DIR=~/.claude-work claude auth login`. The switch lasts until opencode restarts, so restart after logging in again to move back. With a single account you get the note alone.
 
 Only two things open the form: a `rate_limit_event` the CLI marked `rejected`, and the two known account-limit error texts (`Third-party apps now draw from your extra usage…`, `You've hit your individual spend limit`). A generic 4xx, a timeout or a bad flag never does, deliberately: a transient failure must not quietly move where your usage is billed.
 

package/dist/index.d.ts

@@ -804,6 +804,12 @@ interface ClaudeStreamMessage {
         agent_id?: string;
         description?: string;
     };
+    /**
+     * On an `assistant` message the CLI synthesised to report a failure: the
+     * kind of failure (`authentication_failed`, `billing_error`, ...). Read by
+     * `accountBlockKind`; schema confirmed on Claude Code 2.1.280.
+     */
+    error?: string;
     message?: {
         role?: string;
         model?: string;

package/dist/index.js

@@ -514,6 +514,9 @@ function translateStreamForHost(stream, dialect = "v1") {
   );
 }
 
+// src/account-failover.ts
+import { homedir as homedir2 } from "os";
+
 // src/accounts.ts
 import { chmod, lstat, mkdir, readlink, symlink, writeFile } from "fs/promises";
 import path from "path";
@@ -1082,6 +1085,35 @@ var ACCOUNT_LIMIT_PATTERNS = [
   /third-party apps now draw from your extra usage/i,
   /you[’'`]?ve hit your individual spend limit/i
 ];
+var ACCOUNT_BLOCK_MARKER = "\u258C **claude account:**";
+var ACCOUNT_BLOCKS = {
+  authentication_failed: { what: "is not logged in (its login expired or was revoked)", login: true },
+  oauth_org_not_allowed: { what: "belongs to an organization that does not allow this login", login: false },
+  account_on_hold: { what: "is on hold", login: false },
+  verification_required: { what: "needs to be verified at claude.ai", login: false },
+  billing_error: { what: "has a billing problem", login: false }
+};
+function accountBlockKind(msg) {
+  if (msg.type !== "assistant" || typeof msg.error !== "string") return null;
+  return Object.prototype.hasOwnProperty.call(ACCOUNT_BLOCKS, msg.error) ? msg.error : null;
+}
+function describeAccountBlock(kind) {
+  return ACCOUNT_BLOCKS[kind].what;
+}
+function loginCommandFor(configDir, home = homedir2()) {
+  if (!configDir) return "claude auth login";
+  const shown = configDir === home || configDir.startsWith(`${home}/`) ? `~${configDir.slice(home.length)}` : configDir;
+  return `CLAUDE_CONFIG_DIR=${shown} claude auth login`;
+}
+function formatAccountBlockNote(input) {
+  const block = ACCOUNT_BLOCKS[input.kind];
+  const account = normalizeAccountName(input.account || DEFAULT_ACCOUNT);
+  const fix = block.login ? `Log in again with \`${loginCommandFor(input.configDir)}\`, then resend your message.` : "Check the account at claude.ai, then resend your message.";
+  const then = input.offeringSwitch ? " Or pick another account below." : "";
+  return `
+${ACCOUNT_BLOCK_MARKER} the Claude account "${account}" ${block.what}. ${fix}${then}
+`;
+}
 function isAccountLimitError(input) {
   if (input.rateLimit && isRateLimitRejected(input.rateLimit)) return true;
   const text = input.resultText;
@@ -1187,7 +1219,7 @@ function createAccountFailoverQuestionCall(sessionKey2, input, toolCallId = `${A
   const candidates = input.candidates.map((c) => normalizeAccountName(c));
   const resets = describeReset(input.resetsAt);
   const until = resets ?? "opencode restarts";
-  const question = [
+  const question = input.reason ? `The Claude account "${source}" ${input.reason}. Continue this task on another configured account? Leaving this unanswered waits, at no cost.` : [
     `The Claude account "${source}" is out of usage`,
     input.window ? ` in ${input.window}` : "",
     resets ? `, which resets at ${resets}` : "",
@@ -4693,7 +4725,8 @@ var PLUGIN_NOTE_MARKERS = [
   RESULT_ERROR_MARKER,
   DOCTOR_MARKER,
   STREAM_TIMEOUT_MARKER,
-  FAILOVER_MARKER
+  FAILOVER_MARKER,
+  ACCOUNT_BLOCK_MARKER
 ];
 function isPluginNote(part) {
   if (!part || part.type !== "text" || typeof part.text !== "string") return false;
@@ -6289,7 +6322,7 @@ function spawnInteractiveProcess(opts) {
 // src/claude-code-language-model.ts
 import { readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
 import { unlink as unlink3 } from "fs/promises";
-import { homedir as homedir5, tmpdir as tmpdir2 } from "os";
+import { homedir as homedir6, tmpdir as tmpdir2 } from "os";
 import { randomUUID as randomUUID5 } from "crypto";
 import { dirname as dirname5, join as join8 } from "path";
 async function isProxyCallStillServed(callId) {
@@ -6653,7 +6686,7 @@ ${options.compressionSummary.trim()}`
   for (const s of extraSystemContent) {
     if (s.trim()) parts.push(s.trim());
   }
-  const configRoot = process.env.XDG_CONFIG_HOME ?? join8(homedir5(), ".config");
+  const configRoot = process.env.XDG_CONFIG_HOME ?? join8(homedir6(), ".config");
   const globalAgents = readPromptFileIfPresent(join8(configRoot, "opencode", "AGENTS.md"));
   const workspaceAgents = nearestWorkspaceAgentsPrompt(cwd);
   const forwarded = extraSystemContent.join("\n\n");
@@ -8591,6 +8624,7 @@ ${plan}
           let resultMeta = {};
           let resultFailure;
           let accountLimitHit = null;
+          let accountBlock = null;
           const drainBuffer = [];
           let drainTimer = null;
           const DRAIN_QUIET_MS = 100;
@@ -8752,20 +8786,21 @@ ${plan}
               });
             }
             activeProcess?.pendingProxyCompletions?.clear();
-            if (accountLimitHit && failoverAskActive && msg.is_error === true) {
+            if ((accountLimitHit || accountBlock) && failoverAskActive && msg.is_error === true) {
               const call = createAccountFailoverQuestionCall(sk, {
                 sourceAccount,
                 candidates: failoverAccounts,
-                resetsAt: accountLimitHit.resetsAt,
-                window: accountLimitHit.window
+                resetsAt: accountLimitHit?.resetsAt,
+                window: accountLimitHit?.window,
+                reason: accountLimitHit || !accountBlock ? void 0 : describeAccountBlock(accountBlock)
               });
               log.warn(
-                `Claude account "${sourceAccount}" is out of usage; asking which account to continue on.`,
+                `Claude account "${sourceAccount}" ${accountLimitHit || !accountBlock ? "is out of usage" : `cannot serve (${accountBlock})`}; asking which account to continue on.`,
                 {
                   sessionKey: sk,
                   candidates: failoverAccounts,
                   toolCallId: call.toolCallId,
-                  resetsAt: accountLimitHit.resetsAt ?? null
+                  resetsAt: accountLimitHit?.resetsAt ?? null
                 }
               );
               finishWithQuestionCall(call);
@@ -8903,6 +8938,8 @@ ${plan}
                   endTextBlock();
                 }
               }
+              const block = accountBlockKind(msg);
+              if (block) accountBlock = block;
               if (msg.type === "rate_limit_event") {
                 const info = parseRateLimitEvent(msg);
                 if (info && isRateLimitRejected(info)) {
@@ -8919,58 +8956,58 @@ ${plan}
                 return;
               }
               if (msg.type === "content_block_start" && msg.content_block && msg.index !== void 0) {
-                const block = msg.content_block;
+                const block2 = msg.content_block;
                 const idx = msg.index;
-                if (block.type === "thinking") {
+                if (block2.type === "thinking") {
                   noteReasoning();
                   const reasoningId = generateId();
                   reasoningIds.set(idx, reasoningId);
                 }
-                if (block.type === "text") {
+                if (block2.type === "text") {
                   textBlockIndices.add(idx);
                   resetLastVisibleTextBlock();
-                  if (block.text) {
+                  if (block2.text) {
                     if (!currentTextId) startTextBlock();
                     controller.enqueue({
                       type: "text-delta",
                       id: currentTextId,
-                      delta: block.text
+                      delta: block2.text
                     });
-                    noteVisibleText(block.text);
+                    noteVisibleText(block2.text);
                     hasReceivedContent = true;
                   }
                 }
-                if (block.type === "tool_use" && block.id && block.name) {
+                if (block2.type === "tool_use" && block2.id && block2.name) {
                   noteToolActivity();
                   const entry = {
-                    id: block.id,
-                    name: block.name,
+                    id: block2.id,
+                    name: block2.name,
                     inputJson: "",
                     started: false
                   };
                   toolCallMap.set(idx, entry);
-                  if (block.name !== "AskUserQuestion" && block.name !== "ask_user_question" && block.name !== "ExitPlanMode" && !block.name.startsWith(PROXY_TOOL_PREFIX)) {
+                  if (block2.name !== "AskUserQuestion" && block2.name !== "ask_user_question" && block2.name !== "ExitPlanMode" && !block2.name.startsWith(PROXY_TOOL_PREFIX)) {
                     const { name: mappedName, skip, executed } = mapTool(
-                      block.name,
+                      block2.name,
                       void 0,
                       {
                         webSearch: self.config.webSearch,
                         sessionId: getClaudeSessionId(sk),
-                        toolUseId: block.id
+                        toolUseId: block2.id
                       }
                     );
                     if (!skip) {
                       entry.started = true;
                       controller.enqueue({
                         type: "tool-input-start",
-                        id: block.id,
+                        id: block2.id,
                         toolName: mappedName,
                         providerExecuted: executed
                       });
                       log.info("tool started", {
-                        name: block.name,
+                        name: block2.name,
                         mappedName,
-                        id: block.id
+                        id: block2.id
                       });
                     }
                   }
@@ -9161,8 +9198,8 @@ ${plan}
                     hadStreamThinking: hadThinkingTextFromStream
                   });
                   if (!hadThinkingTextFromStream) {
-                    for (const block of thinkingBlocks) {
-                      if (block.thinking && block.thinking.length > 0) {
+                    for (const block2 of thinkingBlocks) {
+                      if (block2.thinking && block2.thinking.length > 0) {
                         noteReasoning();
                         hadThinkingTextFromStream = true;
                         const thinkingId = generateId();
@@ -9173,7 +9210,7 @@ ${plan}
                         controller.enqueue({
                           type: "reasoning-delta",
                           id: thinkingId,
-                          delta: block.thinking
+                          delta: block2.thinking
                         });
                         controller.enqueue({
                           type: "reasoning-end",
@@ -9200,20 +9237,20 @@ ${plan}
                 if (hasToolUse) {
                   clearFallbackTimer();
                 }
-                for (const block of msg.message.content) {
-                  if (block.type === "text" && block.text) {
+                for (const block2 of msg.message.content) {
+                  if (block2.type === "text" && block2.text) {
                     resetLastVisibleTextBlock();
                     const blockId = startTextBlock();
                     controller.enqueue({
                       type: "text-delta",
                       id: blockId,
-                      delta: block.text
+                      delta: block2.text
                     });
                     endTextBlock();
-                    noteVisibleText(block.text);
+                    noteVisibleText(block2.text);
                     hasReceivedContent = true;
                   }
-                  if (block.type === "thinking" && block.thinking) {
+                  if (block2.type === "thinking" && block2.thinking) {
                     noteReasoning();
                     const thinkingId = generateId();
                     controller.enqueue({
@@ -9223,17 +9260,17 @@ ${plan}
                     controller.enqueue({
                       type: "reasoning-delta",
                       id: thinkingId,
-                      delta: block.thinking
+                      delta: block2.thinking
                     });
                     controller.enqueue({
                       type: "reasoning-end",
                       id: thinkingId
                     });
                   }
-                  if (block.type === "tool_use" && block.id && block.name) {
+                  if (block2.type === "tool_use" && block2.id && block2.name) {
                     noteToolActivity();
-                    const parsedInput = block.input ?? {};
-                    if (isAskUserQuestionTool(block.name)) {
+                    const parsedInput = block2.input ?? {};
+                    if (isAskUserQuestionTool(block2.name)) {
                       const askId = startTextBlock();
                       controller.enqueue({
                         type: "text-delta",
@@ -9241,12 +9278,12 @@ ${plan}
                         delta: formatAskUserQuestion(parsedInput)
                       });
                       endTextBlock();
-                    } else if (block.name === "ExitPlanMode") {
+                    } else if (block2.name === "ExitPlanMode") {
                       const plan = parsedInput?.plan || "";
                       if (planModeQuestionActive) {
                         const questionCall = createExitPlanModeQuestionCall(
                           sk,
-                          block.id,
+                          block2.id,
                           plan
                         );
                         const planId2 = startTextBlock();
@@ -9271,8 +9308,8 @@ ${plan}
 `
                       });
                       endTextBlock();
-                    } else if (isWebSearchTool(block.name) && isWebSearchHandledByCli(self.config.webSearch)) {
-                      toolCallsById.delete(block.id);
+                    } else if (isWebSearchTool(block2.name) && isWebSearchHandledByCli(self.config.webSearch)) {
+                      toolCallsById.delete(block2.id);
                       const query = typeof parsedInput?.query === "string" ? parsedInput.query : JSON.stringify(parsedInput);
                       const searchId = startTextBlock();
                       controller.enqueue({
@@ -9283,11 +9320,11 @@ ${plan}
 `
                       });
                       endTextBlock();
-                    } else if (block.name.startsWith(PROXY_TOOL_PREFIX)) {
+                    } else if (block2.name.startsWith(PROXY_TOOL_PREFIX)) {
                       noteProxyActivity();
                       log.debug("ignoring proxy tool_use from assistant message", {
-                        name: block.name,
-                        id: block.id
+                        name: block2.name,
+                        id: block2.id
                       });
                     } else {
                       const {
@@ -9295,61 +9332,61 @@ ${plan}
                         input: mappedInput,
                         executed,
                         skip
-                      } = mapTool(block.name, parsedInput, {
+                      } = mapTool(block2.name, parsedInput, {
                         webSearch: self.config.webSearch,
                         sessionId: getClaudeSessionId(sk),
-                        toolUseId: block.id
+                        toolUseId: block2.id
                       });
                       if (!skip) {
-                        toolCallsById.set(block.id, {
-                          id: block.id,
-                          name: block.name,
+                        toolCallsById.set(block2.id, {
+                          id: block2.id,
+                          name: block2.name,
                           input: parsedInput
                         });
-                        if (!executed) skipResultForIds.add(block.id);
+                        if (!executed) skipResultForIds.add(block2.id);
                         controller.enqueue({
                           type: "tool-input-start",
-                          id: block.id,
+                          id: block2.id,
                           toolName: mappedName,
                           providerExecuted: executed
                         });
                         controller.enqueue({
                           type: "tool-call",
-                          toolCallId: block.id,
+                          toolCallId: block2.id,
                           toolName: mappedName,
                           input: JSON.stringify(mappedInput),
                           providerExecuted: executed
                         });
                       }
                       log.info("tool_use from assistant message", {
-                        name: block.name,
+                        name: block2.name,
                         mappedName,
-                        id: block.id,
+                        id: block2.id,
                         executed
                       });
                     }
                   }
-                  if (block.type === "tool_result") {
+                  if (block2.type === "tool_result") {
                     log.debug("tool_result", {
-                      toolUseId: block.tool_use_id
+                      toolUseId: block2.tool_use_id
                     });
                   }
                 }
               }
               if (msg.type === "user" && msg.message?.content) {
-                for (const block of msg.message.content) {
-                  if (block.type === "tool_result" && block.tool_use_id) {
-                    if (skipResultForIds.has(block.tool_use_id)) {
+                for (const block2 of msg.message.content) {
+                  if (block2.type === "tool_result" && block2.tool_use_id) {
+                    if (skipResultForIds.has(block2.tool_use_id)) {
                       log.debug("skipping tool-result (opencode runs it)", {
-                        toolUseId: block.tool_use_id
+                        toolUseId: block2.tool_use_id
                       });
                       continue;
                     }
                     let resultText = "";
-                    if (typeof block.content === "string") {
-                      resultText = block.content;
-                    } else if (Array.isArray(block.content)) {
-                      resultText = block.content.filter(
+                    if (typeof block2.content === "string") {
+                      resultText = block2.content;
+                    } else if (Array.isArray(block2.content)) {
+                      resultText = block2.content.filter(
                         (c) => c.type === "text" && typeof c.text === "string"
                       ).map((c) => c.text).join("\n");
                     }
@@ -9357,11 +9394,11 @@ ${plan}
                     if (claudeSessionId) {
                       const list2 = applyTaskCreateToolResult(
                         claudeSessionId,
-                        block.tool_use_id,
+                        block2.tool_use_id,
                         resultText
                       );
                       if (list2) {
-                        const synthId = `todowrite_${block.tool_use_id}`;
+                        const synthId = `todowrite_${block2.tool_use_id}`;
                         controller.enqueue({
                           type: "tool-input-start",
                           id: synthId,
@@ -9385,12 +9422,12 @@ ${plan}
                         noteToolActivity();
                       }
                     }
-                    const toolCall = toolCallsById.get(block.tool_use_id);
+                    const toolCall = toolCallsById.get(block2.tool_use_id);
                     if (toolCall) {
-                      const isError = block.is_error === true;
+                      const isError = block2.is_error === true;
                       controller.enqueue({
                         type: "tool-result",
-                        toolCallId: block.tool_use_id,
+                        toolCallId: block2.tool_use_id,
                         toolName: toolCall.name,
                         result: {
                           output: resultText,
@@ -9402,11 +9439,11 @@ ${plan}
                       });
                       noteToolActivity();
                       log.info("tool result emitted", {
-                        toolUseId: block.tool_use_id,
+                        toolUseId: block2.tool_use_id,
                         name: toolCall.name,
                         isError
                       });
-                      toolCallsById.delete(block.tool_use_id);
+                      toolCallsById.delete(block2.tool_use_id);
                     }
                   }
                 }
@@ -9432,6 +9469,26 @@ ${plan}
                 })) {
                   accountLimitHit = {};
                 }
+                if (accountBlock && msg.is_error) {
+                  resultFailure ??= accountBlock;
+                  const offeringSwitch = failoverAskActive;
+                  controller.enqueue({
+                    type: "text-delta",
+                    id: startTextBlock(),
+                    delta: formatAccountBlockNote({
+                      kind: accountBlock,
+                      account: sourceAccount,
+                      configDir: self.config.configDir,
+                      offeringSwitch
+                    })
+                  });
+                  endTextBlock();
+                  log.warn(`Claude account "${sourceAccount}" cannot serve requests`, {
+                    sessionKey: sk,
+                    kind: accountBlock,
+                    offeringSwitch
+                  });
+                }
                 const failure = describeResultFailure(msg);
                 if (failure) {
                   resultFailure = msg.subtype;
@@ -9877,7 +9934,7 @@ import {
   rmSync as rmSync3,
   writeFileSync as writeFileSync5
 } from "fs";
-import { homedir as homedir6 } from "os";
+import { homedir as homedir7 } from "os";
 import { join as join9, resolve as resolve4 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var STALE_PACKAGE_NAME = "opencode-claude-code-plugin";
@@ -9887,12 +9944,12 @@ function candidateCacheRoots() {
   const xdg = process.env.XDG_CACHE_HOME;
   return [
     xdg ? join9(xdg, "opencode") : null,
-    join9(homedir6(), ".cache", "opencode"),
-    join9(homedir6(), "Library", "Caches", "opencode")
+    join9(homedir7(), ".cache", "opencode"),
+    join9(homedir7(), "Library", "Caches", "opencode")
   ].filter((p) => Boolean(p));
 }
 function userOpencodeJsonPath() {
-  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join9(homedir6(), ".config");
+  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join9(homedir7(), ".config");
   return join9(xdgConfig, "opencode", "opencode.json");
 }
 function userIntendsToUseUnscoped() {