@khalilgharbaoui/opencode-claude-code-plugin 0.4.23 → 0.5.1

package/README.md

@@ -313,6 +313,32 @@ Set `permissionMode: "plan"` to forward `--permission-mode plan` to Claude. The
 
 ---
 
+## AskUserQuestion
+
+opencode has no native structured ask-question executor to proxy through (unlike `Bash`/`Task`), so the plugin handles `AskUserQuestion` specially:
+
+1. **It renders the full question.** The tool's payload — every question, header, option label, and option description — is emitted as readable markdown into the assistant stream so the user actually sees the choices (same approach as `ExitPlanMode`).
+2. **It is never auto-allowed at the CLI gate.** Allowing it would let the headless Claude CLI resolve its own question (no TTY → fabricated/empty answer) and proceed on a guess. `controlRequestBehaviorForTool` hard-denies `AskUserQuestion` and returns a message telling the model to wait for the operator's answer — or, if the run is non-interactive, to proceed with the single most reasonable option and state its assumption rather than stall.
+
+This hard-deny sits **below** `controlRequestToolBehaviors` in precedence but **above** the global `controlRequestBehavior`. So:
+
+- The global `controlRequestBehavior: "allow"` does **not** override it (interactive setups stay correct by default).
+- An explicit per-tool entry **does**. For a fully unattended/automated deployment that prefers "guess and continue" over "stop and wait", restore the old auto-allow:
+
+  ```json
+  "provider": {
+    "claude-code": {
+      "options": {
+        "controlRequestToolBehaviors": { "AskUserQuestion": "allow" }
+      }
+    }
+  }
+  ```
+
+  With `"allow"`, the Claude CLI answers its own `AskUserQuestion` internally and the run never blocks — appropriate only when no operator is watching and forward progress matters more than a correct decision.
+
+---
+
 ## Compaction
 
 When you run `/compact` in opencode, the plugin handles it on a short-lived dedicated Claude CLI spawn instead of routing it through your main conversation process. Three reasons:
@@ -435,6 +461,7 @@ plugin internals.
 - No streaming of tool inputs as they're being constructed (Anthropic's `input_json_delta`); the plugin emits them once complete.
 - Raw chain-of-thought is not available. Claude 4 family models ship summarized thinking only. See [Extended thinking](#extended-thinking) for the full picture.
 - Recommended Claude Code CLI: **2.1.142+**. Older CLIs work for everything else but skip the `--thinking-display` flag, so Claude Opus 4.7 turns may render empty Thinking rows. If something breaks after a Claude Code update, the CLI version is the first thing to check.
+- **Subagent todos require explicit permission.** opencode's task tool gates `todowrite` per subagent: without a `permission: { todowrite: "allow" }` rule on the subagent definition, opencode injects `todowrite: false` into the tools dict and the plugin's synthetic `todowrite` emissions surface as `⚙ invalid todowrite` rows. The built-in `general` subagent denies `todowrite` by default; use a custom subagent for parallel work that needs todo visibility. Subagent todos render inline in the **subagent's** session view (navigate with the TUI's `session.child.next` / `session.parent` commands), not in the parent session's panel.
 
 ---
 
@@ -481,6 +508,16 @@ git push origin master --follow-tags
 
 The GitHub Actions workflow at `.github/workflows/publish.yml` runs `npm publish --access public` on tag push (requires `NPM_TOKEN` secret in the repo settings — use a classic automation token so 2FA isn't required at workflow time).
 
+## Star History
+
+<a href="https://www.star-history.com/?repos=khalilgharbaoui%2Fopencode-claude-code-plugin&type=date&legend=top-left">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=khalilgharbaoui/opencode-claude-code-plugin&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=khalilgharbaoui/opencode-claude-code-plugin&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=khalilgharbaoui/opencode-claude-code-plugin&type=date&legend=top-left" />
+ </picture>
+</a>
+
 ## License
 
 MIT. See [LICENSE](./LICENSE).

package/dist/index.d.ts

@@ -89,6 +89,13 @@ type OpenCodeEvent = {
  * for the current call ("default", "compaction", "title", etc.), the
  * resolved model, and the user message. Output is the mutable params bag
  * the hook can adjust before opencode forwards them to the LM.
+ *
+ * The plugin injects `input.agent` as `opencodeAgent` and `input.sessionID`
+ * as `opencodeSessionID` into `output.options` so the language model can
+ * read them from `providerOptions[providerID]` on every LLM request.
+ * `opencodeSessionID` serves as a fallback affinity token when the
+ * `x-session-affinity` request header is absent (provider switch
+ * mid-session, title synthesis paths, older opencode versions).
  */
 type OpenCodeChatParamsInput = {
     sessionID?: string;
@@ -450,11 +457,14 @@ declare class ClaudeCodeLanguageModel implements LanguageModelV3 {
     private ensureProxyServer;
     private extractPendingProxyResult;
     /**
-     * Opencode sets `x-session-affinity: <sessionID>` on LLM calls for
-     * third-party providers (packages/opencode/src/session/llm.ts). Use it so
-     * two chats in the same cwd+model get separate CLI processes instead of
-     * stomping on each other. Falls back to "default" when absent (older
-     * opencode, direct AI-SDK use, title synthesis paths, etc).
+     * Resolve the session affinity token for this LLM call. Delegates to the
+     * exported `resolveSessionAffinity` helper so the logic is unit-testable.
+     * Priority:
+     *   1. `x-session-affinity` request header (primary).
+     *   2. `opencodeSessionID` in providerOptions (chat.params hook fallback —
+     *      covers provider switches mid-session and title synthesis paths
+     *      where the header is absent).
+     *   3. `"default"`.
      */
     private sessionAffinity;
     private controlRequestBehaviorForTool;

package/dist/index.js

@@ -1955,6 +1955,22 @@ function resolveCompactionModel(configured) {
   if (trimmed) return trimmed;
   return DEFAULT_COMPACTION_MODEL;
 }
+function resolveSessionAffinity(headers, providerOptions, providerKey) {
+  if (headers) {
+    for (const key of Object.keys(headers)) {
+      if (key.toLowerCase() === "x-session-affinity") {
+        const v = headers[key];
+        if (typeof v === "string" && v.length > 0) return v;
+      }
+    }
+  }
+  if (providerOptions) {
+    const bag = providerOptions[providerKey] ?? providerOptions["claude-code"];
+    const sid = bag?.opencodeSessionID;
+    if (typeof sid === "string" && sid.length > 0) return sid;
+  }
+  return "default";
+}
 var KNOWN_DELTA_TYPES = /* @__PURE__ */ new Set([
   "thinking_delta",
   "text_delta",
@@ -1997,6 +2013,46 @@ var AUTO_CONTINUE_PROMPT = "Continue the task from where you stopped. Do not sum
 function normalizeVisibleText(text) {
   return text.replace(/\s+/g, " ").trim();
 }
+function isAskUserQuestionTool(name) {
+  if (!name) return false;
+  const n = name.toLowerCase();
+  return n === "askuserquestion" || n === "ask_user_question";
+}
+function formatAskUserQuestion(input) {
+  const anyInput = input;
+  const questions = Array.isArray(anyInput?.questions) ? anyInput.questions : [];
+  if (questions.length === 0) {
+    const single = anyInput?.question ?? anyInput?.text;
+    const q = typeof single === "string" && single.trim() ? single.trim() : "Question?";
+    return `
+
+**${q}**
+
+_Reply with your answer to continue._
+
+`;
+  }
+  const out = ["\n\n"];
+  const multiQ = questions.length > 1;
+  questions.forEach((q, i) => {
+    const text = typeof q?.question === "string" && q.question.trim() || typeof q?.text === "string" && q.text.trim() || "Question?";
+    const header = typeof q?.header === "string" && q.header.trim() ? q.header.trim() : "";
+    out.push(`**${multiQ ? `${i + 1}. ` : ""}${text}**`);
+    if (header) out.push(` _(${header})_`);
+    out.push("\n\n");
+    const options = Array.isArray(q?.options) ? q.options : [];
+    options.forEach((opt, j) => {
+      const label = typeof opt?.label === "string" && opt.label.trim() || typeof opt === "string" && opt.trim() || `Option ${j + 1}`;
+      const desc = typeof opt?.description === "string" && opt.description.trim() ? ` \u2014 ${opt.description.trim()}` : "";
+      out.push(`${j + 1}. **${label}**${desc}
+`);
+    });
+    out.push(
+      q?.multiSelect === true ? "\n_Select one or more \u2014 reply with the numbers or labels._\n\n" : "\n_Reply with your choice (the number or label)._\n\n"
+    );
+  });
+  return out.join("");
+}
 function looksLikeQuestion(text) {
   const normalized = normalizeVisibleText(text).toLowerCase();
   if (!normalized) return false;
@@ -2092,6 +2148,11 @@ function nearestWorkspaceAgentsPrompt(cwd) {
     dir = parent;
   }
 }
+var AGENTS_MAINTENANCE_HINT = `## Keeping AGENTS.md up to date
+
+When you complete a task, phase, or to-do item that is listed in AGENTS.md, update the file
+immediately after the work is done \u2014 mark it \u2705, check it off, or remove it. Do this inside
+the same turn so the next session does not repeat work that is already finished.`;
 var MULTI_STEP_TASK_HINT = `## Continuing through multi-step tasks
 
 opencode requires the user to press "continue" after each turn ends. When a
@@ -2100,13 +2161,43 @@ than pausing for user confirmation between subtasks. End the turn only
 when the task is done, you need clarification on intent, or you hit a real
 blocker. The user can interrupt or abort at any time; turn endings should
 mark meaningful checkpoints, not every completed substep.`;
-function buildAppendedSystemPrompt(cwd, includeMultiStepHint = true) {
+var CLAUDE_CLI_CONTEXT_NOTE = `## Runtime environment: Claude Code CLI
+
+You are running via the Claude Code CLI (not a direct API call). This affects context management:
+
+- The \`compress\` tool is NOT available. Do not attempt to call it.
+- The \`distill\`, \`prune\`, and \`extract\` tools are NOT available.
+- Context window management is handled automatically by Claude CLI's own session history.
+- Ignore any system instructions that tell you to call \`compress\` \u2014 they are intended for direct API providers, not this environment.
+- DCP context injections (AGENTS.md, dynamic state) arrive via the system prompt and are already applied.`;
+function extractSystemMessages(prompt) {
+  const out = [];
+  for (const msg of prompt) {
+    if (msg.role !== "system") continue;
+    if (typeof msg.content === "string") {
+      if (msg.content.trim()) out.push(msg.content.trim());
+    } else if (Array.isArray(msg.content)) {
+      for (const part of msg.content) {
+        if (part?.type === "text" && typeof part.text === "string" && part.text.trim()) {
+          out.push(part.text.trim());
+        }
+      }
+    }
+  }
+  return out;
+}
+function buildAppendedSystemPrompt(cwd, includeMultiStepHint = true, extraSystemContent = []) {
   const parts = [];
+  parts.push(CLAUDE_CLI_CONTEXT_NOTE);
+  for (const s of extraSystemContent) {
+    if (s.trim()) parts.push(s.trim());
+  }
   const configRoot = process.env.XDG_CONFIG_HOME ?? join5(homedir3(), ".config");
   const globalAgents = readPromptFileIfPresent(join5(configRoot, "opencode", "AGENTS.md"));
   const workspaceAgents = nearestWorkspaceAgentsPrompt(cwd);
   if (globalAgents) parts.push(globalAgents);
   if (workspaceAgents && workspaceAgents !== globalAgents) parts.push(workspaceAgents);
+  if (globalAgents || workspaceAgents) parts.push(AGENTS_MAINTENANCE_HINT);
   if (includeMultiStepHint) parts.push(MULTI_STEP_TASK_HINT);
   const content = parts.join("\n\n");
   if (!content) return void 0;
@@ -2296,22 +2387,22 @@ var ClaudeCodeLanguageModel = class {
     return null;
   }
   /**
-   * Opencode sets `x-session-affinity: <sessionID>` on LLM calls for
-   * third-party providers (packages/opencode/src/session/llm.ts). Use it so
-   * two chats in the same cwd+model get separate CLI processes instead of
-   * stomping on each other. Falls back to "default" when absent (older
-   * opencode, direct AI-SDK use, title synthesis paths, etc).
+   * Resolve the session affinity token for this LLM call. Delegates to the
+   * exported `resolveSessionAffinity` helper so the logic is unit-testable.
+   * Priority:
+   *   1. `x-session-affinity` request header (primary).
+   *   2. `opencodeSessionID` in providerOptions (chat.params hook fallback —
+   *      covers provider switches mid-session and title synthesis paths
+   *      where the header is absent).
+   *   3. `"default"`.
    */
   sessionAffinity(options) {
     const headers = options?.headers;
-    if (!headers) return "default";
-    for (const key of Object.keys(headers)) {
-      if (key.toLowerCase() === "x-session-affinity") {
-        const v = headers[key];
-        if (typeof v === "string" && v.length > 0) return v;
-      }
-    }
-    return "default";
+    return resolveSessionAffinity(
+      headers,
+      options.providerOptions,
+      this.config.provider
+    );
   }
   controlRequestBehaviorForTool(toolName) {
     const configured = this.config.controlRequestToolBehaviors;
@@ -2325,6 +2416,7 @@ var ClaudeCodeLanguageModel = class {
         }
       }
     }
+    if (isAskUserQuestionTool(toolName)) return "deny";
     return this.config.controlRequestBehavior ?? "allow";
   }
   writeControlResponse(proc, requestId, response) {
@@ -2368,9 +2460,10 @@ var ClaudeCodeLanguageModel = class {
           toolName
         });
       } else {
+        const denyMessage = isAskUserQuestionTool(toolName) ? "Your question and its options have already been presented to the operator in full. Prefer to stop here and wait for their answer in the next message \u2014 do not silently guess. But if this is an automated or otherwise non-interactive run where no operator will reply, do not stall: proceed with the single most reasonable option and state, in one line, the assumption you made so it can be corrected later." : this.config.controlRequestDenyMessage ?? `Denied by opencode-claude-code policy for tool ${toolName}`;
         this.writeControlResponse(proc, requestId, {
           behavior: "deny",
-          message: this.config.controlRequestDenyMessage ?? `Denied by opencode-claude-code policy for tool ${toolName}`,
+          message: denyMessage,
           toolUseID: request.tool_use_id
         });
         log.info("control request auto-denied", {
@@ -2621,7 +2714,8 @@ var ClaudeCodeLanguageModel = class {
     ]);
     const systemPromptFile = buildAppendedSystemPrompt(
       cwd,
-      this.config.multiStepContinuation !== false
+      this.config.multiStepContinuation !== false,
+      extractSystemMessages(options.prompt)
     );
     const cliArgs = buildCliArgs({
       sessionKey: sk,
@@ -2661,8 +2755,15 @@ var ClaudeCodeLanguageModel = class {
     let thinkingText = "";
     let resultMeta = {};
     const toolCalls = [];
+    const toolCallStreams = /* @__PURE__ */ new Map();
     let gotPartialEvents = false;
     const result = await new Promise((resolve3, reject) => {
+      const cleanup = () => {
+        try {
+          if (!proc.killed && proc.exitCode === null) proc.kill();
+        } catch {
+        }
+      };
       rl.on("line", (line) => {
         if (!line.trim()) return;
         try {
@@ -2688,14 +2789,9 @@ var ClaudeCodeLanguageModel = class {
                 thinkingText += block.thinking;
               }
               if (block.type === "tool_use" && block.id && block.name) {
-                if (block.name === "AskUserQuestion" || block.name === "ask_user_question") {
+                if (isAskUserQuestionTool(block.name)) {
                   const parsedInput = block.input ?? {};
-                  const question = parsedInput?.question || "Question?";
-                  responseText += `
-
-_Asking: ${question}_
-
-`;
+                  responseText += formatAskUserQuestion(parsedInput);
                   continue;
                 }
                 if (block.name === "ExitPlanMode") {
@@ -2718,30 +2814,41 @@ ${plan}
               }
             }
           }
-          if (msg.type === "content_block_start" && msg.content_block) {
+          if (msg.type === "content_block_start" && msg.content_block && msg.index !== void 0) {
             if (msg.content_block.type === "tool_use" && msg.content_block.id && msg.content_block.name) {
-              toolCalls.push({
+              toolCallStreams.set(msg.index, {
                 id: msg.content_block.id,
                 name: msg.content_block.name,
-                args: {}
+                inputJson: ""
               });
             }
           }
-          if (msg.type === "content_block_delta" && msg.delta) {
+          if (msg.type === "content_block_delta" && msg.delta && msg.index !== void 0) {
             if (msg.delta.type === "text_delta" && msg.delta.text) {
               responseText += msg.delta.text;
             }
             if (msg.delta.type === "thinking_delta" && msg.delta.thinking) {
               thinkingText += msg.delta.thinking;
             }
-            if (msg.delta.type === "input_json_delta" && msg.delta.partial_json && msg.index !== void 0) {
-              const tc = toolCalls[msg.index];
-              if (tc) {
-                try {
-                  tc.args = JSON.parse(msg.delta.partial_json);
-                } catch {
-                }
+            if (msg.delta.type === "input_json_delta" && msg.delta.partial_json) {
+              const tc = toolCallStreams.get(msg.index);
+              if (tc) tc.inputJson += msg.delta.partial_json;
+            }
+          }
+          if (msg.type === "content_block_stop" && msg.index !== void 0) {
+            const tc = toolCallStreams.get(msg.index);
+            if (tc) {
+              let args = {};
+              try {
+                args = tc.inputJson ? JSON.parse(tc.inputJson) : {};
+              } catch (err) {
+                log.warn("tool input JSON parse failed", {
+                  name: tc.name,
+                  error: String(err)
+                });
               }
+              toolCalls.push({ id: tc.id, name: tc.name, args });
+              toolCallStreams.delete(msg.index);
             }
           }
           if (msg.type === "result") {
@@ -2757,6 +2864,7 @@ ${plan}
               durationMs: msg.duration_ms,
               usage: msg.usage
             };
+            cleanup();
             resolve3({
               ...resultMeta,
               text: responseText,
@@ -2768,6 +2876,7 @@ ${plan}
         }
       });
       rl.on("close", () => {
+        cleanup();
         resolve3({
           ...resultMeta,
           text: responseText,
@@ -2777,6 +2886,7 @@ ${plan}
       });
       proc.on("error", (err) => {
         log.error("process error", { error: err.message });
+        cleanup();
         reject(err);
       });
       proc.stderr?.on("data", (data) => {
@@ -3033,7 +3143,8 @@ ${plan}
             );
             const systemPromptFile = activeProcess ? void 0 : buildAppendedSystemPrompt(
               cwd,
-              self.config.multiStepContinuation !== false
+              self.config.multiStepContinuation !== false,
+              extractSystemMessages(options.prompt)
             );
             cliArgs = buildCliArgs({
               sessionKey: sk,
@@ -3356,22 +3467,12 @@ ${plan}
                     parsedInput = JSON.parse(tc.inputJson || "{}");
                   } catch {
                   }
-                  if (tc.name === "AskUserQuestion" || tc.name === "ask_user_question") {
-                    let question = "Question?";
-                    if (parsedInput?.questions && Array.isArray(parsedInput.questions) && parsedInput.questions.length > 0) {
-                      question = parsedInput.questions[0].question || parsedInput.questions[0].text || "Question?";
-                    } else {
-                      question = parsedInput?.question || parsedInput?.text || "Question?";
-                    }
+                  if (isAskUserQuestionTool(tc.name)) {
                     const askId = startTextBlock();
                     controller.enqueue({
                       type: "text-delta",
                       id: askId,
-                      delta: `
-
-_Asking: ${question}_
-
-`
+                      delta: formatAskUserQuestion(parsedInput)
                     });
                     endTextBlock();
                   } else if (tc.name === "ExitPlanMode") {
@@ -3525,23 +3626,12 @@ ${plan}
                       name: block.name,
                       input: parsedInput
                     });
-                    if (block.name === "AskUserQuestion" || block.name === "ask_user_question") {
-                      let question = "Question?";
-                      if (parsedInput?.questions && Array.isArray(parsedInput.questions) && parsedInput.questions.length > 0) {
-                        const q = parsedInput.questions[0];
-                        question = q.question || q.text || "Question?";
-                      } else {
-                        question = parsedInput?.question || parsedInput?.text || "Question?";
-                      }
+                    if (isAskUserQuestionTool(block.name)) {
                       const askId = startTextBlock();
                       controller.enqueue({
                         type: "text-delta",
                         id: askId,
-                        delta: `
-
-_Asking: ${question}_
-
-`
+                        delta: formatAskUserQuestion(parsedInput)
                       });
                       endTextBlock();
                     } else if (block.name === "ExitPlanMode") {
@@ -4646,11 +4736,16 @@ var server = async (input) => {
       });
       if (typeof providerID !== "string") return;
       if (providerID !== PROVIDER_ID2 && !providerID.startsWith(`${PROVIDER_ID2}-`)) return;
+      if (typeof input2.sessionID === "string" && input2.sessionID.length > 0) {
+        output.options ??= {};
+        output.options.opencodeSessionID = input2.sessionID;
+      }
       if (!input2.agent) return;
       output.options ??= {};
       output.options.opencodeAgent = input2.agent;
       log.debug("chat.params tagged providerOptions", {
         agent: input2.agent,
+        sessionID: input2.sessionID,
         providerID
       });
     }