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

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",
@@ -2132,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
@@ -2140,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;
@@ -2336,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;
@@ -2663,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,
@@ -2703,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 {
@@ -2755,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") {
@@ -2794,6 +2864,7 @@ ${plan}
               durationMs: msg.duration_ms,
               usage: msg.usage
             };
+            cleanup();
             resolve3({
               ...resultMeta,
               text: responseText,
@@ -2805,6 +2876,7 @@ ${plan}
         }
       });
       rl.on("close", () => {
+        cleanup();
         resolve3({
           ...resultMeta,
           text: responseText,
@@ -2814,6 +2886,7 @@ ${plan}
       });
       proc.on("error", (err) => {
         log.error("process error", { error: err.message });
+        cleanup();
         reject(err);
       });
       proc.stderr?.on("data", (data) => {
@@ -3070,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,
@@ -4662,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
       });
     }