@plannotator/pi-extension 0.19.2 → 0.19.3

package/generated/config.ts

@@ -32,9 +32,70 @@ export interface CCLabelConfig {
   blocking: boolean;
 }
 
+export type PromptSectionOverrides = Record<string, string | undefined>;
+
+export type PromptRuntime =
+  | "claude-code"
+  | "opencode"
+  | "copilot-cli"
+  | "pi"
+  | "codex"
+  | "gemini-cli";
+
+interface PromptSectionConfig {
+  [key: string]: string | Partial<Record<PromptRuntime, PromptSectionOverrides>> | undefined;
+  runtimes?: Partial<Record<PromptRuntime, PromptSectionOverrides>>;
+}
+
+export interface PromptConfig {
+  review?: PromptSectionConfig & {
+    approved?: string;
+    denied?: string;
+  };
+  plan?: PromptSectionConfig & {
+    approved?: string;
+    approvedWithNotes?: string;
+    autoApproved?: string;
+    denied?: string;
+  };
+  annotate?: PromptSectionConfig & {
+    fileFeedback?: string;
+    messageFeedback?: string;
+    approved?: string;
+  };
+}
+
+const PROMPT_SECTIONS = ["review", "plan", "annotate"] as const;
+
+export function mergePromptConfig(
+  current?: PromptConfig,
+  partial?: PromptConfig,
+): PromptConfig | undefined {
+  if (!current && !partial) return undefined;
+
+  const result: Record<string, any> = { ...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 as PromptConfig;
+}
+
 export interface PlannotatorConfig {
   displayName?: string;
   diffOptions?: DiffOptions;
+  prompts?: PromptConfig;
   conventionalComments?: boolean;
   /** null = explicitly cleared (use defaults), undefined = not set */
   conventionalLabels?: CCLabelConfig[] | null;
@@ -84,7 +145,13 @@ export function saveConfig(partial: Partial<PlannotatorConfig>): void {
     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,
+    };
     mkdirSync(CONFIG_DIR, { recursive: true });
     writeFileSync(CONFIG_PATH, JSON.stringify(merged, null, 2) + "\n", "utf-8");
   } catch (e) {

package/generated/feedback-templates.ts

@@ -4,6 +4,13 @@
  *
  * The plan deny template was tuned in #224 / commit 3dca977 to use strong
  * directive framing — Claude was ignoring softer phrasing.
+ *
+ * IMPORTANT: This module is imported by packages/ui/utils/parser.ts which is
+ * bundled into the browser SPA. It must NOT import from ./prompts or ./config
+ * (which depend on node:fs, node:os, node:child_process). Keep it self-contained.
+ *
+ * Server-side call sites use getPlanDeniedPrompt() from ./prompts directly.
+ * This module is only kept for the browser's wrapFeedbackForAgent clipboard feature.
  */
 
 export interface PlanDenyFeedbackOptions {

package/generated/pr-github.ts

@@ -506,7 +506,7 @@ export async function submitGhPRReview(
 
 // --- Stack Tree (GraphQL) ---
 
-type StackPRNode = { number: number; title: string; url: string; baseRefName: string; headRefName: string };
+type StackPRNode = { number: number; title: string; url: string; baseRefName: string; headRefName: string; state: string };
 
 function stackPRQuery(kind: "head" | "base"): string {
   const varName = kind === "head" ? "headRefName" : "baseRefName";
@@ -515,7 +515,7 @@ function stackPRQuery(kind: "head" | "base"): string {
 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 }
     }
   }
 }`;
@@ -588,6 +588,7 @@ export async function fetchGhPRStack(
       url: pr.url,
       isCurrent: false,
       isDefaultBranch: false,
+      state: (pr.state === 'MERGED' ? 'merged' : pr.state === 'CLOSED' ? 'closed' : 'open') as PRStackNode['state'],
     });
     nextHead = pr.baseRefName;
   }
@@ -608,6 +609,7 @@ export async function fetchGhPRStack(
       url: pr.url,
       isCurrent: false,
       isDefaultBranch: false,
+      state: (pr.state === 'MERGED' ? 'merged' : pr.state === 'CLOSED' ? 'closed' : 'open') as PRStackNode['state'],
     });
     nextBase = pr.headRefName;
   }

package/generated/pr-provider.ts

@@ -201,6 +201,7 @@ export interface PRStackNode {
   url?: string;
   isCurrent: boolean;
   isDefaultBranch: boolean;
+  state?: 'open' | 'merged' | 'closed';
 }
 
 export interface PRStackTree {

package/generated/prompts.ts

@@ -0,0 +1,245 @@
+// @generated — DO NOT EDIT. Source: packages/shared/prompts.ts
+import { loadConfig, type PlannotatorConfig, type PromptRuntime } from "./config";
+
+// ─── Template engine ─────────────────────────────────────────────────────────
+
+export function resolveTemplate(
+  template: string,
+  vars: Record<string, string | undefined>,
+): string {
+  return template.replace(/\{\{(\w+)\}\}/g, (match, key) => {
+    const val = vars[key];
+    return val !== undefined ? val : match;
+  });
+}
+
+// ─── Tool name map ───────────────────────────────────────────────────────────
+
+export const PLAN_TOOL_NAMES: Record<PromptRuntime, string> = {
+  "claude-code": "ExitPlanMode",
+  opencode: "submit_plan",
+  "copilot-cli": "exit_plan_mode",
+  pi: "plannotator_submit_plan",
+  codex: "ExitPlanMode",
+  "gemini-cli": "exit_plan_mode",
+};
+
+export function getPlanToolName(runtime?: PromptRuntime | null): string {
+  return (runtime && PLAN_TOOL_NAMES[runtime]) || "ExitPlanMode";
+}
+
+export function buildPlanFileRule(toolName: string, planFilePath?: string): string {
+  if (!planFilePath) return "";
+  return `- Your plan is saved at: ${planFilePath}\n  You can edit this file to make targeted changes, then pass its path to ${toolName}.\n`;
+}
+
+// ─── Default constants ───────────────────────────────────────────────────────
+
+export const DEFAULT_REVIEW_APPROVED_PROMPT = "# Code Review\n\nCode review completed — no changes requested.";
+
+export const DEFAULT_REVIEW_DENIED_SUFFIX = "\nThe reviewer has identified issues above. You must address all of them.";
+
+export const DEFAULT_PLAN_DENIED_PROMPT =
+  "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{{planFileRule}}- 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}}";
+
+export const DEFAULT_PLAN_APPROVED_PROMPT =
+  "Plan approved. You now have full tool access (read, bash, edit, write). Execute the plan in {{planFilePath}}. {{doneMsg}}";
+
+export const 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}}\n\n## Implementation Notes\n\nThe user approved your plan but added the following notes to consider during implementation:\n\n{{feedback}}\n\nProceed with implementation, incorporating these notes where applicable.";
+
+export const DEFAULT_PLAN_AUTO_APPROVED_PROMPT =
+  "Plan auto-approved (non-interactive mode). Execute the plan now.";
+
+export const DEFAULT_ANNOTATE_FILE_FEEDBACK_PROMPT =
+  "# Markdown Annotations\n\n{{fileHeader}}: {{filePath}}\n\n{{feedback}}\n\nPlease address the annotation feedback above.";
+
+export const DEFAULT_ANNOTATE_MESSAGE_FEEDBACK_PROMPT =
+  "# Message Annotations\n\n{{feedback}}\n\nPlease address the annotation feedback above.";
+
+export const DEFAULT_ANNOTATE_APPROVED_PROMPT = "The user approved.";
+
+// ─── Core resolver ───────────────────────────────────────────────────────────
+
+type PromptSection = "review" | "plan" | "annotate";
+type PromptKey = "approved" | "approvedWithNotes" | "autoApproved" | "denied"
+  | "fileFeedback" | "messageFeedback";
+
+interface PromptLookupOptions {
+  section: PromptSection;
+  key: PromptKey;
+  runtime?: PromptRuntime | null;
+  config?: PlannotatorConfig;
+  fallback: string;
+  runtimeFallbacks?: Partial<Record<PromptRuntime, string>>;
+}
+
+function normalizePrompt(prompt: unknown): string | undefined {
+  if (typeof prompt !== "string") return undefined;
+  return prompt.trim() ? prompt : undefined;
+}
+
+export function getConfiguredPrompt(options: PromptLookupOptions): string {
+  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;
+}
+
+type FeedbackVars = Record<string, string | undefined>;
+
+// ─── Review wrappers ─────────────────────────────────────────────────────────
+
+export function getReviewApprovedPrompt(
+  runtime?: PromptRuntime | null,
+  config?: PlannotatorConfig,
+): string {
+  return getConfiguredPrompt({
+    section: "review",
+    key: "approved",
+    runtime,
+    config,
+    fallback: DEFAULT_REVIEW_APPROVED_PROMPT,
+  });
+}
+
+const REVIEW_DENIED_RUNTIME_DEFAULTS: Partial<Record<PromptRuntime, string>> = {
+  opencode: "\n\nPlease address this feedback.",
+  pi: "\n\nPlease address this feedback.",
+};
+
+export function getReviewDeniedSuffix(
+  runtime?: PromptRuntime | null,
+  config?: PlannotatorConfig,
+): string {
+  return getConfiguredPrompt({
+    section: "review",
+    key: "denied",
+    runtime,
+    config,
+    fallback: DEFAULT_REVIEW_DENIED_SUFFIX,
+    runtimeFallbacks: REVIEW_DENIED_RUNTIME_DEFAULTS,
+  });
+}
+
+// ─── Plan wrappers ───────────────────────────────────────────────────────────
+
+export function getPlanDeniedPrompt(
+  runtime?: PromptRuntime | null,
+  config?: PlannotatorConfig,
+  vars?: FeedbackVars,
+): string {
+  const template = getConfiguredPrompt({
+    section: "plan",
+    key: "denied",
+    runtime,
+    config,
+    fallback: DEFAULT_PLAN_DENIED_PROMPT,
+  });
+  return resolveTemplate(template, vars ?? {});
+}
+
+const PLAN_APPROVED_RUNTIME_DEFAULTS: Partial<Record<PromptRuntime, string>> = {
+  opencode: "Plan approved!{{doneMsg}}",
+};
+
+export function getPlanApprovedPrompt(
+  runtime?: PromptRuntime | null,
+  config?: PlannotatorConfig,
+  vars?: FeedbackVars,
+): string {
+  const template = getConfiguredPrompt({
+    section: "plan",
+    key: "approved",
+    runtime,
+    config,
+    fallback: DEFAULT_PLAN_APPROVED_PROMPT,
+    runtimeFallbacks: PLAN_APPROVED_RUNTIME_DEFAULTS,
+  });
+  return resolveTemplate(template, vars ?? {});
+}
+
+const PLAN_APPROVED_WITH_NOTES_RUNTIME_DEFAULTS: Partial<Record<PromptRuntime, string>> = {
+  opencode: "Plan approved with notes!\n{{doneMsg}}\n\n## Implementation Notes\n\nThe user approved your plan but added the following notes to consider during implementation:\n\n{{feedback}}\n\nProceed with implementation, incorporating these notes where applicable.",
+};
+
+export function getPlanApprovedWithNotesPrompt(
+  runtime?: PromptRuntime | null,
+  config?: PlannotatorConfig,
+  vars?: FeedbackVars,
+): string {
+  const template = getConfiguredPrompt({
+    section: "plan",
+    key: "approvedWithNotes",
+    runtime,
+    config,
+    fallback: DEFAULT_PLAN_APPROVED_WITH_NOTES_PROMPT,
+    runtimeFallbacks: PLAN_APPROVED_WITH_NOTES_RUNTIME_DEFAULTS,
+  });
+  return resolveTemplate(template, vars ?? {});
+}
+
+export function getPlanAutoApprovedPrompt(
+  runtime?: PromptRuntime | null,
+  config?: PlannotatorConfig,
+): string {
+  return getConfiguredPrompt({
+    section: "plan",
+    key: "autoApproved",
+    runtime,
+    config,
+    fallback: DEFAULT_PLAN_AUTO_APPROVED_PROMPT,
+  });
+}
+
+// ─── Annotate wrappers ──────────────────────────────────────────────────────
+
+export function getAnnotateFileFeedbackPrompt(
+  runtime?: PromptRuntime | null,
+  config?: PlannotatorConfig,
+  vars?: FeedbackVars,
+): string {
+  const template = getConfiguredPrompt({
+    section: "annotate",
+    key: "fileFeedback",
+    runtime,
+    config,
+    fallback: DEFAULT_ANNOTATE_FILE_FEEDBACK_PROMPT,
+  });
+  return resolveTemplate(template, vars ?? {});
+}
+
+export function getAnnotateMessageFeedbackPrompt(
+  runtime?: PromptRuntime | null,
+  config?: PlannotatorConfig,
+  vars?: FeedbackVars,
+): string {
+  const template = getConfiguredPrompt({
+    section: "annotate",
+    key: "messageFeedback",
+    runtime,
+    config,
+    fallback: DEFAULT_ANNOTATE_MESSAGE_FEEDBACK_PROMPT,
+  });
+  return resolveTemplate(template, vars ?? {});
+}
+
+export function getAnnotateApprovedPrompt(
+  runtime?: PromptRuntime | null,
+  config?: PlannotatorConfig,
+): string {
+  return getConfiguredPrompt({
+    section: "annotate",
+    key: "approved",
+    runtime,
+    config,
+    fallback: DEFAULT_ANNOTATE_APPROVED_PROMPT,
+  });
+}

package/index.ts

@@ -31,12 +31,23 @@ import {
 	markCompletedSteps,
 	parseChecklist,
 } from "./generated/checklist.js";
-import { planDenyFeedback } from "./generated/feedback-templates.js";
 import { hasMarkdownFiles, resolveUserPath } from "./generated/resolve-file.js";
 import { FILE_BROWSER_EXCLUDED } from "./generated/reference-common.js";
 import { htmlToMarkdown } from "./generated/html-to-markdown.js";
 import { urlToMarkdown, isConvertedSource } from "./generated/url-to-markdown.js";
 import { loadConfig, resolveUseJina } from "./generated/config.js";
+import {
+	getReviewApprovedPrompt,
+	getReviewDeniedSuffix,
+	getPlanDeniedPrompt,
+	getPlanApprovedPrompt,
+	getPlanApprovedWithNotesPrompt,
+	getPlanAutoApprovedPrompt,
+	getPlanToolName,
+	buildPlanFileRule,
+	getAnnotateFileFeedbackPrompt,
+	getAnnotateMessageFeedbackPrompt,
+} from "./generated/prompts.js";
 import { parseAnnotateArgs } from "./generated/annotate-args.js";
 import { resolveAtReference } from "./generated/at-reference.js";
 import {
@@ -313,7 +324,7 @@ export default function plannotator(pi: ExtensionAPI): void {
 				} else if (result.feedback) {
 					if (result.approved) {
 						pi.sendUserMessage(
-							`# Code Review\n\nCode review completed — no changes requested.`,
+							getReviewApprovedPrompt("pi", loadConfig()),
 						);
 					} else if (isPRReview) {
 						// Platform PR actions (approve/comment) return approved:false with a
@@ -321,7 +332,7 @@ export default function plannotator(pi: ExtensionAPI): void {
 						pi.sendUserMessage(result.feedback);
 					} else {
 						pi.sendUserMessage(
-							`${result.feedback}\n\nPlease address this feedback.`,
+							`${result.feedback}${getReviewDeniedSuffix("pi", loadConfig())}`,
 						);
 					}
 				} else {
@@ -437,12 +448,11 @@ export default function plannotator(pi: ExtensionAPI): void {
 				} else if (result.exit) {
 					ctx.ui.notify("Annotation session closed.", "info");
 				} else if (result.feedback) {
-					const header = isFolder
-						? `# Markdown Annotations\n\nFolder: ${absolutePath}\n\n`
-						: `# Markdown Annotations\n\nFile: ${absolutePath}\n\n`;
-					pi.sendUserMessage(
-						`${header}${result.feedback}\n\nPlease address the annotation feedback above.`,
-					);
+					pi.sendUserMessage(getAnnotateFileFeedbackPrompt("pi", loadConfig(), {
+						fileHeader: isFolder ? "Folder" : "File",
+						filePath: absolutePath,
+						feedback: result.feedback,
+					}));
 				} else {
 					ctx.ui.notify("Annotation closed (no feedback).", "info");
 				}
@@ -484,9 +494,9 @@ export default function plannotator(pi: ExtensionAPI): void {
 				} else if (result.exit) {
 					ctx.ui.notify("Annotation session closed.", "info");
 				} else if (result.feedback) {
-					pi.sendUserMessage(
-						`# Message Annotations\n\n${result.feedback}\n\nPlease address the annotation feedback above.`,
-					);
+					pi.sendUserMessage(getAnnotateMessageFeedbackPrompt("pi", loadConfig(), {
+						feedback: result.feedback,
+					}));
 				} else {
 					ctx.ui.notify("Annotation closed (no feedback).", "info");
 				}
@@ -654,7 +664,7 @@ export default function plannotator(pi: ExtensionAPI): void {
 					content: [
 						{
 							type: "text",
-							text: "Plan auto-approved (non-interactive mode). Execute the plan now.",
+							text: getPlanAutoApprovedPrompt("pi", loadConfig()),
 						},
 					],
 					details: { approved: true },
@@ -689,7 +699,11 @@ export default function plannotator(pi: ExtensionAPI): void {
 						content: [
 							{
 								type: "text",
-								text: `Plan approved with notes! You now have full tool access (read, bash, edit, write). Execute the plan in ${inputPath}. ${doneMsg}\n\n## Implementation Notes\n\nThe user approved your plan but added the following notes to consider during implementation:\n\n${result.feedback}\n\nProceed with implementation, incorporating these notes where applicable.`,
+								text: getPlanApprovedWithNotesPrompt("pi", loadConfig(), {
+									planFilePath: inputPath,
+									doneMsg,
+									feedback: result.feedback,
+								}),
 							},
 						],
 						details: { approved: true, feedback: result.feedback },
@@ -700,7 +714,10 @@ export default function plannotator(pi: ExtensionAPI): void {
 					content: [
 						{
 							type: "text",
-							text: `Plan approved. You now have full tool access (read, bash, edit, write). Execute the plan in ${inputPath}. ${doneMsg}`,
+							text: getPlanApprovedPrompt("pi", loadConfig(), {
+								planFilePath: inputPath,
+								doneMsg,
+							}),
 						},
 					],
 					details: { approved: true },
@@ -714,8 +731,10 @@ export default function plannotator(pi: ExtensionAPI): void {
 				content: [
 					{
 						type: "text",
-						text: planDenyFeedback(feedbackText, PLAN_SUBMIT_TOOL, {
-							planFilePath: inputPath,
+						text: getPlanDeniedPrompt("pi", loadConfig(), {
+							toolName: getPlanToolName("pi"),
+							planFileRule: buildPlanFileRule(getPlanToolName("pi"), inputPath),
+							feedback: feedbackText,
 						}),
 					},
 				],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/pi-extension",
-  "version": "0.19.2",
+  "version": "0.19.3",
   "type": "module",
   "description": "Plannotator extension for Pi coding agent - interactive plan review with visual annotation",
   "author": "backnotprop",