@khalilgharbaoui/opencode-claude-code-plugin 0.61.0 → 0.61.2

package/dist/index.js

@@ -3808,23 +3808,36 @@ import { createHash } from "crypto";
 var fingerprints = /* @__PURE__ */ new Map();
 var fingerprintSeq = 0;
 var MAX_FORK_FINGERPRINTS = 64;
-var DIGEST_VERSION = 2;
+var DIGEST_VERSION = 3;
 var DCP_MESSAGE_ID_TAG = /<dcp-message-id(?:\s[^>]*)?>[^<]*<\/dcp-message-id>/g;
 var DCP_COMPACT_REF_LINE = /^@(?:\d+|b\d+|blocked)@(?: \[[^\]\n]*\])?$/;
-function withoutDcpRefs(text) {
-  let out = text.includes("<dcp-message-id") ? text.replace(DCP_MESSAGE_ID_TAG, "") : text;
+var DCP_SYSTEM_REMINDER_BLOCK = /<dcp-system-reminder>[\s\S]*?<\/dcp-system-reminder>/g;
+function withoutDcpRefs(text, version) {
+  let out = text;
+  let removed = false;
+  if (version >= 3 && out.includes("<dcp-system-reminder")) {
+    out = out.replace(DCP_SYSTEM_REMINDER_BLOCK, "");
+    removed = true;
+  }
+  if (out.includes("<dcp-message-id")) {
+    out = out.replace(DCP_MESSAGE_ID_TAG, "");
+    removed = true;
+  }
   for (; ; ) {
     const trimmed = out.trimEnd();
-    if (!trimmed.endsWith("@") && !trimmed.endsWith("]")) return out;
+    if (!trimmed.endsWith("@") && !trimmed.endsWith("]")) break;
     const lineStart = trimmed.lastIndexOf("\n") + 1;
-    if (!DCP_COMPACT_REF_LINE.test(trimmed.slice(lineStart))) return out;
+    if (!DCP_COMPACT_REF_LINE.test(trimmed.slice(lineStart))) break;
     out = trimmed.slice(0, lineStart);
+    removed = true;
   }
+  if (version < 3 || !removed) return out;
+  return out.replace(/\n{3,}/g, "\n\n").trim();
 }
 function hashPart(hash, part, version) {
   const p = part;
   const type = typeof p?.type === "string" ? p.type : "unknown";
-  const content = (text) => version >= 2 ? withoutDcpRefs(text) : text;
+  const content = (text) => version >= 2 ? withoutDcpRefs(text, version) : text;
   switch (type) {
     case "text":
       hash.update("text\0");
@@ -3840,7 +3853,9 @@ function hashPart(hash, part, version) {
       hash.update("result\0");
       hash.update(String(p?.toolName ?? ""));
       hash.update("\0");
-      hash.update(stableJson(p?.output, version >= 2 ? withoutDcpRefs : void 0));
+      hash.update(
+        stableJson(p?.output, version >= 2 ? (text) => withoutDcpRefs(text, version) : void 0)
+      );
       break;
     case "file":
     case "image": {
@@ -3888,7 +3903,7 @@ function messageDigest(msg, version) {
   hash.update("\0");
   if (typeof msg.content === "string") {
     hash.update("text\0");
-    hash.update(version >= 2 ? withoutDcpRefs(msg.content) : msg.content);
+    hash.update(version >= 2 ? withoutDcpRefs(msg.content, version) : msg.content);
     hash.update("");
   } else if (Array.isArray(msg.content)) {
     for (const part of msg.content) hashPart(hash, part, version);
@@ -7429,6 +7444,7 @@ function findForeignAccountSibling(opts) {
     if (modelSiblingSignature(key, providers) !== signature) return void 0;
     const account = sessionKeyAccount(key, providers);
     if (account === void 0 || account === ownAccount) return void 0;
+    if (opts.only && !opts.only(account)) return void 0;
     return { siblingKey: key, account };
   };
   for (const key of opts.extraKeys ?? []) {
@@ -9130,6 +9146,7 @@ var PLUGIN_LOG_MESSAGES = /* @__PURE__ */ new Set([
   "no configured account could take this turn; it ends here",
   "no proxyTools entry was recognised; nothing will be proxied this turn",
   "no stdout after envelope write; respawning claude process to resume conversation",
+  "not replaying what this claude session missed: the conversation continued on an account in another group",
   "opencode 2 event subscription ended; deleted sessions keep their claude process until idle eviction, and stopped turns keep their proxy calls until the next message",
   "opencode's stored OAuth token for this MCP server has expired, so the bridged server carries no credential; re-authenticate it in opencode",
   "pending proxy call arrived after stream close; rejecting",
@@ -9267,6 +9284,7 @@ var BUNDLE_DATA_ALLOWLIST = {
   historyLength: "count",
   matchedMessages: "count",
   messages: "count",
+  userMessages: "count",
   inputTokens: "count",
   lastTextLength: "count",
   lines: "count",
@@ -12453,7 +12471,7 @@ function collectSkills(root, claimed, found) {
     if (!skill) continue;
     const winner = claimed.get(skill.name);
     if (winner) {
-      if (!sameSkill(winner, skill)) {
+      if (!sameSkill(winner, skill) && firstSkillWarning(`dup:${skill.name}:${winner.dir}:${skill.dir}`)) {
         log.warn("two different skills share a name; bridging the one the nearest root claimed", {
           name: skill.name,
           bridged: winner.dir,
@@ -12466,6 +12484,12 @@ function collectSkills(root, claimed, found) {
     found.push(skill);
   }
 }
+var warnedSkillClashes = /* @__PURE__ */ new Set();
+function firstSkillWarning(key) {
+  if (warnedSkillClashes.has(key)) return false;
+  warnedSkillClashes.add(key);
+  return true;
+}
 var byName = (a, b) => a.name.localeCompare(b.name);
 function discoverOpencodeSkills(cwd) {
   const found = [];
@@ -12566,7 +12590,7 @@ function dropNativelyLoadedSkills(skills, native) {
     }
     const reason = sameCopy ? "same-copy" : sameContent ? "same-content" : "name-taken";
     skipped.push({ skill, native: nameTaken, reason });
-    if (reason === "name-taken") {
+    if (reason === "name-taken" && firstSkillWarning(`taken:${skill.name}:${nameTaken.dir}:${skill.dir}`)) {
       log.warn("claude already registers a different skill under this name; not bridging ours", {
         name: skill.name,
         claudeLoads: nameTaken.dir,
@@ -15204,7 +15228,8 @@ function resolvedProxyMcpTools(config, allEnabledServerNames, modelTools, taken,
     if (route === "withhold") withheld.push(server2);
     else if (route === "bridge") bridged.push(server2);
   }
-  if (codeMode && resolution.defs.length === 0) {
+  if (codeMode && resolution.defs.length === 0 && !codeModeProxyWarned) {
+    codeModeProxyWarned = true;
     log.warn(
       "proxyOpencodeMcpTools cannot route V2 Code Mode's MCP tools, which reach the model through execute; for Code Mode, explicitly allowlist execute in proxyOpencodeTools and use bridgeOpencodeMcp: false with strictMcpConfig: true",
       { servers: allEnabledServerNames }
@@ -15383,6 +15408,7 @@ function warnCliCapsOnInteractive(caps) {
     "agent maxTurns / maxBudgetUsd not applied: the interactive transport cannot pass print-only flags"
   );
 }
+var codeModeProxyWarned = false;
 
 // src/mcp-hot-reload.ts
 var DEFAULT_MCP_HOT_RELOAD_COOLDOWN_MS = 6e4;
@@ -18445,30 +18471,45 @@ var ClaudeCodeLanguageModel = class {
         carried: conversationOnTarget
       });
     }
-    let accountGroupNote = null;
-    if (!compactionMode && groups && accountProviders.size > 0 && includeHistoryContext && failoverAnswer?.kind !== "switch") {
-      const foreign = findForeignAccountSibling({
+    let crossGroupAccountRead = false;
+    let crossGroupAccountValue;
+    const crossGroupAccount = () => {
+      if (crossGroupAccountRead) return crossGroupAccountValue;
+      crossGroupAccountRead = true;
+      if (compactionMode || !groups || accountProviders.size === 0) return void 0;
+      if (failoverAnswer?.kind === "switch") return void 0;
+      crossGroupAccountValue = findForeignAccountSibling({
         sessionKey: sk,
         accountProviders,
         // The live process's own view, so the guard holds with
         // `resumeAfterRestart: false`, where the store is never written.
-        extraKeys: listClaudeSessionKeys()
+        extraKeys: listClaudeSessionKeys(),
+        only: (account) => !accountsShareGroup(sourceAccount, account, groups)
+      })?.account;
+      return crossGroupAccountValue;
+    };
+    const accountGroupNoteFor = (from) => formatAccountGroupNote({
+      sourceAccount: from,
+      sourceGroup: accountGroup(from, groups),
+      targetAccount: sourceAccount,
+      targetGroup: accountGroup(sourceAccount, groups)
+    });
+    const logAnotherAccountGroup = (from) => {
+      log.notice("starting fresh on this account: it is in another account group", {
+        sessionKey: sk,
+        reason: "another-account-group",
+        account: sourceAccount,
+        from,
+        group: accountGroup(sourceAccount, groups)
       });
-      if (foreign && !accountsShareGroup(sourceAccount, foreign.account, groups)) {
+    };
+    let accountGroupNote = null;
+    if (includeHistoryContext) {
+      const from = crossGroupAccount();
+      if (from) {
         includeHistoryContext = false;
-        accountGroupNote = formatAccountGroupNote({
-          sourceAccount: foreign.account,
-          sourceGroup: accountGroup(foreign.account, groups),
-          targetAccount: sourceAccount,
-          targetGroup: accountGroup(sourceAccount, groups)
-        });
-        log.notice("starting fresh on this account: it is in another account group", {
-          sessionKey: sk,
-          reason: "another-account-group",
-          account: sourceAccount,
-          from: foreign.account,
-          group: accountGroup(sourceAccount, groups)
-        });
+        accountGroupNote = accountGroupNoteFor(from);
+        logAnotherAccountGroup(from);
       }
     }
     let forkFromClaudeSessionId;
@@ -18618,28 +18659,52 @@ var ClaudeCodeLanguageModel = class {
       });
     }
     const conversationChange = !compactionMode && !includeHistoryContext && failoverAnswer?.kind !== "switch" && !accountGroupNote && (!!getClaudeSessionId(sk) || !!getActiveProcess(sk)) ? classifyConversationChange(sk, filterSideQuestionHistory(options.prompt)) : null;
-    const missed = conversationChange?.kind === "missed" ? conversationChange : null;
-    if (missed) {
-      log.notice("replaying the messages this claude session missed: the conversation continued under another session key", {
-        sessionKey: sk,
-        messages: missed.messages.length,
-        userMessages: missed.userMessages
-      });
+    let missed = null;
+    if (conversationChange?.kind === "missed") {
+      const from = crossGroupAccount();
+      if (from) {
+        log.notice(
+          "not replaying what this claude session missed: the conversation continued on an account in another group",
+          {
+            sessionKey: sk,
+            reason: "another-account-group",
+            account: sourceAccount,
+            from,
+            group: accountGroup(sourceAccount, groups),
+            messages: conversationChange.messages.length,
+            userMessages: conversationChange.userMessages
+          }
+        );
+      } else {
+        missed = conversationChange;
+        log.notice("replaying the messages this claude session missed: the conversation continued under another session key", {
+          sessionKey: sk,
+          messages: missed.messages.length,
+          userMessages: missed.userMessages
+        });
+      }
     }
     let rewoundNote = null;
     if (conversationChange?.kind === "rewound") {
       await deleteActiveProcessAndWait(sk);
       deleteClaudeSessionId(sk);
-      includeHistoryContext = true;
-      replayReason = "history-rewound";
-      log.notice("replaying the conversation as text: the thread was edited or undone", {
-        sessionKey: sk,
-        reason: "history-rewound",
-        sharedMessages: conversationChange.sharedMessages,
-        removedMessages: conversationChange.removedMessages,
-        removedUserMessages: conversationChange.removedUserMessages
-      });
-      if (mode !== "generate") rewoundNote = formatConversationRewoundNote();
+      const from = crossGroupAccount();
+      if (from) {
+        includeHistoryContext = false;
+        accountGroupNote = accountGroupNote ?? accountGroupNoteFor(from);
+        logAnotherAccountGroup(from);
+      } else {
+        includeHistoryContext = true;
+        replayReason = "history-rewound";
+        log.notice("replaying the conversation as text: the thread was edited or undone", {
+          sessionKey: sk,
+          reason: "history-rewound",
+          sharedMessages: conversationChange.sharedMessages,
+          removedMessages: conversationChange.removedMessages,
+          removedUserMessages: conversationChange.removedUserMessages
+        });
+        if (mode !== "generate") rewoundNote = formatConversationRewoundNote();
+      }
     }
     if (this.config.forkSessions === true && !compactionMode) {
       recordForkFingerprint(sk, options.prompt, cliPath);