@khalilgharbaoui/opencode-claude-code-plugin 0.63.1 → 0.63.3

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/claude-code-language-model.ts
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 
 // src/ids.ts
 import { randomInt } from "crypto";
@@ -152,7 +152,7 @@ function translateStreamForHost(stream, dialect = "v1") {
 }
 
 // src/account-failover.ts
-import { homedir as homedir3 } from "os";
+import { homedir as homedir4 } from "os";
 
 // src/accounts.ts
 import {
@@ -1008,6 +1008,11 @@ function snapshotAccountUsage(now = Date.now()) {
   return refreshed(now);
 }
 
+// src/cli-events.ts
+import { readFileSync as readFileSync2, statSync as statSync3 } from "fs";
+import { homedir as homedir3 } from "os";
+import { join as join3, resolve } from "path";
+
 // src/types.ts
 var READ_ONLY_PERMISSION_MODE = "read-only";
 var DEFAULT_PROXY_TOOL_NAMES = [
@@ -1274,6 +1279,35 @@ var warnedMcpSkips = /* @__PURE__ */ new Set();
 var lastMcpServerErrors = /* @__PURE__ */ new Map();
 var warnedPluginDiagnostics = /* @__PURE__ */ new Set();
 var lastPluginLoadFailures = /* @__PURE__ */ new Map();
+var lastUnconnectedConnectors = /* @__PURE__ */ new Map();
+var CLAUDE_AI_CONNECTOR_PREFIX = "claude.ai ";
+function cliGlobalConfigPath(configDir) {
+  const dir = configDir ?? process.env.CLAUDE_CONFIG_DIR;
+  if (!dir) return join3(homedir3(), ".claude.json");
+  const expanded = dir === "~" ? homedir3() : dir.startsWith("~/") ? join3(homedir3(), dir.slice(2)) : dir;
+  return join3(resolve(expanded), ".claude.json");
+}
+var everConnectedCache = /* @__PURE__ */ new Map();
+function claudeAiConnectorsEverConnected(configDir) {
+  const file = cliGlobalConfigPath(configDir);
+  try {
+    const { mtimeMs } = statSync3(file);
+    const cached2 = everConnectedCache.get(file);
+    if (cached2 && cached2.mtimeMs === mtimeMs) return cached2.names;
+    const list2 = JSON.parse(readFileSync2(file, "utf8")).claudeAiMcpEverConnected;
+    const names = Array.isArray(list2) ? new Set(list2.filter((name) => typeof name === "string")) : void 0;
+    everConnectedCache.set(file, { mtimeMs, names });
+    return names;
+  } catch {
+    return void 0;
+  }
+}
+function isUnconnectedConnector(server2, everConnected) {
+  return everConnected !== void 0 && server2.status === "needs-auth" && server2.name.startsWith(CLAUDE_AI_CONNECTOR_PREFIX) && !everConnected.has(server2.name);
+}
+function snapshotUnconnectedConnectors() {
+  return [...lastUnconnectedConnectors].map(([name, status]) => ({ name, status }));
+}
 function snapshotMcpServerErrors() {
   return [...lastMcpServerErrors.values()];
 }
@@ -1324,16 +1358,30 @@ function reportSystemInit(msg, options = {}) {
     warnedMcpSkips.add(key2);
     log.warn(message, { server: error.name, type: error.type });
   }
-  for (const server2 of info.mcpServers) {
-    if (server2.status === "connected") continue;
+  const unusable = info.mcpServers.filter((server2) => server2.status !== "connected");
+  const everConnected = unusable.some((server2) => server2.name.startsWith(CLAUDE_AI_CONNECTOR_PREFIX)) ? claudeAiConnectorsEverConnected(options.configDir) : void 0;
+  const newlyUnusable = /* @__PURE__ */ new Map();
+  const newlyUnconnected = [];
+  for (const server2 of unusable) {
+    const unconnected = isUnconnectedConnector(server2, everConnected);
+    if (unconnected) lastUnconnectedConnectors.set(server2.name, server2.status);
     const key2 = `${server2.name}:${server2.status}`;
-    const message = `MCP server "${server2.name}" is ${server2.status} in Claude Code; its tools are not available to the model this session.`;
     if (warnedMcpFailures.has(key2)) {
-      log.debug(message, { server: server2.name, status: server2.status });
+      log.debug("MCP server still unavailable in Claude Code", { server: server2.name, status: server2.status });
       continue;
     }
     warnedMcpFailures.add(key2);
-    log.warn(message, { server: server2.name, status: server2.status });
+    if (unconnected) newlyUnconnected.push(server2.name);
+    else newlyUnusable.set(server2.status, [...newlyUnusable.get(server2.status) ?? [], server2.name]);
+  }
+  if (newlyUnconnected.length > 0) {
+    log.info("claude.ai connectors this account never connected need authentication; not warning about them", {
+      servers: newlyUnconnected
+    });
+  }
+  for (const [status, names] of newlyUnusable) {
+    const message = names.length === 1 ? `MCP server "${names[0]}" is ${status} in Claude Code; its tools are not available to the model this session.` : `${names.length} MCP servers are ${status} in Claude Code; their tools are not available to the model this session: ${names.join(", ")}.`;
+    log.warn(message, names.length === 1 ? { server: names[0], status } : { servers: names, status });
   }
   const apiKeyMessage = apiKeySourceWarning(info.apiKeySource, options.ignoreAnthropicApiKey);
   if (!apiKeyMessage) return;
@@ -1846,7 +1894,7 @@ function accountBlockKind(msg) {
 function describeAccountBlock(kind) {
   return ACCOUNT_BLOCKS[kind].what;
 }
-function loginCommandFor(configDir, home = homedir3()) {
+function loginCommandFor(configDir, home = homedir4()) {
   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`;
@@ -2228,7 +2276,7 @@ function failoverUntil(resetsAt) {
 }
 
 // src/subagent-dispatch.ts
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 // src/agent-models.ts
 import { readFile, readdir } from "fs/promises";
@@ -2882,9 +2930,9 @@ function agentDirectories(home, projectDirectory) {
 }
 
 // src/dispatch-choice-store.ts
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync2, renameSync as renameSync3, writeFileSync as writeFileSync2 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join3 } from "path";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync3, renameSync as renameSync3, writeFileSync as writeFileSync2 } from "fs";
+import { homedir as homedir5 } from "os";
+import { join as join4 } from "path";
 var MAX_DISPATCH_CHOICE_SESSIONS = 128;
 var MAX_DISPATCH_CHOICES_PER_SESSION = 32;
 var DISPATCH_CHOICE_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1e3;
@@ -2892,8 +2940,8 @@ var sessions = null;
 var pathOverride2 = null;
 function dispatchChoiceStorePath() {
   if (pathOverride2) return pathOverride2;
-  const stateRoot = process.env.XDG_STATE_HOME || join3(homedir4(), ".local", "state");
-  return join3(stateRoot, "opencode-claude-code-plugin", "subagent-dispatch.json");
+  const stateRoot = process.env.XDG_STATE_HOME || join4(homedir5(), ".local", "state");
+  return join4(stateRoot, "opencode-claude-code-plugin", "subagent-dispatch.json");
 }
 function isChoice(value) {
   const choice = value;
@@ -2919,7 +2967,7 @@ function trimChoices(choices) {
 function readFile2(file) {
   const out = /* @__PURE__ */ new Map();
   try {
-    const parsed = JSON.parse(readFileSync2(file, "utf8"));
+    const parsed = JSON.parse(readFileSync3(file, "utf8"));
     const entries = parsed && typeof parsed === "object" ? parsed.sessions : null;
     if (!entries || typeof entries !== "object") return out;
     const cutoff = Date.now() - DISPATCH_CHOICE_MAX_AGE_MS;
@@ -2941,7 +2989,7 @@ function save(update) {
   const kept = [...merged.entries()].filter(([, record]) => record.updatedAt >= cutoff).filter(([, record]) => Object.keys(record.choices).length > 0).sort((a, b) => a[1].updatedAt - b[1].updatedAt).slice(-MAX_DISPATCH_CHOICE_SESSIONS);
   sessions = new Map(kept);
   try {
-    mkdirSync3(join3(file, ".."), { recursive: true, mode: 448 });
+    mkdirSync3(join4(file, ".."), { recursive: true, mode: 448 });
     const tmp = `${file}.${process.pid}.tmp`;
     writeFileSync2(tmp, JSON.stringify({ version: 1, sessions: Object.fromEntries(kept) }), {
       mode: 384
@@ -5291,12 +5339,12 @@ async function createProxyMcpServer(tools = DEFAULT_PROXY_TOOLS, timeoutOverride
         });
         let timer = null;
         const result = await new Promise(
-          (resolve7, reject2) => {
+          (resolve8, reject2) => {
             const entry = {
               id: callId,
               toolName,
               input,
-              resolve: resolve7,
+              resolve: resolve8,
               reject: reject2,
               channel
             };
@@ -5385,11 +5433,11 @@ async function createProxyMcpServer(tools = DEFAULT_PROXY_TOOLS, timeoutOverride
       }
     }
   });
-  await new Promise((resolve7, reject2) => {
+  await new Promise((resolve8, reject2) => {
     server2.once("error", reject2);
     server2.listen(0, "127.0.0.1", () => {
       server2.off("error", reject2);
-      resolve7();
+      resolve8();
     });
   });
   const addr = server2.address();
@@ -5446,8 +5494,8 @@ async function createProxyMcpServer(tools = DEFAULT_PROXY_TOOLS, timeoutOverride
         entry.reject(new Error(SERVER_CLOSED_MESSAGE));
       }
       pending2.clear();
-      await new Promise((resolve7) => {
-        server2.close(() => resolve7());
+      await new Promise((resolve8) => {
+        server2.close(() => resolve8());
       });
       if (configFilePath) {
         try {
@@ -5620,10 +5668,10 @@ function resolveMcpProxyToolDefs(options) {
   return { defs, coveredServers, matchedServers };
 }
 function readBody(req) {
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     const chunks = [];
     req.on("data", (chunk) => chunks.push(chunk));
-    req.on("end", () => resolve7(Buffer.concat(chunks).toString("utf8")));
+    req.on("end", () => resolve8(Buffer.concat(chunks).toString("utf8")));
     req.on("error", reject);
   });
 }
@@ -6819,7 +6867,7 @@ async function settleSessionRunState(sessionID, options = {}) {
     if (state === "busy") return "busy";
     if (state !== "unknown") last = state;
     if (Date.now() - started2 >= windowMs) return last;
-    await new Promise((resolve7) => setTimeout(resolve7, pollMs));
+    await new Promise((resolve8) => setTimeout(resolve8, pollMs));
   }
 }
 var DEFAULT_MCP_CONNECT_WAIT_MS = 3e3;
@@ -6872,7 +6920,7 @@ async function waitForPendingMcpServers(first, budgetMs, signal) {
   for (; ; ) {
     if (Date.now() - started2 >= budgetMs) break;
     if (signal?.aborted) break;
-    await new Promise((resolve7) => setTimeout(resolve7, MCP_CONNECT_POLL_MS));
+    await new Promise((resolve8) => setTimeout(resolve8, MCP_CONNECT_POLL_MS));
     if (signal?.aborted) break;
     const next = await fetchRuntimeMcpStatus();
     if (!next) break;
@@ -7101,8 +7149,8 @@ async function countOtherRunningWithin(exclude, budgetMs) {
     worker
   );
   let timer;
-  const deadline = new Promise((resolve7) => {
-    timer = setTimeout(() => resolve7("over"), budgetMs);
+  const deadline = new Promise((resolve8) => {
+    timer = setTimeout(() => resolve8("over"), budgetMs);
     timer.unref?.();
   });
   try {
@@ -7312,17 +7360,17 @@ async function cancelBackgroundTask(input, options) {
 }
 
 // src/session-resume-store.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync5, readFileSync as readFileSync5, renameSync as renameSync4, writeFileSync as writeFileSync5 } from "fs";
-import { homedir as homedir7 } from "os";
-import { join as join9 } from "path";
+import { existsSync as existsSync2, mkdirSync as mkdirSync5, readFileSync as readFileSync6, renameSync as renameSync4, writeFileSync as writeFileSync5 } from "fs";
+import { homedir as homedir8 } from "os";
+import { join as join10 } from "path";
 var MAX_RESUME_RECORDS = 256;
 var RESUME_RECORD_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1e3;
 var records = null;
 var pathOverride3 = null;
 function resumeStorePath() {
   if (pathOverride3) return pathOverride3;
-  const stateRoot = process.env.XDG_STATE_HOME || join9(homedir7(), ".local", "state");
-  return join9(stateRoot, "opencode-claude-code-plugin", "claude-sessions.json");
+  const stateRoot = process.env.XDG_STATE_HOME || join10(homedir8(), ".local", "state");
+  return join10(stateRoot, "opencode-claude-code-plugin", "claude-sessions.json");
 }
 function isDigest(value) {
   const entry = value;
@@ -7336,7 +7384,7 @@ function load2() {
   if (records) return records;
   records = /* @__PURE__ */ new Map();
   try {
-    const parsed = JSON.parse(readFileSync5(resumeStorePath(), "utf8"));
+    const parsed = JSON.parse(readFileSync6(resumeStorePath(), "utf8"));
     const entries = parsed && typeof parsed === "object" ? parsed.sessions : null;
     if (entries && typeof entries === "object") {
       const cutoff = Date.now() - RESUME_RECORD_MAX_AGE_MS;
@@ -7351,7 +7399,7 @@ function save2(update) {
   const file = resumeStorePath();
   const merged = /* @__PURE__ */ new Map();
   try {
-    const onDisk = JSON.parse(readFileSync5(file, "utf8"))?.sessions;
+    const onDisk = JSON.parse(readFileSync6(file, "utf8"))?.sessions;
     if (onDisk && typeof onDisk === "object") {
       for (const [key, record] of Object.entries(onDisk)) {
         if (isRecord2(record)) merged.set(key, record);
@@ -7364,7 +7412,7 @@ function save2(update) {
   const kept = [...merged.entries()].filter(([, record]) => record.updatedAt >= cutoff).sort((a, b) => a[1].updatedAt - b[1].updatedAt).slice(-MAX_RESUME_RECORDS);
   records = new Map(kept);
   try {
-    mkdirSync5(join9(file, ".."), { recursive: true, mode: 448 });
+    mkdirSync5(join10(file, ".."), { recursive: true, mode: 448 });
     const tmp = `${file}.${process.pid}.tmp`;
     writeFileSync5(tmp, JSON.stringify({ version: 1, sessions: Object.fromEntries(kept) }), {
       mode: 384
@@ -7790,7 +7838,7 @@ async function requestSideQuestion(activeProcess, question, options) {
     }
   });
   pendingProcesses.add(proc);
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     const event = `side-question:${requestId}`;
     let settled = false;
     let sent = false;
@@ -7845,7 +7893,7 @@ async function requestSideQuestion(activeProcess, question, options) {
       }
       settled = true;
       cleanup();
-      resolve7({ response: result.response, synthetic: result.synthetic });
+      resolve8({ response: result.response, synthetic: result.synthetic });
     };
     const timer = setTimeout(() => {
       fail(new Error(`/btw timed out after ${timeoutMs}ms.`), true);
@@ -7891,7 +7939,7 @@ function safely(action) {
 var ownMember;
 var ownFollowers = 0;
 var ownServed = false;
-function join10() {
+function join11() {
   if (!ownMember) return;
   const state = relayState();
   if (state.members.has(ownMember)) return;
@@ -7904,11 +7952,11 @@ function leave() {
 }
 function defineOwnRelayMember(member) {
   ownMember = member;
-  if (ownServed) join10();
+  if (ownServed) join11();
 }
 function noteRelayMemberServing() {
   ownServed = true;
-  join10();
+  join11();
 }
 function relayMemberHasServed() {
   return ownServed;
@@ -7918,7 +7966,7 @@ function leaveSessionEventRelay() {
 }
 function openRelayFollower() {
   const state = relayState();
-  join10();
+  join11();
   ownFollowers += 1;
   state.followers += 1;
   if (state.followers === 1) {
@@ -8108,16 +8156,16 @@ function isTurnInFlight(ap) {
 }
 function awaitTurnIdle(ap, timeoutMs) {
   if (!ap.turnInFlight) return Promise.resolve(true);
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const wake = () => {
       clearTimeout(timer);
-      resolve7(true);
+      resolve8(true);
     };
     const timer = setTimeout(() => {
       const waiters = ap.turnIdleWaiters ?? [];
       const at = waiters.indexOf(wake);
       if (at >= 0) waiters.splice(at, 1);
-      resolve7(false);
+      resolve8(false);
     }, timeoutMs);
     (ap.turnIdleWaiters ??= []).push(wake);
   });
@@ -8281,14 +8329,14 @@ function hasProcessExited(proc) {
 }
 function waitForProcessExit(proc, timeoutMs) {
   if (hasProcessExited(proc)) return Promise.resolve(true);
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const onExit = () => {
       clearTimeout(timer);
-      resolve7(true);
+      resolve8(true);
     };
     const timer = setTimeout(() => {
       proc.off("exit", onExit);
-      resolve7(hasProcessExited(proc));
+      resolve8(hasProcessExited(proc));
     }, timeoutMs);
     proc.once("exit", onExit);
   });
@@ -8442,7 +8490,26 @@ function spawnIdentity(key) {
   }
   return parts.join("::");
 }
-function invalidateOtherSpawnVariants(baseKey, effort) {
+function spawnHasPendingWork(key) {
+  const active = activeProcesses.get(key);
+  return !!(getPendingProxyCalls(key).length || hasExitPlanModeQuestions(key) || active?.pendingProxyCompletions?.size || active && (active.lineEmitter.listenerCount("line") > 0 || isSideQuestionPending(active)));
+}
+function conversationIdentity(key) {
+  const parts = spawnIdentity(key).split("::");
+  if (parts.length !== 5 || parts[2] === "compaction" || parts[3] === "default") return void 0;
+  parts[1] = parts[1].replace(/^[^@]*/, "*");
+  return parts.join("::");
+}
+function findBusySpawnVariant(requestedKey) {
+  const identity = conversationIdentity(requestedKey);
+  if (!identity || spawnHasPendingWork(requestedKey)) return void 0;
+  for (const key of /* @__PURE__ */ new Set([...activeProcesses.keys(), ...claudeSessions.keys()])) {
+    if (key === requestedKey || conversationIdentity(key) !== identity) continue;
+    if (spawnHasPendingWork(key)) return key;
+  }
+  return void 0;
+}
+function invalidateOtherSpawnVariants(currentKey, options = {}) {
   const levels = [
     void 0,
     "minimal",
@@ -8452,7 +8519,7 @@ function invalidateOtherSpawnVariants(baseKey, effort) {
     "xhigh",
     "max"
   ];
-  const currentKey = effortSessionKey(baseKey, effort);
+  const baseKey = currentKey.replace(/::effort=[a-z]+$/, "");
   const identity = spawnIdentity(currentKey);
   const staleKeys = [
     .../* @__PURE__ */ new Set([
@@ -8462,16 +8529,16 @@ function invalidateOtherSpawnVariants(baseKey, effort) {
     ])
   ].filter((key) => key !== currentKey && spawnIdentity(key) === identity);
   for (const key of staleKeys) {
-    const active = activeProcesses.get(key);
-    if (getPendingProxyCalls(key).length || hasExitPlanModeQuestions(key) || active?.pendingProxyCompletions?.size || active && (active.lineEmitter.listenerCount("line") > 0 || isSideQuestionPending(active))) {
+    if (spawnHasPendingWork(key)) {
       throw new Error(
         "Cannot change reasoning effort, prompt cache TTL, maxTurns or maxBudgetUsd while this conversation's previous claude process has pending work. Finish that work under its original settings first."
       );
     }
   }
+  const carry = options.carryConversation !== false;
   for (const key of staleKeys) {
     deleteActiveProcess(key);
-    if (transferClaudeSession(key, currentKey)) {
+    if (carry && transferClaudeSession(key, currentKey)) {
       clearCompression(key);
       clearBackgroundTasks(key);
       continue;
@@ -8893,7 +8960,7 @@ async function waitForSessionIdle(client, sessionID, options = {}) {
     if (options.stop?.()) return true;
     if (await sessionStatus(client, sessionID) !== "busy") return true;
     if (Date.now() - started2 >= timeoutMs) return false;
-    await new Promise((resolve7) => setTimeout(resolve7, pollMs));
+    await new Promise((resolve8) => setTimeout(resolve8, pollMs));
   }
 }
 async function deliverAsideInline(client, sessionID, text, options = {}) {
@@ -8904,7 +8971,7 @@ async function deliverAsideInline(client, sessionID, text, options = {}) {
     if (emitAsideInline(sessionID, text)) return true;
     if (Date.now() - started2 >= timeoutMs) return false;
     if (await sessionStatus(client, sessionID) !== "busy") return false;
-    await new Promise((resolve7) => setTimeout(resolve7, pollMs));
+    await new Promise((resolve8) => setTimeout(resolve8, pollMs));
   }
 }
 async function waitForAsideProcess(client, sessionID, options = {}) {
@@ -8925,7 +8992,7 @@ async function waitForAsideProcess(client, sessionID, options = {}) {
       log.warn("btw: a turn is running but no claude process appeared for it", { sessionID, waitedMs });
       return void 0;
     }
-    await new Promise((resolve7) => setTimeout(resolve7, pollMs));
+    await new Promise((resolve8) => setTimeout(resolve8, pollMs));
   }
 }
 async function settleSessionBusy(client, sessionID, active, options = {}) {
@@ -8937,7 +9004,7 @@ async function settleSessionBusy(client, sessionID, active, options = {}) {
     if (status === "busy") return true;
     if (status === "unknown") return isProcessBusy(active);
     if (Date.now() - started2 >= settleMs) return false;
-    await new Promise((resolve7) => setTimeout(resolve7, pollMs));
+    await new Promise((resolve8) => setTimeout(resolve8, pollMs));
   }
 }
 function errorText(error) {
@@ -8981,10 +9048,10 @@ async function runBtwCommand(client, input, options = {}) {
   let inlineDone = false;
   let markInlineDelivered = () => {
   };
-  const inlineDelivered = new Promise((resolve7) => {
+  const inlineDelivered = new Promise((resolve8) => {
     markInlineDelivered = () => {
       inlineDone = true;
-      resolve7("inline");
+      resolve8("inline");
     };
   });
   if (isSideQuestionPending(active)) {
@@ -9234,7 +9301,7 @@ function snapshotBudgets() {
 // src/diagnostic-bundle.ts
 import { createHash as createHash4, randomBytes as randomBytes2 } from "crypto";
 import { openSync, readSync, closeSync, fstatSync, realpathSync } from "fs";
-import { homedir as homedir8 } from "os";
+import { homedir as homedir9 } from "os";
 
 // src/log-messages.ts
 var PLUGIN_LOG_MESSAGES = /* @__PURE__ */ new Set([
@@ -9333,6 +9400,7 @@ var PLUGIN_LOG_MESSAGES = /* @__PURE__ */ new Set([
   "falling back to the next model in the chain",
   "fast mode is in cooldown after a rate limit; this turn runs at standard speed and is billed at standard Opus rates, not the fast price shown in the model picker.",
   "file part without data, skipping",
+  "finishing the turn in progress under its original settings",
   "forkSessions is on but this claude CLI has no --fork-session; replaying the conversation instead",
   "forking the parent conversation's claude session instead of replaying it",
   "holding a subagent dispatch for the operator's answer",
@@ -9683,7 +9751,7 @@ function createIdHasher(salt = randomBytes2(16).toString("hex")) {
   return (raw) => createHash4("sha256").update(salt).update("\0").update(raw).digest("hex").slice(0, 8);
 }
 function createRedactionContext(options = {}) {
-  const home = options.home ?? homedir8();
+  const home = options.home ?? homedir9();
   const homes = /* @__PURE__ */ new Set();
   if (home) homes.add(home);
   if (home) {
@@ -10216,7 +10284,7 @@ function parsePlanUsage(stdout) {
 }
 function runCli(cliPath, args, timeoutMs, env) {
   const plan = planClaudeSpawn(cliPath, args);
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     execFile2(
       plan.file,
       plan.args,
@@ -10230,9 +10298,9 @@ function runCli(cliPath, args, timeoutMs, env) {
         windowsVerbatimArguments: plan.windowsVerbatimArguments
       },
       (error, stdout) => {
-        if (stdout && stdout.trim()) return resolve7(stdout);
+        if (stdout && stdout.trim()) return resolve8(stdout);
         if (error) return reject(error);
-        resolve7(stdout ?? "");
+        resolve8(stdout ?? "");
       }
     );
   });
@@ -10270,22 +10338,22 @@ async function fetchPlanUsage(cliPath, options = {}) {
 }
 
 // src/turn-history.ts
-import { mkdirSync as mkdirSync7, readFileSync as readFileSync7, renameSync as renameSync6, statSync as statSync6, writeFileSync as writeFileSync7 } from "fs";
-import { homedir as homedir11 } from "os";
-import { join as join12 } from "path";
+import { mkdirSync as mkdirSync7, readFileSync as readFileSync8, renameSync as renameSync6, statSync as statSync7, writeFileSync as writeFileSync7 } from "fs";
+import { homedir as homedir12 } from "os";
+import { join as join13 } from "path";
 
 // src/turn-progress-store.ts
-import { mkdirSync as mkdirSync6, readFileSync as readFileSync6, renameSync as renameSync5, statSync as statSync5, writeFileSync as writeFileSync6 } from "fs";
-import { homedir as homedir10 } from "os";
-import { join as join11 } from "path";
+import { mkdirSync as mkdirSync6, readFileSync as readFileSync7, renameSync as renameSync5, statSync as statSync6, writeFileSync as writeFileSync6 } from "fs";
+import { homedir as homedir11 } from "os";
+import { join as join12 } from "path";
 var MAX_TURN_PROGRESS = 64;
 var TURN_PROGRESS_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
 var TAG = /^[0-9a-f]{8}$/;
 var pathOverride4 = null;
 function turnProgressStorePath() {
   if (pathOverride4) return pathOverride4;
-  const stateRoot = process.env.XDG_STATE_HOME || join11(homedir10(), ".local", "state");
-  return join11(stateRoot, "opencode-claude-code-plugin", "turn-progress.json");
+  const stateRoot = process.env.XDG_STATE_HOME || join12(homedir11(), ".local", "state");
+  return join12(stateRoot, "opencode-claude-code-plugin", "turn-progress.json");
 }
 function isProgress(value) {
   const record = value;
@@ -10296,7 +10364,7 @@ function isProgress(value) {
 function readEntries(file, now) {
   const out = /* @__PURE__ */ new Map();
   try {
-    const parsed = JSON.parse(readFileSync6(file, "utf8"));
+    const parsed = JSON.parse(readFileSync7(file, "utf8"));
     const entries = parsed && typeof parsed === "object" ? parsed.turns : null;
     if (!entries || typeof entries !== "object") return out;
     const cutoff = now - TURN_PROGRESS_MAX_AGE_MS;
@@ -10315,7 +10383,7 @@ function recordTurnProgress(tag, progress, now = Date.now()) {
   merged.set(tag, { ...record, out: Math.round(record.out) });
   const kept = [...merged.entries()].slice(-MAX_TURN_PROGRESS);
   try {
-    mkdirSync6(join11(file, ".."), { recursive: true, mode: 448 });
+    mkdirSync6(join12(file, ".."), { recursive: true, mode: 448 });
     const tmp = `${file}.${process.pid}.tmp`;
     writeFileSync6(tmp, JSON.stringify({ version: 1, turns: Object.fromEntries(kept) }), { mode: 384 });
     renameSync5(tmp, file);
@@ -10333,8 +10401,8 @@ var SESSION_TAG = /^[0-9a-f]{8}$/;
 var pathOverride5 = null;
 function turnHistoryStorePath() {
   if (pathOverride5) return pathOverride5;
-  const stateRoot = process.env.XDG_STATE_HOME || join12(homedir11(), ".local", "state");
-  return join12(stateRoot, "opencode-claude-code-plugin", "turn-history.json");
+  const stateRoot = process.env.XDG_STATE_HOME || join13(homedir12(), ".local", "state");
+  return join13(stateRoot, "opencode-claude-code-plugin", "turn-history.json");
 }
 function turnHistoryKey(agent, model) {
   return `${agent || "main"}/${model}`;
@@ -10493,7 +10561,7 @@ function cleanSample(sample) {
 function readEntries2(file, now) {
   const out = /* @__PURE__ */ new Map();
   try {
-    const parsed = JSON.parse(readFileSync7(file, "utf8"));
+    const parsed = JSON.parse(readFileSync8(file, "utf8"));
     const entries = parsed && typeof parsed === "object" ? parsed.turns : null;
     if (!entries || typeof entries !== "object") return out;
     const cutoff = now - TURN_SAMPLE_MAX_AGE_MS;
@@ -10518,7 +10586,7 @@ function recordTurnSample(key, sample) {
   merged.set(key, samples);
   const kept = bounded2(merged);
   try {
-    mkdirSync7(join12(file, ".."), { recursive: true, mode: 448 });
+    mkdirSync7(join13(file, ".."), { recursive: true, mode: 448 });
     const tmp = `${file}.${process.pid}.tmp`;
     writeFileSync7(tmp, JSON.stringify({ version: 1, turns: Object.fromEntries(kept) }), { mode: 384 });
     renameSync6(tmp, file);
@@ -10535,7 +10603,7 @@ function createTurnHistoryReader(file = turnHistoryStorePath) {
       const path15 = file();
       let next = "";
       try {
-        const stats = statSync6(path15);
+        const stats = statSync7(path15);
         next = `${stats.mtimeMs}:${stats.size}:${stats.ino}`;
       } catch {
         next = "missing";
@@ -11575,6 +11643,21 @@ function formatDoctorReport(report) {
     lines.push("");
     lines.push("A skipped server is missing from the model's tools with no other sign of it.");
   }
+  const unconnected = report.unconnectedConnectors ?? [];
+  if (unconnected.length > 0) {
+    lines.push("");
+    lines.push("**claude.ai connectors this account never connected**");
+    lines.push("");
+    lines.push("| connector | status |");
+    lines.push("|---|---|");
+    for (const connector of unconnected) {
+      lines.push(`| ${tableCell(connector.name)} | \`${connector.status}\` |`);
+    }
+    lines.push("");
+    lines.push(
+      "They come with the claude.ai organisation, not from your config, and load no tools. Connect one at claude.ai to give the model its tools; until then the plugin does not warn about it."
+    );
+  }
   if (report.pluginLoadFailures.length > 0) {
     lines.push("");
     lines.push("**Plugins Claude Code did not load**");
@@ -11951,6 +12034,7 @@ async function gatherDoctorReport(options) {
     proxyServers,
     readRules: snapshotReadRuleMapping(),
     mcpServerErrors: snapshotMcpServerErrors(),
+    unconnectedConnectors: snapshotUnconnectedConnectors(),
     pluginLoadFailures: snapshotPluginLoadFailures(),
     hookFailures: snapshotHookFailures(),
     planUsage,
@@ -12043,6 +12127,7 @@ async function buildDoctorReport(options) {
       pendingCalls: report.pendingCalls.length,
       proxyServers: report.proxyServers.map((server2) => server2.auth.status),
       mcpServerErrors: report.mcpServerErrors.length,
+      unconnectedConnectors: report.unconnectedConnectors?.length ?? 0,
       pluginLoadFailures: report.pluginLoadFailures.length,
       hookFailures: report.hookFailures.length,
       planUsage: report.planUsage.status,
@@ -13101,7 +13186,7 @@ import { EventEmitter as EventEmitter4 } from "events";
 import { randomUUID as randomUUID5 } from "crypto";
 import { existsSync as existsSync4, writeFileSync as writeFileSync9 } from "fs";
 import { unlink as unlink2 } from "fs/promises";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 
 // src/claude-session-bun.ts
 import * as os6 from "os";
@@ -13868,7 +13953,7 @@ var ClaudeSession = class {
       throw new Error("session not started or already exited");
     if (this.turn) throw new Error("a turn is already running in this session");
     let settle;
-    this.turn = new Promise((resolve7) => settle = resolve7);
+    this.turn = new Promise((resolve8) => settle = resolve8);
     this.turnDenied = [];
     this.abandonTurn = false;
     this.transcript.skipToEnd();
@@ -14283,7 +14368,7 @@ ${text2}`
 }
 function stageImage(data, extension) {
   try {
-    const file = join17(pluginTmpDir(), `attachment-${randomUUID5()}.${extension}`);
+    const file = join18(pluginTmpDir(), `attachment-${randomUUID5()}.${extension}`);
     writeFileSync9(file, data, { mode: 384, flag: "wx" });
     return file;
   } catch (err) {
@@ -14765,17 +14850,17 @@ function spawnInteractiveProcess(opts) {
 }
 
 // src/spawn-record-store.ts
-import { mkdirSync as mkdirSync9, readFileSync as readFileSync11, renameSync as renameSync7, statSync as statSync10, writeFileSync as writeFileSync10 } from "fs";
-import { homedir as homedir14 } from "os";
-import { join as join18 } from "path";
+import { mkdirSync as mkdirSync9, readFileSync as readFileSync12, renameSync as renameSync7, statSync as statSync11, writeFileSync as writeFileSync10 } from "fs";
+import { homedir as homedir15 } from "os";
+import { join as join19 } from "path";
 var MAX_SPAWN_RECORDS = 256;
 var SPAWN_RECORD_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1e3;
 var pathOverride6 = null;
 var lastWritten = /* @__PURE__ */ new Map();
 function spawnRecordStorePath() {
   if (pathOverride6) return pathOverride6;
-  const stateRoot = process.env.XDG_STATE_HOME || join18(homedir14(), ".local", "state");
-  return join18(stateRoot, "opencode-claude-code-plugin", "session-spawns.json");
+  const stateRoot = process.env.XDG_STATE_HOME || join19(homedir15(), ".local", "state");
+  return join19(stateRoot, "opencode-claude-code-plugin", "session-spawns.json");
 }
 function isRecord5(value) {
   const record = value;
@@ -14788,7 +14873,7 @@ function isRecord5(value) {
 function readEntries3(file) {
   const out = /* @__PURE__ */ new Map();
   try {
-    const parsed = JSON.parse(readFileSync11(file, "utf8"));
+    const parsed = JSON.parse(readFileSync12(file, "utf8"));
     const entries = parsed && typeof parsed === "object" ? parsed.sessions : null;
     if (!entries || typeof entries !== "object") return out;
     const cutoff = Date.now() - SPAWN_RECORD_MAX_AGE_MS;
@@ -14827,7 +14912,7 @@ ${record.agent ?? ""}`;
   const cutoff = now - SPAWN_RECORD_MAX_AGE_MS;
   const kept = [...merged.entries()].filter(([, entry]) => entry.at >= cutoff).sort((a, b) => a[1].at - b[1].at).slice(-MAX_SPAWN_RECORDS);
   try {
-    mkdirSync9(join18(file, ".."), { recursive: true, mode: 448 });
+    mkdirSync9(join19(file, ".."), { recursive: true, mode: 448 });
     const tmp = `${file}.${process.pid}.tmp`;
     writeFileSync10(tmp, JSON.stringify({ version: 1, sessions: Object.fromEntries(kept) }), {
       mode: 384
@@ -14902,13 +14987,13 @@ function dedupe2(dirs) {
 }
 
 // src/prompts.ts
-import { readFileSync as readFileSync12, writeFileSync as writeFileSync11 } from "fs";
-import { homedir as homedir15 } from "os";
+import { readFileSync as readFileSync13, writeFileSync as writeFileSync11 } from "fs";
+import { homedir as homedir16 } from "os";
 import { randomUUID as randomUUID7 } from "crypto";
-import { basename as basename2, dirname as dirname6, isAbsolute as isAbsolute3, join as join19 } from "path";
+import { basename as basename2, dirname as dirname6, isAbsolute as isAbsolute3, join as join20 } from "path";
 function readPromptFileIfPresent(path15) {
   try {
-    const content = readFileSync12(path15, "utf8").trim();
+    const content = readFileSync13(path15, "utf8").trim();
     return content || void 0;
   } catch {
     return void 0;
@@ -14917,7 +15002,7 @@ function readPromptFileIfPresent(path15) {
 function nearestWorkspaceAgentsPrompt(cwd) {
   let dir = cwd;
   while (true) {
-    const content = readPromptFileIfPresent(join19(dir, "AGENTS.md"));
+    const content = readPromptFileIfPresent(join20(dir, "AGENTS.md"));
     if (content) return content;
     const parent = dirname6(dir);
     if (parent === dir) return void 0;
@@ -15028,7 +15113,7 @@ var CLAUDE_NATIVE_INSTRUCTION_FILES = /* @__PURE__ */ new Set(["CLAUDE.md", "CLA
 function userAuthoredInstructions(forwarded, opts = {}) {
   const readFile3 = opts.readFile ?? ((path15) => {
     try {
-      return readFileSync12(path15, "utf8");
+      return readFileSync13(path15, "utf8");
     } catch {
       return null;
     }
@@ -15069,8 +15154,8 @@ ${options.compressionSummary.trim()}`
   for (const s of extraSystemContent) {
     if (s.trim()) parts.push(s.trim());
   }
-  const configRoot = process.env.XDG_CONFIG_HOME ?? join19(homedir15(), ".config");
-  const globalAgents = readPromptFileIfPresent(join19(configRoot, "opencode", "AGENTS.md"));
+  const configRoot = process.env.XDG_CONFIG_HOME ?? join20(homedir16(), ".config");
+  const globalAgents = readPromptFileIfPresent(join20(configRoot, "opencode", "AGENTS.md"));
   const workspaceAgents = nearestWorkspaceAgentsPrompt(cwd);
   const forwarded = extraSystemContent.join("\n\n");
   const pushGlobal = !!globalAgents && !forwarded.includes(globalAgents);
@@ -15086,7 +15171,7 @@ ${options.compressionSummary.trim()}`
   if (includeMultiStepHint) parts.push(MULTI_STEP_TASK_HINT);
   const content = parts.join("\n\n");
   if (!content) return void 0;
-  const path15 = join19(pluginTmpDir(), `opencode-cc-sys-${randomUUID7()}.md`);
+  const path15 = join20(pluginTmpDir(), `opencode-cc-sys-${randomUUID7()}.md`);
   try {
     writeFileSync11(path15, content, { encoding: "utf8", mode: 384 });
     return path15;
@@ -16098,8 +16183,8 @@ function watchTurnAbort(signal) {
   let aborted = signal?.aborted === true;
   let listeners = [];
   let settle;
-  const whenAborted = new Promise((resolve7) => {
-    settle = resolve7;
+  const whenAborted = new Promise((resolve8) => {
+    settle = resolve8;
   });
   const fire = () => {
     if (aborted && listeners === null) return;
@@ -16872,7 +16957,8 @@ function createLineHandler(state, ctx) {
         }
         reportFastModeState(msg, ctx.fastMode, "init");
         reportSystemInit(msg, {
-          ignoreAnthropicApiKey: ctx.config.ignoreAnthropicApiKey
+          ignoreAnthropicApiKey: ctx.config.ignoreAnthropicApiKey,
+          configDir: ctx.accountConfigDir
         });
       }
       if (msg.type === "system" && msg.subtype === "compact_boundary") {
@@ -18392,7 +18478,15 @@ var ClaudeCodeLanguageModel = class {
       cwd,
       `${effectiveModelId}::${scope}::${affinity}::context=${JSON.stringify(context)}`
     );
-    const sk = compactionMode ? sessionKey(cwd, `${effectiveModelId}::compaction::${affinity}`) : effortSessionKey(baseKey, reasoningEffort);
+    const requestedKey = effortSessionKey(baseKey, reasoningEffort);
+    const busyVariant = compactionMode ? void 0 : findBusySpawnVariant(requestedKey);
+    if (busyVariant) {
+      log.notice("finishing the turn in progress under its original settings", {
+        sessionKey: busyVariant,
+        requestedKey
+      });
+    }
+    const sk = compactionMode ? sessionKey(cwd, `${effectiveModelId}::compaction::${affinity}`) : busyVariant ?? requestedKey;
     const toUsage2 = this.toUsage.bind(this);
     const toFinishReason2 = this.toFinishReason.bind(this);
     const handleControlRequest2 = this.handleControlRequest.bind(this);
@@ -18602,14 +18696,20 @@ var ClaudeCodeLanguageModel = class {
         });
       }
     }
-    if (!compactionMode) invalidateOtherSpawnVariants(baseKey, reasoningEffort);
-    if (!compactionMode && affinity !== "default") {
-      recordSessionSpawn(affinity, {
-        model: stripAccountSuffix(failover.modelId),
-        effort: reasoningEffort,
-        account: (this.config.failoverAccounts?.length ?? 0) > 1 ? failover.target ?? sourceAccount : void 0,
-        agent: this.getOpencodeAgent(options)
+    if (!compactionMode) {
+      invalidateOtherSpawnVariants(sk, {
+        carryConversation: this.config.resumeAcrossModelChanges !== false
       });
+    }
+    if (!compactionMode && affinity !== "default") {
+      if (!busyVariant) {
+        recordSessionSpawn(affinity, {
+          model: stripAccountSuffix(failover.modelId),
+          effort: reasoningEffort,
+          account: (this.config.failoverAccounts?.length ?? 0) > 1 ? failover.target ?? sourceAccount : void 0,
+          agent: this.getOpencodeAgent(options)
+        });
+      }
       const parked = new Set(getPendingProxyCalls(sk).map((call) => call.toolCallId));
       if (startsTurn(options.prompt, parked)) {
         markTurnStart(sk, {
@@ -18930,7 +19030,7 @@ var ClaudeCodeLanguageModel = class {
     let replayReason = "no-session-for-key";
     if (this.config.resumeAfterRestart !== false && includeHistoryContext && !compactionMode && !forkFromClaudeSessionId && failoverAnswer?.kind !== "switch") {
       const configDir = resolveConfigDir(this.config.configDir);
-      const transcriptPath2 = (id, dir) => join20(dir ?? configDir, "projects", encodeCwd(cwd), `${id}.jsonl`);
+      const transcriptPath2 = (id, dir) => join21(dir ?? configDir, "projects", encodeCwd(cwd), `${id}.jsonl`);
       const resumePoint = findResumePoint({
         sessionKey: sk,
         prompt: options.prompt,
@@ -20414,7 +20514,7 @@ var ClaudeCodeLanguageModel = class {
               return fresh.length;
             };
             if (!state.unattendedTurnEnded && await forwardTrailingUserMessages() > 0) {
-              await new Promise((resolve7) => setTimeout(resolve7, FORWARD_SETTLE_MS));
+              await new Promise((resolve8) => setTimeout(resolve8, FORWARD_SETTLE_MS));
               if (state.controllerClosed) return;
             }
             for (const { call, result: opencodeResult } of previousPendingProxyMatches) {
@@ -20518,7 +20618,7 @@ var ClaudeCodeLanguageModel = class {
 };
 
 // src/account-tier.ts
-import { readFileSync as readFileSync13 } from "fs";
+import { readFileSync as readFileSync14 } from "fs";
 import path14 from "path";
 var ORGANIZATION_TYPE_LABELS = {
   claude_max: "Max",
@@ -20561,7 +20661,7 @@ function readTierFromConfigDir(configDir, allowLegacyFallback) {
 function readOauthAccount(file) {
   let raw;
   try {
-    raw = readFileSync13(file, "utf8");
+    raw = readFileSync14(file, "utf8");
   } catch {
     return void 0;
   }
@@ -20599,13 +20699,13 @@ function registerSidebarAccounts(accounts) {
 import {
   existsSync as existsSync5,
   mkdirSync as mkdirSync10,
-  readFileSync as readFileSync14,
+  readFileSync as readFileSync15,
   realpathSync as realpathSync4,
   rmSync as rmSync3,
   writeFileSync as writeFileSync12
 } from "fs";
-import { homedir as homedir16 } from "os";
-import { dirname as dirname7, join as join21, resolve as resolve6 } from "path";
+import { homedir as homedir17 } from "os";
+import { dirname as dirname7, join as join22, resolve as resolve7 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 var STALE_PACKAGE_NAME = "opencode-claude-code-plugin";
 var SUSPECT_DESCRIPTION_TOKEN = "Claude Code";
@@ -20613,20 +20713,20 @@ var alreadyRan = false;
 function candidateCacheRoots() {
   const xdg = process.env.XDG_CACHE_HOME;
   return [
-    xdg ? join21(xdg, "opencode") : null,
-    join21(homedir16(), ".cache", "opencode"),
-    join21(homedir16(), "Library", "Caches", "opencode")
+    xdg ? join22(xdg, "opencode") : null,
+    join22(homedir17(), ".cache", "opencode"),
+    join22(homedir17(), "Library", "Caches", "opencode")
   ].filter((p) => Boolean(p));
 }
 function userOpencodeJsonPath() {
-  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join21(homedir16(), ".config");
-  return join21(xdgConfig, "opencode", "opencode.json");
+  const xdgConfig = process.env.XDG_CONFIG_HOME ?? join22(homedir17(), ".config");
+  return join22(xdgConfig, "opencode", "opencode.json");
 }
 function userIntendsToUseUnscoped() {
   const cfg = userOpencodeJsonPath();
   if (!existsSync5(cfg)) return false;
   try {
-    const json = JSON.parse(readFileSync14(cfg, "utf8"));
+    const json = JSON.parse(readFileSync15(cfg, "utf8"));
     const plugins = json.plugin;
     if (!Array.isArray(plugins)) return false;
     return plugins.some(
@@ -20639,7 +20739,7 @@ function userIntendsToUseUnscoped() {
 function ourLoadedDir() {
   try {
     const filePath = fileURLToPath4(import.meta.url);
-    return realpathSync4(resolve6(filePath, "..", ".."));
+    return realpathSync4(resolve7(filePath, "..", ".."));
   } catch {
     return null;
   }
@@ -20647,19 +20747,19 @@ function ourLoadedDir() {
 function ourVersion(dir) {
   if (!dir) return null;
   try {
-    const pkg = JSON.parse(readFileSync14(join21(dir, "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync15(join22(dir, "package.json"), "utf8"));
     return typeof pkg.version === "string" && pkg.version ? pkg.version : null;
   } catch {
     return null;
   }
 }
 function markerPath() {
-  const stateRoot = process.env.XDG_STATE_HOME ?? join21(homedir16(), ".local", "state");
-  return join21(stateRoot, "opencode-claude-code-plugin", "cleanup-stale.json");
+  const stateRoot = process.env.XDG_STATE_HOME ?? join22(homedir17(), ".local", "state");
+  return join22(stateRoot, "opencode-claude-code-plugin", "cleanup-stale.json");
 }
 function markerVersion() {
   try {
-    const marker = JSON.parse(readFileSync14(markerPath(), "utf8"));
+    const marker = JSON.parse(readFileSync15(markerPath(), "utf8"));
     return typeof marker.version === "string" ? marker.version : null;
   } catch {
     return null;
@@ -20704,7 +20804,7 @@ function cleanupStaleUnscopedInstall() {
 }
 function cleanupOne(cacheRoot, ourDir) {
   if (!existsSync5(cacheRoot)) return;
-  const stalePath = join21(cacheRoot, "node_modules", STALE_PACKAGE_NAME);
+  const stalePath = join22(cacheRoot, "node_modules", STALE_PACKAGE_NAME);
   if (!existsSync5(stalePath)) return;
   let realStalePath = stalePath;
   try {
@@ -20712,11 +20812,11 @@ function cleanupOne(cacheRoot, ourDir) {
   } catch {
   }
   if (ourDir && realStalePath === ourDir) return;
-  const pkgJsonPath = join21(stalePath, "package.json");
+  const pkgJsonPath = join22(stalePath, "package.json");
   if (!existsSync5(pkgJsonPath)) return;
   let pkg = {};
   try {
-    pkg = JSON.parse(readFileSync14(pkgJsonPath, "utf8"));
+    pkg = JSON.parse(readFileSync15(pkgJsonPath, "utf8"));
   } catch {
     return;
   }
@@ -20732,10 +20832,10 @@ function cleanupOne(cacheRoot, ourDir) {
     });
     return;
   }
-  const cachePkgJson = join21(cacheRoot, "package.json");
+  const cachePkgJson = join22(cacheRoot, "package.json");
   if (!existsSync5(cachePkgJson)) return;
   try {
-    const cfg = JSON.parse(readFileSync14(cachePkgJson, "utf8"));
+    const cfg = JSON.parse(readFileSync15(cachePkgJson, "utf8"));
     if (cfg?.dependencies?.[STALE_PACKAGE_NAME]) {
       delete cfg.dependencies[STALE_PACKAGE_NAME];
       writeFileSync12(cachePkgJson, JSON.stringify(cfg, null, 2) + "\n");