@diegopetrucci/pi-extensions 0.1.74 → 0.1.76

package/extensions/annotate-last-message/index.ts

@@ -4,228 +4,232 @@ import { openQuietGlimpse, type QuietGlimpseWindow } from "./quiet-glimpse.js";
 import { composeAnnotateLastMessagePrompt, hasAnnotateLastMessageFeedback } from "./prompt.js";
 import { findLastAssistantMessage } from "./session.js";
 import type {
-	AnnotateLastMessageCancelPayload,
-	AnnotateLastMessageInlineComment,
-	AnnotateLastMessageSectionComment,
-	AnnotateLastMessageSubmitPayload,
-	AnnotateLastMessageWindowMessage,
-	LastAssistantMessageData,
+  AnnotateLastMessageCancelPayload,
+  AnnotateLastMessageInlineComment,
+  AnnotateLastMessageSectionComment,
+  AnnotateLastMessageSubmitPayload,
+  AnnotateLastMessageWindowMessage,
+  LastAssistantMessageData,
 } from "./types.js";
 import { buildAnnotateLastMessageHtml } from "./ui.js";
 
 function isInlineComment(value: unknown): value is AnnotateLastMessageInlineComment {
-	return (
-		typeof value === "object" &&
-		value != null &&
-		"line" in value &&
-		typeof value.line === "number" &&
-		Number.isInteger(value.line) &&
-		value.line > 0 &&
-		"body" in value &&
-		typeof value.body === "string"
-	);
+  return (
+    typeof value === "object" &&
+    value != null &&
+    "line" in value &&
+    typeof value.line === "number" &&
+    Number.isInteger(value.line) &&
+    value.line > 0 &&
+    "body" in value &&
+    typeof value.body === "string"
+  );
 }
 
 function isSectionComment(value: unknown): value is AnnotateLastMessageSectionComment {
-	return (
-		typeof value === "object" &&
-		value != null &&
-		"sectionId" in value &&
-		typeof value.sectionId === "string" &&
-		"body" in value &&
-		typeof value.body === "string"
-	);
+  return (
+    typeof value === "object" &&
+    value != null &&
+    "sectionId" in value &&
+    typeof value.sectionId === "string" &&
+    "body" in value &&
+    typeof value.body === "string"
+  );
 }
 
 function isSubmitPayload(value: unknown): value is AnnotateLastMessageSubmitPayload {
-	return (
-		typeof value === "object" &&
-		value != null &&
-		"type" in value &&
-		value.type === "submit" &&
-		"overallComment" in value &&
-		typeof value.overallComment === "string" &&
-		"inlineComments" in value &&
-		Array.isArray(value.inlineComments) &&
-		value.inlineComments.every(isInlineComment) &&
-		"sectionComments" in value &&
-		Array.isArray(value.sectionComments) &&
-		value.sectionComments.every(isSectionComment)
-	);
+  return (
+    typeof value === "object" &&
+    value != null &&
+    "type" in value &&
+    value.type === "submit" &&
+    "overallComment" in value &&
+    typeof value.overallComment === "string" &&
+    "inlineComments" in value &&
+    Array.isArray(value.inlineComments) &&
+    value.inlineComments.every(isInlineComment) &&
+    "sectionComments" in value &&
+    Array.isArray(value.sectionComments) &&
+    value.sectionComments.every(isSectionComment)
+  );
 }
 
 function isCancelPayload(value: unknown): value is AnnotateLastMessageCancelPayload {
-	return typeof value === "object" && value != null && "type" in value && value.type === "cancel";
+  return typeof value === "object" && value != null && "type" in value && value.type === "cancel";
 }
 
-export function registerAnnotateLastMessageCommand(pi: ExtensionAPI): void {
-	let activeWindow: QuietGlimpseWindow | null = null;
-	let annotationOpening = false;
-	let annotationAttempt = 0;
-	const suppressedWindows = new WeakSet<QuietGlimpseWindow>();
-
-	function closeActiveWindow(options: { suppressResults?: boolean } = {}): void {
-		annotationAttempt += 1;
-		const windowToClose = activeWindow;
-		activeWindow = null;
-		if (windowToClose == null) return;
-		if (options.suppressResults) {
-			suppressedWindows.add(windowToClose);
-		}
-		try {
-			windowToClose.close();
-		} catch {
-			// Ignore races when the native window is already closing.
-		}
-	}
-
-	async function openAnnotationWindow(ctx: ExtensionCommandContext): Promise<void> {
-		if (ctx.mode !== "tui") {
-			ctx.ui.notify("annotate-last-message requires interactive mode.", "error");
-			return;
-		}
-		if (annotationOpening || activeWindow != null) {
-			ctx.ui.notify("A last-message annotation window is already open.", "warning");
-			return;
-		}
-
-		const messageResult = findLastAssistantMessage(ctx.sessionManager.getBranch());
-		if (!messageResult.ok) {
-			ctx.ui.notify(messageResult.message, "error");
-			return;
-		}
-
-		const messageData = messageResult.data;
-		annotationOpening = true;
-		const attempt = ++annotationAttempt;
-
-		try {
-			const html = buildAnnotateLastMessageHtml(messageData, ctx.ui.theme);
-			const window = await openQuietGlimpse(html, {
-				width: 1440,
-				height: 980,
-				title: "annotate last message",
-			});
-			if (attempt !== annotationAttempt) {
-				suppressedWindows.add(window);
-				window.close();
-				return;
-			}
-			activeWindow = window;
-			if (window.failure != null) throw window.failure;
-			if (window.closed) throw new Error("Glimpse closed while the annotation window was starting.");
-
-			const terminalMessagePromise = new Promise<AnnotateLastMessageSubmitPayload | AnnotateLastMessageCancelPayload | null>(
-				(resolve, reject) => {
-					let settled = false;
-					let closeTimer: ReturnType<typeof setTimeout> | null = null;
-
-					const requestWindowClose = (): void => {
-						try {
-							window.close();
-						} catch {
-							// Ignore races when the native process has already exited.
-						}
-					};
-
-					const cleanup = (): void => {
-						if (closeTimer != null) {
-							clearTimeout(closeTimer);
-							closeTimer = null;
-						}
-						window.removeListener("message", onMessage);
-						window.removeListener("closed", onClosed);
-						window.removeListener("error", onError);
-						if (activeWindow === window) {
-							activeWindow = null;
-						}
-					};
-
-					const settle = (value: AnnotateLastMessageWindowMessage | null): void => {
-						if (settled) return;
-						settled = true;
-						cleanup();
-						resolve(value);
-					};
-
-					const onMessage = (data: unknown): void => {
-						if (isSubmitPayload(data) || isCancelPayload(data)) {
-							settle(data);
-							requestWindowClose();
-						}
-					};
-
-					const onClosed = (): void => {
-						if (settled || closeTimer != null) return;
-						closeTimer = setTimeout(() => {
-							closeTimer = null;
-							settle(null);
-						}, 250);
-					};
-
-					const onError = (error: Error): void => {
-						if (settled) return;
-						settled = true;
-						requestWindowClose();
-						cleanup();
-						reject(error);
-					};
-
-					window.on("message", onMessage);
-					window.on("closed", onClosed);
-					window.on("error", onError);
-					if (window.failure != null) onError(window.failure);
-					else if (window.closed) onClosed();
-				},
-			);
-
-			void (async (windowMessageSource: QuietGlimpseWindow, sourceData: LastAssistantMessageData) => {
-				try {
-					const result = await terminalMessagePromise;
-					if (suppressedWindows.has(windowMessageSource) || attempt !== annotationAttempt) return;
-					if (result == null) return;
-					if (result.type === "cancel") {
-						ctx.ui.notify("Annotation cancelled.", "info");
-						return;
-					}
-					if (!hasAnnotateLastMessageFeedback(result)) {
-						ctx.ui.notify("No annotation feedback submitted.", "info");
-						return;
-					}
-
-					const prompt = composeAnnotateLastMessagePrompt(sourceData, result);
-					pi.sendUserMessage(prompt, { deliverAs: "followUp" });
-					ctx.ui.notify("Annotation feedback sent to the agent.", "info");
-				} catch (error) {
-					if (suppressedWindows.has(windowMessageSource) || attempt !== annotationAttempt) return;
-					const message = error instanceof Error ? error.message : String(error);
-					ctx.ui.notify(`Annotation failed: ${message}`, "error");
-				}
-			})(window, messageData);
-
-			ctx.ui.notify("Opened native annotation window.", "info");
-		} catch (error) {
-			if (attempt !== annotationAttempt) return;
-			closeActiveWindow({ suppressResults: true });
-			const message = error instanceof Error ? error.message : String(error);
-			ctx.ui.notify(`Annotation failed: ${message}`, "error");
-		} finally {
-			annotationOpening = false;
-		}
-	}
-
-	pi.registerCommand("annotate-last-message", {
-		description: "Open a native annotation window for the latest assistant message",
-		handler: async (_args, ctx) => {
-			await openAnnotationWindow(ctx);
-		},
-	});
-
-	pi.on("session_shutdown", async () => {
-		closeActiveWindow({ suppressResults: true });
-	});
+function registerAnnotateLastMessageCommand(pi: ExtensionAPI): void {
+  let activeWindow: QuietGlimpseWindow | null = null;
+  let annotationOpening = false;
+  let annotationAttempt = 0;
+  const suppressedWindows = new WeakSet<QuietGlimpseWindow>();
+
+  function closeActiveWindow(options: { suppressResults?: boolean } = {}): void {
+    annotationAttempt += 1;
+    const windowToClose = activeWindow;
+    activeWindow = null;
+    if (windowToClose == null) return;
+    if (options.suppressResults) {
+      suppressedWindows.add(windowToClose);
+    }
+    try {
+      windowToClose.close();
+    } catch {
+      // Ignore races when the native window is already closing.
+    }
+  }
+
+  async function openAnnotationWindow(ctx: ExtensionCommandContext): Promise<void> {
+    if (ctx.mode !== "tui") {
+      ctx.ui.notify("annotate-last-message requires interactive mode.", "error");
+      return;
+    }
+    if (annotationOpening || activeWindow != null) {
+      ctx.ui.notify("A last-message annotation window is already open.", "warning");
+      return;
+    }
+
+    const messageResult = findLastAssistantMessage(ctx.sessionManager.getBranch());
+    if (!messageResult.ok) {
+      ctx.ui.notify(messageResult.message, "error");
+      return;
+    }
+
+    const messageData = messageResult.data;
+    annotationOpening = true;
+    const attempt = ++annotationAttempt;
+
+    try {
+      const html = buildAnnotateLastMessageHtml(messageData, ctx.ui.theme);
+      const window = await openQuietGlimpse(html, {
+        width: 1440,
+        height: 980,
+        title: "annotate last message",
+      });
+      if (attempt !== annotationAttempt) {
+        suppressedWindows.add(window);
+        window.close();
+        return;
+      }
+      activeWindow = window;
+      if (window.failure != null) throw window.failure;
+      if (window.closed)
+        throw new Error("Glimpse closed while the annotation window was starting.");
+
+      const terminalMessagePromise = new Promise<
+        AnnotateLastMessageSubmitPayload | AnnotateLastMessageCancelPayload | null
+      >((resolve, reject) => {
+        let settled = false;
+        let closeTimer: ReturnType<typeof setTimeout> | null = null;
+
+        const requestWindowClose = (): void => {
+          try {
+            window.close();
+          } catch {
+            // Ignore races when the native process has already exited.
+          }
+        };
+
+        const cleanup = (): void => {
+          if (closeTimer != null) {
+            clearTimeout(closeTimer);
+            closeTimer = null;
+          }
+          window.removeListener("message", onMessage);
+          window.removeListener("closed", onClosed);
+          window.removeListener("error", onError);
+          if (activeWindow === window) {
+            activeWindow = null;
+          }
+        };
+
+        const settle = (value: AnnotateLastMessageWindowMessage | null): void => {
+          if (settled) return;
+          settled = true;
+          cleanup();
+          resolve(value);
+        };
+
+        const onMessage = (data: unknown): void => {
+          if (isSubmitPayload(data) || isCancelPayload(data)) {
+            settle(data);
+            requestWindowClose();
+          }
+        };
+
+        const onClosed = (): void => {
+          if (settled || closeTimer != null) return;
+          closeTimer = setTimeout(() => {
+            closeTimer = null;
+            settle(null);
+          }, 250);
+        };
+
+        const onError = (error: Error): void => {
+          if (settled) return;
+          settled = true;
+          requestWindowClose();
+          cleanup();
+          reject(error);
+        };
+
+        window.on("message", onMessage);
+        window.on("closed", onClosed);
+        window.on("error", onError);
+        if (window.failure != null) onError(window.failure);
+        else if (window.closed) onClosed();
+      });
+
+      void (async (
+        windowMessageSource: QuietGlimpseWindow,
+        sourceData: LastAssistantMessageData,
+      ) => {
+        try {
+          const result = await terminalMessagePromise;
+          if (suppressedWindows.has(windowMessageSource) || attempt !== annotationAttempt) return;
+          if (result == null) return;
+          if (result.type === "cancel") {
+            ctx.ui.notify("Annotation cancelled.", "info");
+            return;
+          }
+          if (!hasAnnotateLastMessageFeedback(result)) {
+            ctx.ui.notify("No annotation feedback submitted.", "info");
+            return;
+          }
+
+          const prompt = composeAnnotateLastMessagePrompt(sourceData, result);
+          pi.sendUserMessage(prompt, { deliverAs: "followUp" });
+          ctx.ui.notify("Annotation feedback sent to the agent.", "info");
+        } catch (error) {
+          if (suppressedWindows.has(windowMessageSource) || attempt !== annotationAttempt) return;
+          const message = error instanceof Error ? error.message : String(error);
+          ctx.ui.notify(`Annotation failed: ${message}`, "error");
+        }
+      })(window, messageData);
+
+      ctx.ui.notify("Opened native annotation window.", "info");
+    } catch (error) {
+      if (attempt !== annotationAttempt) return;
+      closeActiveWindow({ suppressResults: true });
+      const message = error instanceof Error ? error.message : String(error);
+      ctx.ui.notify(`Annotation failed: ${message}`, "error");
+    } finally {
+      annotationOpening = false;
+    }
+  }
+
+  pi.registerCommand("annotate-last-message", {
+    description: "Open a native annotation window for the latest assistant message",
+    handler: async (_args, ctx) => {
+      await openAnnotationWindow(ctx);
+    },
+  });
+
+  pi.on("session_shutdown", async () => {
+    closeActiveWindow({ suppressResults: true });
+  });
 }
 
 export default function (pi: ExtensionAPI): void {
-	registerAnnotateLastMessageCommand(pi);
+  registerAnnotateLastMessageCommand(pi);
 }

package/extensions/annotate-last-message/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-annotate-last-message",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "A standalone pi extension that adds /annotate-last-message, a native Glimpse UI for annotating the latest assistant reply.",
   "keywords": [
     "pi-package",

package/extensions/annotate-last-message/prompt.ts

@@ -1,93 +1,114 @@
-import type { AnnotateLastMessageInlineComment, AnnotateLastMessageSectionComment, AnnotateLastMessageSubmitPayload, LastAssistantMessageData, LastAssistantMessageLine, LastAssistantMessageSection } from "./types.js";
+import type {
+  AnnotateLastMessageInlineComment,
+  AnnotateLastMessageSectionComment,
+  AnnotateLastMessageSubmitPayload,
+  LastAssistantMessageData,
+  LastAssistantMessageLine,
+  LastAssistantMessageSection,
+} from "./types.js";
 
 const EXCERPT_LIMIT = 120;
 
 function truncateExcerpt(value: string, limit = EXCERPT_LIMIT): string {
-	const normalized = value.replace(/\s+/g, " ").trim();
-	if (normalized.length === 0) return "(blank line)";
-	if (normalized.length <= limit) return normalized;
-	return `${normalized.slice(0, Math.max(0, limit - 1)).trimEnd()}…`;
+  const normalized = value.replace(/\s+/g, " ").trim();
+  if (normalized.length === 0) return "(blank line)";
+  if (normalized.length <= limit) return normalized;
+  return `${normalized.slice(0, Math.max(0, limit - 1)).trimEnd()}…`;
 }
 
 function formatLineLabel(line: number): string {
-	return `line ${line}`;
+  return `line ${line}`;
 }
 
-function formatLineComment(comment: AnnotateLastMessageInlineComment, line: LastAssistantMessageLine | undefined): string {
-	const excerpt = truncateExcerpt(line?.text ?? "");
-	return `${formatLineLabel(comment.line)} — “${excerpt}”`;
+function formatLineComment(
+  comment: AnnotateLastMessageInlineComment,
+  line: LastAssistantMessageLine | undefined,
+): string {
+  const excerpt = truncateExcerpt(line?.text ?? "");
+  return `${formatLineLabel(comment.line)} — “${excerpt}”`;
 }
 
 function formatSectionLineRange(section: LastAssistantMessageSection): string {
-	return section.startLine === section.endLine
-		? `line ${section.startLine}`
-		: `lines ${section.startLine}-${section.endLine}`;
+  return section.startLine === section.endLine
+    ? `line ${section.startLine}`
+    : `lines ${section.startLine}-${section.endLine}`;
 }
 
-function formatSectionComment(comment: AnnotateLastMessageSectionComment, section: LastAssistantMessageSection | undefined): string {
-	if (section == null) {
-		return "Unknown section";
-	}
-	return `Section ${section.index} (${formatSectionLineRange(section)}) — “${truncateExcerpt(section.preview)}”`;
+function formatSectionComment(
+  comment: AnnotateLastMessageSectionComment,
+  section: LastAssistantMessageSection | undefined,
+): string {
+  if (section == null) {
+    return "Unknown section";
+  }
+  return `Section ${section.index} (${formatSectionLineRange(section)}) — “${truncateExcerpt(section.preview)}”`;
 }
 
 export function hasAnnotateLastMessageFeedback(payload: AnnotateLastMessageSubmitPayload): boolean {
-	if (payload.overallComment.trim().length > 0) {
-		return true;
-	}
-	if (payload.inlineComments.some((comment) => comment.body.trim().length > 0)) {
-		return true;
-	}
-	return payload.sectionComments.some((comment) => comment.body.trim().length > 0);
+  if (payload.overallComment.trim().length > 0) {
+    return true;
+  }
+  if (payload.inlineComments.some((comment) => comment.body.trim().length > 0)) {
+    return true;
+  }
+  return payload.sectionComments.some((comment) => comment.body.trim().length > 0);
 }
 
 export function composeAnnotateLastMessagePrompt(
-	message: LastAssistantMessageData,
-	payload: AnnotateLastMessageSubmitPayload,
+  message: LastAssistantMessageData,
+  payload: AnnotateLastMessageSubmitPayload,
 ): string {
-	const lineMap = new Map(message.lines.map((line) => [line.number, line]));
-	const sectionMap = new Map(message.sections.map((section) => [section.id, section]));
-	const inlineComments = payload.inlineComments
-		.filter((comment) => comment.body.trim().length > 0)
-		.sort((left, right) => left.line - right.line);
-	const sectionComments = payload.sectionComments
-		.filter((comment) => comment.body.trim().length > 0)
-		.sort((left, right) => (sectionMap.get(left.sectionId)?.index ?? Number.MAX_SAFE_INTEGER) - (sectionMap.get(right.sectionId)?.index ?? Number.MAX_SAFE_INTEGER));
-	const lines: string[] = [];
+  const lineMap = new Map(message.lines.map((line) => [line.number, line]));
+  const sectionMap = new Map(message.sections.map((section) => [section.id, section]));
+  const inlineComments = payload.inlineComments
+    .filter((comment) => comment.body.trim().length > 0)
+    .sort((left, right) => left.line - right.line);
+  const sectionComments = payload.sectionComments
+    .filter((comment) => comment.body.trim().length > 0)
+    .sort(
+      (left, right) =>
+        (sectionMap.get(left.sectionId)?.index ?? Number.MAX_SAFE_INTEGER) -
+        (sectionMap.get(right.sectionId)?.index ?? Number.MAX_SAFE_INTEGER),
+    );
+  const lines: string[] = [];
 
-	lines.push("Please revisit your last assistant message using the annotation feedback below.");
-	lines.push("");
-	lines.push("Treat this as planning-oriented feedback:");
-	lines.push("- update your explanation, plan, or proposed approach in chat;");
-	lines.push("- do not assume any code or file changes have already been applied;");
-	lines.push("- do not auto-apply anything outside the normal response flow.");
-	lines.push("");
+  lines.push("Please revisit your last assistant message using the annotation feedback below.");
+  lines.push("");
+  lines.push("Treat this as planning-oriented feedback:");
+  lines.push("- update your explanation, plan, or proposed approach in chat;");
+  lines.push("- do not assume any code or file changes have already been applied;");
+  lines.push("- do not auto-apply anything outside the normal response flow.");
+  lines.push("");
 
-	const overallComment = payload.overallComment.trim();
-	if (overallComment.length > 0) {
-		lines.push("## Overall guidance");
-		lines.push(overallComment);
-		lines.push("");
-	}
+  const overallComment = payload.overallComment.trim();
+  if (overallComment.length > 0) {
+    lines.push("## Overall guidance");
+    lines.push(overallComment);
+    lines.push("");
+  }
 
-	if (sectionComments.length > 0) {
-		lines.push("## Section comments");
-		sectionComments.forEach((comment, index) => {
-			lines.push(`${index + 1}. ${formatSectionComment(comment, sectionMap.get(comment.sectionId))}`);
-			lines.push(`   ${comment.body.trim()}`);
-			lines.push("");
-		});
-	}
+  if (sectionComments.length > 0) {
+    lines.push("## Section comments");
+    sectionComments.forEach((comment, index) => {
+      lines.push(
+        `${index + 1}. ${formatSectionComment(comment, sectionMap.get(comment.sectionId))}`,
+      );
+      lines.push(`   ${comment.body.trim()}`);
+      lines.push("");
+    });
+  }
 
-	if (inlineComments.length > 0) {
-		lines.push("## Inline comments");
-		inlineComments.forEach((comment, index) => {
-			lines.push(`${index + 1}. ${formatLineComment(comment, lineMap.get(comment.line))}`);
-			lines.push(`   ${comment.body.trim()}`);
-			lines.push("");
-		});
-	}
+  if (inlineComments.length > 0) {
+    lines.push("## Inline comments");
+    inlineComments.forEach((comment, index) => {
+      lines.push(`${index + 1}. ${formatLineComment(comment, lineMap.get(comment.line))}`);
+      lines.push(`   ${comment.body.trim()}`);
+      lines.push("");
+    });
+  }
 
-	lines.push("Please respond by revising your last message or its plan in chat, incorporating the feedback above.");
-	return lines.join("\n").trim();
+  lines.push(
+    "Please respond by revising your last message or its plan in chat, incorporating the feedback above.",
+  );
+  return lines.join("\n").trim();
 }