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

package/dist/index.js

@@ -8442,7 +8442,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 +8471,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 +8481,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;
@@ -9333,6 +9352,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",
@@ -18392,7 +18412,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 +18630,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, {