@khalilgharbaoui/opencode-claude-code-plugin 0.53.0 → 0.53.2

package/dist/index.js

@@ -2774,6 +2774,12 @@ var MAX_CLAIMS = 512;
 var claims = [];
 var sessionChoices = /* @__PURE__ */ new Map();
 var MAX_SESSION_CHOICES = 512;
+function promptMatchesClaim(claimPrompt, childPrompt) {
+  if (childPrompt === claimPrompt) return true;
+  if (claimPrompt.length === 0) return false;
+  return childPrompt.endsWith(`
+${claimPrompt}`);
+}
 function pruneClaims(now) {
   for (let i = claims.length - 1; i >= 0; i--) {
     if (now - claims[i].createdAt > CLAIM_TTL_MS) claims.splice(i, 1);
@@ -2804,7 +2810,9 @@ function lookupSessionChoice(sessionId) {
 function hasCandidateClaim(agent, prompt, now = Date.now()) {
   if (!agent || prompt === void 0) return false;
   pruneClaims(now);
-  return claims.some((claim) => claim.agent === agent && claim.prompt === prompt);
+  return claims.some(
+    (claim) => claim.agent === agent && promptMatchesClaim(claim.prompt, prompt)
+  );
 }
 function claimDispatchChoice(input) {
   const existing = sessionChoices.get(input.sessionId);
@@ -2813,9 +2821,14 @@ function claimDispatchChoice(input) {
     return void 0;
   }
   pruneClaims(input.now ?? Date.now());
-  const index = claims.findIndex(
-    (claim2) => claim2.parentSessionId === input.parentSessionId && claim2.agent === input.agent && claim2.prompt === input.prompt
-  );
+  const belongsHere = (claim2) => claim2.parentSessionId === input.parentSessionId && claim2.agent === input.agent;
+  const childPrompt = input.prompt;
+  let index = claims.findIndex((claim2) => belongsHere(claim2) && claim2.prompt === childPrompt);
+  if (index === -1) {
+    index = claims.findIndex(
+      (claim2) => belongsHere(claim2) && promptMatchesClaim(claim2.prompt, childPrompt)
+    );
+  }
   if (index === -1) return void 0;
   const [claim] = claims.splice(index, 1);
   sessionChoices.set(input.sessionId, claim.choice);
@@ -4031,7 +4044,13 @@ var TASK_INPUT_PROPERTIES = {
   },
   background: {
     type: "boolean",
-    description: 'Run the subagent in the background and return immediately with a `<task id="..." state="running">` envelope instead of its answer. You are notified automatically when it completes. Do NOT sleep, poll or proactively check on its progress.'
+    // Both majors, for the reason the `task_id` field names both: a model
+    // told to look for only V1's envelope finds nothing on opencode 2, where
+    // a background dispatch answers in prose, and then has no task_id to pass
+    // to task_status or task_cancel. This constant is shared by `task` and by
+    // every `task_batch` item and is built with no dialect in hand, so it
+    // names both rather than being rewritten per host.
+    description: 'Run the subagent in the background and return immediately instead of its answer: opencode 1.x answers with a `<task id="..." state="running">` envelope, opencode 2 with `The subagent is working in the background (sessionID: ses_...)`. You are notified automatically when it completes. Do NOT sleep, poll or proactively check on its progress.'
   }
 };
 var TASK_INPUT_PROPERTIES_NO_BACKGROUND = Object.fromEntries(
@@ -12107,6 +12126,17 @@ This opencode host runs background subagents, so \`mcp__opencode_proxy__task\` t
 - After starting one, keep working on something that does not overlap it, then end your turn normally. When the subagent finishes, opencode delivers its result into this conversation as a new message on its own. Do not sleep, poll, or ask the operator to wait.
 - The \`id\` in that envelope is the task_id. \`mcp__opencode_proxy__task_status\` reads a result back if the automatic delivery did not arrive (an interrupted or errored turn); \`mcp__opencode_proxy__task_cancel\` stops a background subagent you no longer want. Neither is a progress poll.
 - Foreground is still the default and still the right choice when you need the answer before you can continue. Use background only for work that genuinely runs alongside yours.`;
+var BACKGROUND_SUBAGENT_HINT_V2 = `## Background subagents
+
+This opencode host runs background subagents, so \`mcp__opencode_proxy__task\` takes \`background: true\`.
+
+- A background dispatch returns at once with \`The subagent is working in the background (sessionID: ses_...)\` instead of the subagent's answer. That is success, not a truncated result.
+- After starting one, keep working on something that does not overlap it, then end your turn normally. When the subagent finishes, opencode delivers its result into this conversation on its own, as a \`<subagent sessionID="..." state="completed">\` message. Do not sleep, poll, or ask the operator to wait.
+- That \`sessionID\` is the task_id. \`mcp__opencode_proxy__task_status\` reads a result back if the automatic delivery did not arrive (an interrupted or errored turn); \`mcp__opencode_proxy__task_cancel\` stops a background subagent you no longer want. Neither is a progress poll.
+- Foreground is still the default and still the right choice when you need the answer before you can continue. Use background only for work that genuinely runs alongside yours.`;
+function backgroundSubagentHint(dialect) {
+  return dialect === "v2" ? BACKGROUND_SUBAGENT_HINT_V2 : BACKGROUND_SUBAGENT_HINT;
+}
 var QUESTION_PROXY_HINT = `## Asking the operator questions
 
 Structured questions in this environment go through exactly one tool: \`mcp__opencode_proxy__question\`.
@@ -15992,6 +16022,7 @@ var ClaudeCodeLanguageModel = class {
             };
             let enrichedProxy = resolvedProxy;
             let backgroundSubagentsSupported = false;
+            const hostDialect = self.config.hostApi === "v2" ? "v2" : "v1";
             if (enrichedProxy && taskProxyEnabled) {
               enrichedProxy = overlayTaskProxyDescription(
                 enrichedProxy,
@@ -16006,7 +16037,6 @@ var ClaudeCodeLanguageModel = class {
                   )
                 )
               });
-              const hostDialect = self.config.hostApi === "v2" ? "v2" : "v1";
               backgroundSubagentsSupported = liveTaskSupportsBackground(
                 liveToolInfo.taskParameters,
                 hostDialect
@@ -16083,6 +16113,7 @@ var ClaudeCodeLanguageModel = class {
               excludeServers,
               taskProxyEnabled,
               backgroundSubagentsSupported,
+              hostDialect,
               questionProxyActive,
               opencodeToolDefs,
               pluginCompressEnabled,
@@ -16148,7 +16179,7 @@ var ClaudeCodeLanguageModel = class {
                 // dispatch instead of calling the proxy (h #g74).
                 [
                   ...wiring.taskProxyEnabled ? [SUBAGENT_DISPATCH_HINT] : [],
-                  ...wiring.backgroundSubagentsSupported ? [BACKGROUND_SUBAGENT_HINT] : [],
+                  ...wiring.backgroundSubagentsSupported ? [backgroundSubagentHint(wiring.hostDialect)] : [],
                   ...wiring.questionProxyActive ? [QUESTION_PROXY_HINT] : []
                 ],
                 {
@@ -16262,6 +16293,7 @@ var ClaudeCodeLanguageModel = class {
                 excludeServers,
                 taskProxyEnabled,
                 backgroundSubagentsSupported,
+                hostDialect,
                 questionProxyActive,
                 opencodeToolDefs,
                 pluginCompressEnabled,
@@ -16279,7 +16311,7 @@ var ClaudeCodeLanguageModel = class {
                 [
                   ...extractSystemMessages(options.prompt),
                   ...taskProxyEnabled ? [SUBAGENT_DISPATCH_HINT] : [],
-                  ...backgroundSubagentsSupported ? [BACKGROUND_SUBAGENT_HINT] : [],
+                  ...backgroundSubagentsSupported ? [backgroundSubagentHint(hostDialect)] : [],
                   ...questionProxyActive ? [QUESTION_PROXY_HINT] : [],
                   ...self.config.hostApi === "v2" && options.tools?.some((t) => t.name === "execute") ? [codeModeProxyHint(opencodeToolDefs.some((t) => t.name === "execute"))] : []
                 ],