revert: remove code review and annotate from shared templates

Scope-crept into code review/annotate feedback which introduced a double
heading regression and dropped integration-specific strings. Reverts those
paths to their original inline strings; shared module now only covers
plan deny feedback.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: backnotprop

apps/hook/server/index.ts

@@ -49,7 +49,7 @@ import { resolveMarkdownFile } from "@plannotator/server/resolve-file";
 import { registerSession, unregisterSession, listSessions } from "@plannotator/server/sessions";
 import { openBrowser } from "@plannotator/server/browser";
 import { detectProjectName } from "@plannotator/server/project";
-import { planDenyFeedback, codeReviewFeedback, codeReviewApproved, annotateFeedback } from "@plannotator/shared/feedback-templates";
+import { planDenyFeedback } from "@plannotator/shared/feedback-templates";
 import path from "path";
 
 // Embed the built HTML at compile time
@@ -185,9 +185,10 @@ if (args[0] === "sessions") {
 
   // Output feedback (captured by slash command)
   if (result.approved) {
-    console.log(codeReviewApproved());
+    console.log("Code review completed — no changes requested.");
   } else {
-    console.log(codeReviewFeedback(result.feedback!));
+    console.log(result.feedback);
+    console.log("\nThe reviewer has identified issues above. You must address all of them.");
   }
   process.exit(0);
 
@@ -273,7 +274,7 @@ if (args[0] === "sessions") {
   server.stop();
 
   // Output feedback (captured by slash command)
-  console.log(result.feedback ? annotateFeedback(result.feedback, absolutePath) : "No feedback provided.");
+  console.log(result.feedback || "No feedback provided.");
   process.exit(0);
 
 } else {

apps/opencode-plugin/index.ts

@@ -29,7 +29,7 @@ import {
 import { getGitContext, runGitDiff } from "@plannotator/server/git";
 import { writeRemoteShareLink } from "@plannotator/server/share-url";
 import { resolveMarkdownFile } from "@plannotator/server/resolve-file";
-import { planDenyFeedback, codeReviewFeedback, codeReviewApproved, annotateFeedback } from "@plannotator/shared/feedback-templates";
+import { planDenyFeedback } from "@plannotator/shared/feedback-templates";
 
 // @ts-ignore - Bun import attribute for text
 import indexHtml from "./plannotator.html" with { type: "text" };
@@ -223,8 +223,8 @@ Do NOT proceed with implementation until your plan is approved.
             const targetAgent = result.agentSwitch || 'build';
 
             const message = result.approved
-              ? codeReviewApproved()
-              : codeReviewFeedback(result.feedback!);
+              ? `# Code Review\n\nCode review completed — no changes requested.`
+              : `# Code Review Feedback\n\n${result.feedback}\n\nPlease address this feedback.`;
 
             // Send feedback to agent
             try {
@@ -321,7 +321,7 @@ Do NOT proceed with implementation until your plan is approved.
                   parts: [
                     {
                       type: "text",
-                      text: annotateFeedback(result.feedback!, absolutePath),
+                      text: `# Markdown Annotations\n\nFile: ${absolutePath}\n\n${result.feedback}\n\nPlease address the annotation feedback above.`,
                     },
                   ],
                 },

apps/pi-extension/index.ts

@@ -35,7 +35,7 @@ import {
   runGitDiff,
   openBrowser,
 } from "./server.js";
-import { planDenyFeedback, codeReviewFeedback, codeReviewApproved, annotateFeedback } from "./feedback-templates.js";
+import { planDenyFeedback } from "./feedback-templates.js";
 
 // Load HTML at runtime (jiti doesn't support import attributes)
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -257,9 +257,9 @@ export default function plannotator(pi: ExtensionAPI): void {
 
       if (result.feedback) {
         if (result.approved) {
-          pi.sendUserMessage(codeReviewApproved());
+          pi.sendUserMessage(`# Code Review\n\nCode review completed — no changes requested.`);
         } else {
-          pi.sendUserMessage(codeReviewFeedback(result.feedback));
+          pi.sendUserMessage(`# Code Review Feedback\n\n${result.feedback}\n\nPlease address this feedback.`);
         }
       } else {
         ctx.ui.notify("Code review closed (no feedback).", "info");
@@ -303,7 +303,9 @@ export default function plannotator(pi: ExtensionAPI): void {
       server.stop();
 
       if (result.feedback) {
-        pi.sendUserMessage(annotateFeedback(result.feedback, absolutePath));
+        pi.sendUserMessage(
+          `# Markdown Annotations\n\nFile: ${absolutePath}\n\n${result.feedback}\n\nPlease address the annotation feedback above.`,
+        );
       } else {
         ctx.ui.notify("Annotation closed (no feedback).", "info");
       }

packages/shared/feedback-templates.test.ts

@@ -1,10 +1,5 @@
 import { describe, test, expect } from "bun:test";
-import {
-  planDenyFeedback,
-  codeReviewFeedback,
-  codeReviewApproved,
-  annotateFeedback,
-} from "./feedback-templates";
+import { planDenyFeedback } from "./feedback-templates";
 
 describe("feedback-templates", () => {
   /**
@@ -35,39 +30,14 @@ describe("feedback-templates", () => {
     expect(result).toContain(feedback);
   });
 
-  test("code review feedback preserves content verbatim", () => {
-    const feedback = "### Line 42 (new)\n```suggestion\nconst x = 1;\n```";
-    const result = codeReviewFeedback(feedback);
-    expect(result).toContain(feedback);
-  });
-
-  test("annotate feedback preserves content verbatim", () => {
-    const feedback = "## 1. Comment on: \"setup()\"\n> This needs error handling";
-    const result = annotateFeedback(feedback, "/src/main.ts");
-    expect(result).toContain(feedback);
-  });
-
   /**
    * Empty feedback should not produce a broken message — the agent needs
    * something actionable even if the user didn't write annotations.
    */
   test("plan deny handles empty feedback gracefully", () => {
     const result = planDenyFeedback("");
     expect(result.length).toBeGreaterThan(50);
-    // Should not end with just whitespace or have a dangling separator
-    expect(result.trimEnd()).toBe(result.trimEnd());
-  });
-
-  /**
-   * The annotate template optionally includes a file path so the agent knows
-   * which file the annotations refer to.
-   */
-  test("annotate feedback includes file path when given, omits when not", () => {
-    const withPath = annotateFeedback("fix typo", "/src/readme.md");
-    const withoutPath = annotateFeedback("fix typo");
-
-    expect(withPath).toContain("/src/readme.md");
-    expect(withoutPath).not.toContain("File:");
+    expect(result).toBe(result.trimEnd());
   });
 
   /**
@@ -78,19 +48,7 @@ describe("feedback-templates", () => {
    */
   test("plan deny instructs agent to preserve plan title", () => {
     const result = planDenyFeedback("feedback");
-    // Must mention the heading / title and tell the agent not to change it
     expect(result.toLowerCase()).toContain("title");
     expect(result.toLowerCase()).toContain("heading");
   });
-
-  /**
-   * Approved code review is a distinct message — it should NOT contain
-   * directive language that would confuse the agent into thinking there's work to do.
-   */
-  test("code review approved does not contain directive language", () => {
-    const result = codeReviewApproved();
-    expect(result).not.toContain("MUST");
-    expect(result).not.toContain("address");
-    expect(result).not.toContain("fix");
-  });
 });

packages/shared/feedback-templates.ts

@@ -1,35 +1,12 @@
 /**
  * Shared feedback templates for all agent integrations.
  *
- * These are the messages sent back to LLM agents when users deny plans,
- * submit code review feedback, or provide annotation feedback.
- *
  * The plan deny template was tuned in #224 / commit 3dca977 to use strong
  * directive framing — Claude was ignoring softer phrasing.
  */
 
-// ── Plan deny ────────────────────────────────────────────────────────
-
 export const planDenyFeedback = (
   feedback: string,
   toolName: string = "ExitPlanMode",
 ): string =>
   `YOUR PLAN WAS NOT APPROVED.\n\nYou MUST revise the plan to address ALL of the feedback below before calling ${toolName} again.\n\nRules:\n- Use the Edit tool to make targeted changes to the plan — do not resubmit the same plan unchanged.\n- Do NOT change the plan title (first # heading) unless the user explicitly asks you to.\n\n${feedback || "Plan changes requested"}`;
-
-// ── Code review ──────────────────────────────────────────────────────
-
-export const codeReviewFeedback = (feedback: string): string =>
-  `# Code Review Feedback\n\n${feedback}\n\nThe reviewer has identified issues above. You MUST address all of them.`;
-
-export const codeReviewApproved = (): string =>
-  `Code review completed — no changes requested.`;
-
-// ── Annotate ─────────────────────────────────────────────────────────
-
-export const annotateFeedback = (
-  feedback: string,
-  filePath?: string,
-): string => {
-  const fileRef = filePath ? `File: ${filePath}\n\n` : "";
-  return `# Markdown Annotations\n\n${fileRef}${feedback}\n\nYou MUST address the annotation feedback above.`;
-};