@khalilgharbaoui/opencode-claude-code-plugin 0.43.0 → 0.45.0

package/dist/index.d.ts

@@ -362,6 +362,12 @@ interface ClaudeCodeConfig {
     interactiveAllowTools?: string[];
     /** With interactive: append this plugin's own prompts via --append-system-prompt-file. Defaults to true. */
     interactiveSystemPrompt?: boolean;
+    /**
+     * With the interactive transport: also append what the operator wrote that
+     * opencode forwarded (instruction files and the active agent's own prompt),
+     * verbatim and chosen by provenance. Off by default (h #g212).
+     */
+    interactiveUserInstructions?: boolean;
     cwd?: string;
     account?: string;
     configDir?: string;
@@ -481,6 +487,12 @@ interface ClaudeCodeProviderSettings {
     interactiveAllowTools?: string[];
     /** With interactive: append this plugin's own prompts via --append-system-prompt-file. Defaults to true. */
     interactiveSystemPrompt?: boolean;
+    /**
+     * With the interactive transport: also append what the operator wrote that
+     * opencode forwarded (instruction files and the active agent's own prompt),
+     * verbatim and chosen by provenance. Off by default (h #g212).
+     */
+    interactiveUserInstructions?: boolean;
     cwd?: string;
     name?: string;
     providerID?: string;
@@ -1370,6 +1382,11 @@ type AgentRecord = {
      * refused. Same account throughout; see `src/model-fallback.ts`.
      */
     fallbackModels?: string[];
+    /**
+     * The agent's own prompt as the operator wrote it: the markdown body, or
+     * `prompt` in opencode.json. Read only by `interactiveUserInstructions`.
+     */
+    prompt?: string;
 };
 declare function getAgentRegistry(): Record<string, AgentRecord>;
 declare function getDefaultSubagentModel(): string | undefined;

package/dist/index.js

@@ -5897,7 +5897,7 @@ var PLUGIN_LOG_MESSAGES = /* @__PURE__ */ new Set([
   "two different skills share a name; bridging the one the nearest root claimed",
   "unknown permissionPreset; no preset applied and every permission setting is left exactly as configured",
   "unsupported file part data type",
-  "unsupported media type for Claude image block, skipping"
+  "unsupported media type for Claude attachment block, skipping"
 ]);
 
 // src/diagnostic-bundle.ts
@@ -7253,7 +7253,7 @@ var baseCapabilities = {
   temperature: false,
   attachment: true,
   toolcall: true,
-  input: { text: true, audio: false, image: true, video: false, pdf: false },
+  input: { text: true, audio: false, image: true, video: false, pdf: true },
   output: { text: true, audio: false, image: false, video: false, pdf: false },
   interleaved: false
 };
@@ -7733,6 +7733,13 @@ function parseAgentFrontmatter(text) {
   }
   return record;
 }
+function agentMarkdownBody(text) {
+  if (!text.startsWith("---")) return text.trim() || void 0;
+  const lines = text.split(/\r?\n/);
+  const close = lines.findIndex((line, index) => index > 0 && line.trim() === "---");
+  if (close === -1) return void 0;
+  return lines.slice(close + 1).join("\n").trim() || void 0;
+}
 function parseFallbackModelList(value) {
   if (Array.isArray(value)) {
     return value.map((entry) => typeof entry === "string" ? entry.trim() : "").filter(Boolean);
@@ -7756,6 +7763,8 @@ async function readAgentMarkdownRecords(directories) {
       try {
         const text = await readFile(path7.join(directory, entry), "utf8");
         records2[name] = parseAgentFrontmatter(text);
+        const prompt = agentMarkdownBody(text);
+        if (prompt) records2[name].prompt = prompt;
       } catch (err) {
         log.debug("failed to read agent markdown", {
           file: path7.join(directory, entry),
@@ -8001,13 +8010,14 @@ function stripContextReminders(prompt) {
   });
   return removed > 0 ? { prompt: out, removed } : { prompt, removed: 0 };
 }
+var PDF_MEDIA_TYPE = "application/pdf";
 var SUPPORTED_IMAGE_TYPES = /* @__PURE__ */ new Set([
   "image/jpeg",
   "image/png",
   "image/gif",
   "image/webp"
 ]);
-function toImageBlock(part) {
+function toAttachmentBlock(part) {
   const raw = part.image ?? part.data ?? part.url ?? part.source?.data;
   if (!raw) {
     log.warn("file part without data, skipping");
@@ -8039,8 +8049,14 @@ function toImageBlock(part) {
     log.warn("unsupported file part data type", { dataType: typeof raw });
     return null;
   }
+  if (resolvedMediaType.toLowerCase() === PDF_MEDIA_TYPE) {
+    return {
+      type: "document",
+      source: { type: "base64", media_type: PDF_MEDIA_TYPE, data: base64 }
+    };
+  }
   if (!resolvedMediaType || !SUPPORTED_IMAGE_TYPES.has(resolvedMediaType)) {
-    log.warn("unsupported media type for Claude image block, skipping", {
+    log.warn("unsupported media type for Claude attachment block, skipping", {
       mediaType: resolvedMediaType
     });
     return null;
@@ -8292,11 +8308,11 @@ Now continuing with the current message:
               content.push({ type: "text", text: part.text });
             }
           } else if (part.type === "file" || part.type === "image") {
-            const block = toImageBlock(part);
+            const block = toAttachmentBlock(part);
             if (block) {
               content.push(block);
             } else {
-              log.debug("skipped non-image file part", {
+              log.debug("skipped unsupported file part", {
                 mediaType: part.mediaType
               });
             }
@@ -8356,7 +8372,7 @@ function getTrailingUserMessages(prompt, opts = {}) {
         if (part.type === "text") {
           if (part.text && part.text.trim()) blocks.push({ type: "text", text: part.text });
         } else if (part.type === "file" || part.type === "image") {
-          const block = toImageBlock(part);
+          const block = toAttachmentBlock(part);
           if (block) blocks.push(block);
         }
       }
@@ -9771,12 +9787,14 @@ function decodeUserEnvelope(chunk, saveImage) {
   const images = [];
   let dropped = 0;
   for (const block of content) {
-    const extension = block?.type === "image" && block.source?.type === "base64" && typeof block.source.data === "string" ? IMAGE_EXTENSIONS[String(block.source.media_type).toLowerCase()] : void 0;
+    const base64 = block?.source?.type === "base64" && typeof block.source.data === "string";
+    const mediaType = String(block?.source?.media_type).toLowerCase();
+    const extension = base64 && block.type === "image" ? IMAGE_EXTENSIONS[mediaType] : base64 && block.type === "document" && mediaType === "application/pdf" ? "pdf" : void 0;
     if (block?.type === "text" && typeof block.text === "string") {
       parts.push(block.text);
     } else if (extension && saveImage) {
       const file = saveImage(Buffer.from(block.source.data, "base64"), extension);
-      if (file) images.push(file);
+      if (file) images.push(extension === "pdf" ? `@${file}` : file);
       else dropped++;
     } else if (block?.type === "tool_result") {
       const v = block.content;
@@ -9799,7 +9817,7 @@ ${text2}`
 }
 function stageImage(data, extension) {
   try {
-    const file = join10(pluginTmpDir(), `image-${randomUUID5()}.${extension}`);
+    const file = join10(pluginTmpDir(), `attachment-${randomUUID5()}.${extension}`);
     writeFileSync5(file, data, { mode: 384, flag: "wx" });
     return file;
   } catch (err) {
@@ -10284,7 +10302,7 @@ function spawnInteractiveProcess(opts) {
 import { readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir8 } from "os";
 import { randomUUID as randomUUID6 } from "crypto";
-import { dirname as dirname6, join as join11 } from "path";
+import { basename as basename2, dirname as dirname6, isAbsolute as isAbsolute3, join as join11 } from "path";
 function readPromptFileIfPresent(path11) {
   try {
     const content = readFileSync7(path11, "utf8").trim();
@@ -10390,6 +10408,36 @@ function extractSystemMessages(prompt) {
   }
   return out;
 }
+var CLAUDE_NATIVE_INSTRUCTION_FILES = /* @__PURE__ */ new Set(["CLAUDE.md", "CLAUDE.local.md"]);
+function userAuthoredInstructions(forwarded, opts = {}) {
+  const readFile2 = opts.readFile ?? ((path11) => {
+    try {
+      return readFileSync7(path11, "utf8");
+    } catch {
+      return null;
+    }
+  });
+  const out = [];
+  const agentPrompt = opts.agentPrompt?.trim();
+  if (agentPrompt && forwarded.includes(agentPrompt)) {
+    out.push({ text: agentPrompt, content: agentPrompt });
+  }
+  const seen = /* @__PURE__ */ new Set();
+  for (const match of forwarded.matchAll(/^Instructions from: (.+)$/gm)) {
+    const path11 = match[1].trim();
+    if (seen.has(path11) || !isAbsolute3(path11)) continue;
+    if (CLAUDE_NATIVE_INSTRUCTION_FILES.has(basename2(path11))) continue;
+    seen.add(path11);
+    const file = readFile2(path11);
+    if (!file?.trim()) continue;
+    const start = match.index + match[0].length + 1;
+    const content = forwarded.startsWith(file, start) ? file : forwarded.startsWith(file.trimEnd(), start) ? file.trimEnd() : null;
+    if (content === null) continue;
+    out.push({ text: `Instructions from: ${path11}
+${content}`, content });
+  }
+  return out;
+}
 function buildAppendedSystemPrompt(cwd, includeMultiStepHint = true, extraSystemContent = [], options = {}) {
   const parts = [];
   if (options.compressionSummary?.trim()) {
@@ -10414,6 +10462,11 @@ ${options.compressionSummary.trim()}`
   if (pushGlobal) parts.push(globalAgents);
   if (pushWorkspace) parts.push(workspaceAgents);
   if (pushGlobal || pushWorkspace) parts.push(AGENTS_MAINTENANCE_HINT);
+  for (const instruction of options.userInstructions ?? []) {
+    const authored = instruction.content.trim();
+    if (authored === globalAgents || authored === workspaceAgents) continue;
+    parts.push(instruction.text);
+  }
   if (includeMultiStepHint) parts.push(MULTI_STEP_TASK_HINT);
   const content = parts.join("\n\n");
   if (!content) return void 0;
@@ -13906,6 +13959,14 @@ var ClaudeCodeLanguageModel = class {
                   "WebFetch"
                 ]
               ];
+              const userInstructions = self.config.interactiveUserInstructions === true ? userAuthoredInstructions(extractSystemMessages(options.prompt).join("\n\n"), {
+                agentPrompt: getAgentRegistry()[self.getOpencodeAgent(options) ?? ""]?.prompt
+              }) : [];
+              if (userInstructions.length > 0) {
+                log.info("forwarding user-authored instructions to the interactive TUI", {
+                  count: userInstructions.length
+                });
+              }
               const systemPromptFile = self.config.interactiveSystemPrompt === false ? void 0 : buildAppendedSystemPrompt(
                 cwd,
                 self.config.multiStepContinuation !== false,
@@ -13927,7 +13988,8 @@ var ClaudeCodeLanguageModel = class {
                   opencodeCompressEnabled: wiring.opencodeToolDefs.some(
                     (t) => t.name === "compress"
                   ),
-                  compressionSummary: getCompressionSummary(sk)
+                  compressionSummary: getCompressionSummary(sk),
+                  userInstructions
                 }
               );
               if (self.config.interactiveSystemPrompt === false) {
@@ -15461,7 +15523,8 @@ function createClaudeCode(settings = {}) {
       interactive: settings.interactive,
       interactiveBypass: settings.interactiveBypass,
       interactiveAllowTools: settings.interactiveAllowTools,
-      interactiveSystemPrompt: settings.interactiveSystemPrompt
+      interactiveSystemPrompt: settings.interactiveSystemPrompt,
+      interactiveUserInstructions: settings.interactiveUserInstructions
     });
   };
   const provider = function(modelId) {
@@ -15680,7 +15743,8 @@ async function buildAgentRegistry(config) {
       forceModel: pick("forceModel") ?? records2[name]?.forceModel,
       reasoningEffort: pick("reasoningEffort") ?? records2[name]?.reasoningEffort,
       cacheTtl: pick("cacheTtl") ?? records2[name]?.cacheTtl,
-      fallbackModels: declaredChain.length ? declaredChain : records2[name]?.fallbackModels
+      fallbackModels: declaredChain.length ? declaredChain : records2[name]?.fallbackModels,
+      prompt: pick("prompt") ?? records2[name]?.prompt
     };
   }
   setAgentRegistry(records2);