@khalilgharbaoui/opencode-claude-code-plugin 0.60.2 → 0.61.1

package/dist/index.d.ts

@@ -473,6 +473,8 @@ interface ClaudeCodeConfig {
     bridgeSkipNativeSkills?: boolean;
     /** Append a one-line cost / duration / cache footer to each finished turn. */
     turnStats?: boolean;
+    /** Turn Claude Code's todo tools on for every model (`CLAUDE_CODE_ENABLE_TODO_TOOLS=1`). */
+    enableTodoTools?: boolean;
     /** Branch a forked opencode session off the parent's Claude conversation. */
     forkSessions?: boolean;
     /** Resume a conversation's Claude session after opencode restarts. Default true. */
@@ -992,6 +994,19 @@ interface ClaudeCodeProviderSettings {
      * `permission_denials` always reach `providerMetadata`.
      */
     turnStats?: boolean;
+    /**
+     * Start every `claude` with `CLAUDE_CODE_ENABLE_TODO_TOOLS=1`, so the CLI
+     * offers its todo tools (`TaskCreate` and family) whatever the model.
+     * Claude Code offers them on its own only to Claude 3.x, Opus 4.0 to 4.7,
+     * Sonnet 4.0 to 4.6 and Haiku 4.5; on Opus 4.8, the 5.x models and Fable
+     * no todo list reaches opencode without this (h #g259).
+     *
+     * Off by default, because the CLI turned the tools off for those models on
+     * purpose. Fills a gap only: a `CLAUDE_CODE_ENABLE_TODO_TOOLS` already in
+     * opencode's environment, `0` included, is passed through and decides.
+     * Never on a compaction spawn, which runs no tools.
+     */
+    enableTodoTools?: boolean;
     /**
      * When a new opencode session turns out to be a fork of one this provider
      * already served, branch the parent's Claude conversation with

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 ?? []) {
@@ -7872,6 +7888,7 @@ function claudeSpawnEnv(opts) {
   if (opts?.configDir) {
     env.CLAUDE_CONFIG_DIR = opts.configDir;
   }
+  Object.assign(env, todoToolsEnv(opts?.enableTodoTools === true));
   if (opts?.ignoreAnthropicApiKey) {
     delete env.ANTHROPIC_API_KEY;
     delete env.ANTHROPIC_AUTH_TOKEN;
@@ -7881,6 +7898,10 @@ function claudeSpawnEnv(opts) {
   }
   return env;
 }
+function todoToolsEnv(enabled) {
+  if (!enabled || process.env.CLAUDE_CODE_ENABLE_TODO_TOOLS !== void 0) return {};
+  return { CLAUDE_CODE_ENABLE_TODO_TOOLS: "1" };
+}
 function touch(key) {
   const existing = activeProcesses.get(key);
   if (existing) {
@@ -8252,7 +8273,7 @@ function invalidateOtherEffortSessions(baseKey, effort) {
     clearBackgroundTasks(key);
   }
 }
-function spawnClaudeProcess(cliPath, cliArgs, cwd, sessionKey2, proxyServer, mcpHash, systemPromptFile, ignoreAnthropicApiKey, effort, promptCacheTtl, configDir) {
+function spawnClaudeProcess(cliPath, cliArgs, cwd, sessionKey2, proxyServer, mcpHash, systemPromptFile, ignoreAnthropicApiKey, effort, promptCacheTtl, configDir, enableTodoTools) {
   evictIfNeeded();
   log.info("spawning new claude process", {
     cliPath,
@@ -8261,13 +8282,14 @@ function spawnClaudeProcess(cliPath, cliArgs, cwd, sessionKey2, proxyServer, mcp
     sessionKey: sessionKey2,
     effort,
     promptCacheTtl,
-    configDir
+    configDir,
+    ...enableTodoTools ? { enableTodoTools } : {}
   });
   const plan = planClaudeSpawn(cliPath, cliArgs);
   const proc = spawn(plan.file, plan.args, {
     cwd,
     stdio: ["pipe", "pipe", "pipe"],
-    env: claudeSpawnEnv({ ignoreAnthropicApiKey, effort, promptCacheTtl, configDir }),
+    env: claudeSpawnEnv({ ignoreAnthropicApiKey, effort, promptCacheTtl, configDir, enableTodoTools }),
     windowsVerbatimArguments: plan.windowsVerbatimArguments
   });
   const lineEmitter = new EventEmitter3();
@@ -8279,6 +8301,7 @@ function spawnClaudeProcess(cliPath, cliArgs, cwd, sessionKey2, proxyServer, mcp
     systemPromptFile,
     effort,
     promptCacheTtl,
+    enableTodoTools,
     startedAt: Date.now(),
     cliPath,
     cliArgs: [...cliArgs],
@@ -8410,7 +8433,8 @@ function respawnActiveProcess(sessionKey2, cliPath, cliArgs, cwd, ignoreAnthropi
     ignoreAnthropicApiKey,
     old.effort,
     old.promptCacheTtl,
-    old.configDir
+    old.configDir,
+    old.enableTodoTools
   );
   replacement.mcpServers = old.mcpServers;
   replacement.pendingProxyCompletions = old.pendingProxyCompletions;
@@ -9122,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",
@@ -9259,6 +9284,7 @@ var BUNDLE_DATA_ALLOWLIST = {
   historyLength: "count",
   matchedMessages: "count",
   messages: "count",
+  userMessages: "count",
   inputTokens: "count",
   lastTextLength: "count",
   lines: "count",
@@ -11111,6 +11137,11 @@ function formatDoctorReport(report) {
     `| subagentDispatch | ${report.subagentDispatch}${report.subagentDispatch === "ask" && report.subagentDispatchCrossGroup ? " (cross-group accounts allowed)" : ""} |`
   );
   lines.push(`| turnStats | ${report.turnStats} |`);
+  if (report.todoTools) {
+    lines.push(
+      `| enableTodoTools | ${report.todoTools.option}${report.todoTools.envSet ? " (CLAUDE_CODE_ENABLE_TODO_TOOLS is set in opencode's environment and decides)" : ""} |`
+    );
+  }
   lines.push(`| ANTHROPIC_API_KEY in env | ${report.anthropicApiKeyInEnv ? "yes" : "no"} |`);
   const overriding = report.permissionPresets.filter((row) => row.overrides.length > 0);
   if (overriding.length > 0) {
@@ -11542,6 +11573,10 @@ async function gatherDoctorReport(options) {
     subagentDispatch: base.subagentDispatch,
     subagentDispatchCrossGroup: base.subagentDispatchCrossGroup,
     turnStats: options.turnStats,
+    todoTools: {
+      option: options.enableTodoTools === true,
+      envSet: process.env.CLAUDE_CODE_ENABLE_TODO_TOOLS !== void 0
+    },
     anthropicApiKeyInEnv: base.anthropicApiKeyInEnv,
     processes,
     pendingCalls: snapshotPendingProxyCalls(),
@@ -18019,6 +18054,7 @@ var ClaudeCodeLanguageModel = class {
         cliPath,
         interactive: !!useInteractive,
         turnStats: this.config.turnStats === true,
+        enableTodoTools: this.config.enableTodoTools === true,
         ignoreAnthropicApiKey: this.config.ignoreAnthropicApiKey === true,
         // Where the plugin applies the account itself rather than through a
         // wrapper (`accountInProcess`, Windows), the `/cost` spawn needs the
@@ -18427,30 +18463,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;
@@ -18600,28 +18651,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);
@@ -19219,7 +19294,8 @@ var ClaudeCodeLanguageModel = class {
                   claudeSpawnEnv({
                     ignoreAnthropicApiKey: self.config.ignoreAnthropicApiKey,
                     effort: reasoningEffort,
-                    promptCacheTtl
+                    promptCacheTtl,
+                    enableTodoTools: self.config.enableTodoTools === true
                   })
                 )
               });
@@ -19337,7 +19413,9 @@ var ClaudeCodeLanguageModel = class {
                 self.config.ignoreAnthropicApiKey,
                 reasoningEffort,
                 promptCacheTtl,
-                spawnConfigDir
+                spawnConfigDir,
+                // A compaction spawn runs no tools, so it never asks for them.
+                self.config.enableTodoTools === true && !compactionMode
               );
               ap.mcpServers = spawnMcpServers;
               state.proc = ap.proc;
@@ -21070,6 +21148,7 @@ function createClaudeCode(settings = {}) {
       bridgeOpencodeSkills: settings.bridgeOpencodeSkills === true,
       bridgeSkipNativeSkills: settings.bridgeSkipNativeSkills !== false,
       turnStats: settings.turnStats === true,
+      enableTodoTools: settings.enableTodoTools === true,
       forkSessions: settings.forkSessions === true,
       resumeAfterRestart: settings.resumeAfterRestart !== false,
       resumeAcrossModelChanges: settings.resumeAcrossModelChanges !== false,