@plannotator/opencode 0.19.2 → 0.19.3

package/dist/index.js

@@ -41684,6 +41684,24 @@ import { homedir as homedir3 } from "os";
 import { join as join5 } from "path";
 import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3, existsSync as existsSync5 } from "fs";
 import { execSync } from "child_process";
+var PROMPT_SECTIONS = ["review", "plan", "annotate"];
+function mergePromptConfig(current, partial) {
+  if (!current && !partial)
+    return;
+  const result = { ...current, ...partial };
+  for (const section of PROMPT_SECTIONS) {
+    const cur = current?.[section];
+    const par = partial?.[section];
+    if (cur || par) {
+      result[section] = {
+        ...cur,
+        ...par,
+        runtimes: cur?.runtimes || par?.runtimes ? { ...cur?.runtimes, ...par?.runtimes } : undefined
+      };
+    }
+  }
+  return result;
+}
 var CONFIG_DIR = join5(homedir3(), ".plannotator");
 var CONFIG_PATH = join5(CONFIG_DIR, "config.json");
 function loadConfig() {
@@ -41703,7 +41721,13 @@ function saveConfig(partial) {
   try {
     const current = loadConfig();
     const mergedDiffOptions = current.diffOptions || partial.diffOptions ? { ...current.diffOptions, ...partial.diffOptions } : undefined;
-    const merged = { ...current, ...partial, diffOptions: mergedDiffOptions };
+    const mergedPrompts = mergePromptConfig(current.prompts, partial.prompts);
+    const merged = {
+      ...current,
+      ...partial,
+      diffOptions: mergedDiffOptions,
+      prompts: mergedPrompts
+    };
     mkdirSync3(CONFIG_DIR, { recursive: true });
     writeFileSync2(CONFIG_PATH, JSON.stringify(merged, null, 2) + `
 `, "utf-8");
@@ -46477,7 +46501,7 @@ function stackPRQuery(kind) {
 query($owner: String!, $repo: String!, $${varName}: String!) {
   repository(owner: $owner, name: $repo) {
     pullRequests(first: ${first}, ${varName}: $${varName}, states: [OPEN, MERGED]) {
-      nodes { number title url baseRefName headRefName }
+      nodes { number title url baseRefName headRefName state }
     }
   }
 }`;
@@ -46534,7 +46558,8 @@ async function fetchGhPRStack(runtime2, ref, metadata) {
       title: pr.title,
       url: pr.url,
       isCurrent: false,
-      isDefaultBranch: false
+      isDefaultBranch: false,
+      state: pr.state === "MERGED" ? "merged" : pr.state === "CLOSED" ? "closed" : "open"
     });
     nextHead = pr.baseRefName;
   }
@@ -46551,7 +46576,8 @@ async function fetchGhPRStack(runtime2, ref, metadata) {
       title: pr.title,
       url: pr.url,
       isCurrent: false,
-      isDefaultBranch: false
+      isDefaultBranch: false,
+      state: pr.state === "MERGED" ? "merged" : pr.state === "CLOSED" ? "closed" : "open"
     });
     nextBase = pr.headRefName;
   }
@@ -48288,6 +48314,175 @@ async function startAnnotateServer(options) {
   };
 }
 
+// ../../packages/shared/prompts.ts
+function resolveTemplate(template, vars) {
+  return template.replace(/\{\{(\w+)\}\}/g, (match, key) => {
+    const val = vars[key];
+    return val !== undefined ? val : match;
+  });
+}
+var PLAN_TOOL_NAMES = {
+  "claude-code": "ExitPlanMode",
+  opencode: "submit_plan",
+  "copilot-cli": "exit_plan_mode",
+  pi: "plannotator_submit_plan",
+  codex: "ExitPlanMode",
+  "gemini-cli": "exit_plan_mode"
+};
+function getPlanToolName(runtime3) {
+  return runtime3 && PLAN_TOOL_NAMES[runtime3] || "ExitPlanMode";
+}
+function buildPlanFileRule(toolName, planFilePath) {
+  if (!planFilePath)
+    return "";
+  return `- Your plan is saved at: ${planFilePath}
+  You can edit this file to make targeted changes, then pass its path to ${toolName}.
+`;
+}
+var DEFAULT_REVIEW_APPROVED_PROMPT = `# Code Review
+
+Code review completed \u2014 no changes requested.`;
+var DEFAULT_REVIEW_DENIED_SUFFIX = `
+The reviewer has identified issues above. You must address all of them.`;
+var DEFAULT_PLAN_DENIED_PROMPT = `YOUR PLAN WAS NOT APPROVED.
+
+You MUST revise the plan to address ALL of the feedback below before calling {{toolName}} again.
+
+Rules:
+{{planFileRule}}- Do not resubmit the same plan unchanged.
+- Do NOT change the plan title (first # heading) unless the user explicitly asks you to.
+
+{{feedback}}`;
+var DEFAULT_PLAN_APPROVED_PROMPT = "Plan approved. You now have full tool access (read, bash, edit, write). Execute the plan in {{planFilePath}}. {{doneMsg}}";
+var DEFAULT_PLAN_APPROVED_WITH_NOTES_PROMPT = `Plan approved with notes! You now have full tool access (read, bash, edit, write). Execute the plan in {{planFilePath}}. {{doneMsg}}
+
+## Implementation Notes
+
+The user approved your plan but added the following notes to consider during implementation:
+
+{{feedback}}
+
+Proceed with implementation, incorporating these notes where applicable.`;
+var DEFAULT_ANNOTATE_FILE_FEEDBACK_PROMPT = `# Markdown Annotations
+
+{{fileHeader}}: {{filePath}}
+
+{{feedback}}
+
+Please address the annotation feedback above.`;
+var DEFAULT_ANNOTATE_MESSAGE_FEEDBACK_PROMPT = `# Message Annotations
+
+{{feedback}}
+
+Please address the annotation feedback above.`;
+function normalizePrompt(prompt) {
+  if (typeof prompt !== "string")
+    return;
+  return prompt.trim() ? prompt : undefined;
+}
+function getConfiguredPrompt(options) {
+  const resolvedConfig = options.config ?? loadConfig();
+  const section = resolvedConfig.prompts?.[options.section];
+  const runtimePrompt = options.runtime ? normalizePrompt(section?.runtimes?.[options.runtime]?.[options.key]) : undefined;
+  const genericPrompt = normalizePrompt(section?.[options.key]);
+  const runtimeFallback = options.runtime ? options.runtimeFallbacks?.[options.runtime] : undefined;
+  return runtimePrompt ?? genericPrompt ?? runtimeFallback ?? options.fallback;
+}
+function getReviewApprovedPrompt(runtime3, config) {
+  return getConfiguredPrompt({
+    section: "review",
+    key: "approved",
+    runtime: runtime3,
+    config,
+    fallback: DEFAULT_REVIEW_APPROVED_PROMPT
+  });
+}
+var REVIEW_DENIED_RUNTIME_DEFAULTS = {
+  opencode: `
+
+Please address this feedback.`,
+  pi: `
+
+Please address this feedback.`
+};
+function getReviewDeniedSuffix(runtime3, config) {
+  return getConfiguredPrompt({
+    section: "review",
+    key: "denied",
+    runtime: runtime3,
+    config,
+    fallback: DEFAULT_REVIEW_DENIED_SUFFIX,
+    runtimeFallbacks: REVIEW_DENIED_RUNTIME_DEFAULTS
+  });
+}
+function getPlanDeniedPrompt(runtime3, config, vars) {
+  const template = getConfiguredPrompt({
+    section: "plan",
+    key: "denied",
+    runtime: runtime3,
+    config,
+    fallback: DEFAULT_PLAN_DENIED_PROMPT
+  });
+  return resolveTemplate(template, vars ?? {});
+}
+var PLAN_APPROVED_RUNTIME_DEFAULTS = {
+  opencode: "Plan approved!{{doneMsg}}"
+};
+function getPlanApprovedPrompt(runtime3, config, vars) {
+  const template = getConfiguredPrompt({
+    section: "plan",
+    key: "approved",
+    runtime: runtime3,
+    config,
+    fallback: DEFAULT_PLAN_APPROVED_PROMPT,
+    runtimeFallbacks: PLAN_APPROVED_RUNTIME_DEFAULTS
+  });
+  return resolveTemplate(template, vars ?? {});
+}
+var PLAN_APPROVED_WITH_NOTES_RUNTIME_DEFAULTS = {
+  opencode: `Plan approved with notes!
+{{doneMsg}}
+
+## Implementation Notes
+
+The user approved your plan but added the following notes to consider during implementation:
+
+{{feedback}}
+
+Proceed with implementation, incorporating these notes where applicable.`
+};
+function getPlanApprovedWithNotesPrompt(runtime3, config, vars) {
+  const template = getConfiguredPrompt({
+    section: "plan",
+    key: "approvedWithNotes",
+    runtime: runtime3,
+    config,
+    fallback: DEFAULT_PLAN_APPROVED_WITH_NOTES_PROMPT,
+    runtimeFallbacks: PLAN_APPROVED_WITH_NOTES_RUNTIME_DEFAULTS
+  });
+  return resolveTemplate(template, vars ?? {});
+}
+function getAnnotateFileFeedbackPrompt(runtime3, config, vars) {
+  const template = getConfiguredPrompt({
+    section: "annotate",
+    key: "fileFeedback",
+    runtime: runtime3,
+    config,
+    fallback: DEFAULT_ANNOTATE_FILE_FEEDBACK_PROMPT
+  });
+  return resolveTemplate(template, vars ?? {});
+}
+function getAnnotateMessageFeedbackPrompt(runtime3, config, vars) {
+  const template = getConfiguredPrompt({
+    section: "annotate",
+    key: "messageFeedback",
+    runtime: runtime3,
+    config,
+    fallback: DEFAULT_ANNOTATE_MESSAGE_FEEDBACK_PROMPT
+  });
+  return resolveTemplate(template, vars ?? {});
+}
+
 // ../../packages/shared/at-reference.ts
 function stripAtPrefix(input) {
   const unquoted = stripWrappingQuotes(input);
@@ -48637,11 +48832,7 @@ async function handleReviewCommand(event, deps) {
     if (sessionId) {
       const shouldSwitchAgent = result.agentSwitch && result.agentSwitch !== "disabled";
       const targetAgent = result.agentSwitch || "build";
-      const message = result.approved ? `# Code Review
-
-Code review completed \u2014 no changes requested.` : isPRMode ? result.feedback : `${result.feedback}
-
-Please address this feedback.`;
+      const message = result.approved ? getReviewApprovedPrompt("opencode") : isPRMode ? result.feedback : `${result.feedback}${getReviewDeniedSuffix("opencode")}`;
       try {
         await client3.session.prompt({
           path: { id: sessionId },
@@ -48666,6 +48857,7 @@ async function handleAnnotateCommand(event, deps) {
   let absolutePath;
   let folderPath;
   let annotateMode = "annotate";
+  let isFolder = false;
   let sourceInfo;
   let sourceConverted = false;
   const isUrl = /^https?:\/\//i.test(filePath);
@@ -48685,7 +48877,6 @@ async function handleAnnotateCommand(event, deps) {
   } else {
     const projectRoot = directory || process.cwd();
     const resolvedArg = resolveUserPath(filePath, projectRoot);
-    let isFolder = false;
     try {
       isFolder = statSync5(resolvedArg).isDirectory();
     } catch {}
@@ -48771,13 +48962,11 @@ ${resolved.matches.map((m3) => `  ${m3}`).join(`
           body: {
             parts: [{
               type: "text",
-              text: `# Markdown Annotations
-
-File: ${absolutePath}
-
-${result.feedback}
-
-Please address the annotation feedback above.`
+              text: getAnnotateFileFeedbackPrompt("opencode", undefined, {
+                fileHeader: isFolder ? "Folder" : "File",
+                filePath: absolutePath,
+                feedback: result.feedback
+              })
             }]
           }
         });
@@ -48857,22 +49046,6 @@ async function handleArchiveCommand(event, deps) {
   server2.stop();
 }
 
-// ../../packages/shared/feedback-templates.ts
-var planDenyFeedback = (feedback, toolName = "ExitPlanMode", options) => {
-  const planFileRule = options?.planFilePath ? `- Your plan is saved at: ${options.planFilePath}
-  You can edit this file to make targeted changes, then pass its path to ${toolName}.
-` : "";
-  return `YOUR PLAN WAS NOT APPROVED.
-
-You MUST revise the plan to address ALL of the feedback below before calling ${toolName} again.
-
-Rules:
-${planFileRule}- Do not resubmit the same plan unchanged.
-- Do NOT change the plan title (first # heading) unless the user explicitly asks you to.
-
-${feedback || "Plan changes requested"}`;
-};
-
 // plan-mode.ts
 function normalizeEditPermission(edit) {
   if (typeof edit === "string") {
@@ -49261,11 +49434,7 @@ Do NOT proceed with implementation until your plan is approved.`);
             body: {
               parts: [{
                 type: "text",
-                text: `# Message Annotations
-
-${feedback}
-
-Please address the annotation feedback above.`
+                text: getAnnotateMessageFeedbackPrompt("opencode", undefined, { feedback })
               }]
             }
           });
@@ -49363,21 +49532,21 @@ Use /plannotator-last or /plannotator-annotate for manual review, or set workflo
               } catch {}
             }
             if (result.feedback) {
-              return `Plan approved with notes!
-${result.savedPath ? `Saved to: ${result.savedPath}` : ""}
-
-## Implementation Notes
-
-The user approved your plan but added the following notes to consider during implementation:
-
-${result.feedback}
-
-Proceed with implementation, incorporating these notes where applicable.`;
+              return getPlanApprovedWithNotesPrompt("opencode", undefined, {
+                planFilePath: sourceFilePath,
+                doneMsg: result.savedPath ? `Saved to: ${result.savedPath}` : "",
+                feedback: result.feedback
+              });
             }
-            return `Plan approved!${result.savedPath ? ` Saved to: ${result.savedPath}` : ""}`;
+            return getPlanApprovedPrompt("opencode", undefined, {
+              planFilePath: sourceFilePath,
+              doneMsg: result.savedPath ? ` Saved to: ${result.savedPath}` : ""
+            });
           } else {
-            return planDenyFeedback(result.feedback || "", "submit_plan", {
-              planFilePath: sourceFilePath
+            return getPlanDeniedPrompt("opencode", undefined, {
+              toolName: getPlanToolName("opencode"),
+              planFileRule: buildPlanFileRule(getPlanToolName("opencode"), sourceFilePath),
+              feedback: result.feedback || "Plan changes requested"
             }) + "\n\nAfter making your revisions, call `submit_plan` again to resubmit for review.";
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/opencode",
-  "version": "0.19.2",
+  "version": "0.19.3",
   "description": "Plannotator plugin for OpenCode - interactive plan review with visual annotation",
   "author": "backnotprop",
   "license": "MIT OR Apache-2.0",
@@ -38,7 +38,7 @@
     "@opencode-ai/plugin": "^1.1.10"
   },
   "devDependencies": {
-    "@plannotator/server": "0.19.2",
+    "@plannotator/server": "0.19.3",
     "@plannotator/shared": "0.0.1"
   },
   "peerDependencies": {