@diegopetrucci/pi-annotate-last-message 0.1.9 → 0.1.11

package/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();
 }

package/quiet-glimpse.ts

@@ -7,171 +7,179 @@ import { createInterface } from "node:readline";
 import type { GlimpseOpenOptions } from "glimpseui";
 
 interface NativeHostInfo {
-	path: string;
-	extraArgs?: string[];
-	buildHint?: string;
+  path: string;
+  extraArgs?: string[];
+  buildHint?: string;
 }
 
 interface GlimpseProtocolMessage {
-	type?: string;
-	data?: unknown;
-	screen?: unknown;
-	screens?: unknown;
-	appearance?: unknown;
-	cursor?: unknown;
-	cursorTip?: unknown;
+  type?: string;
+  data?: unknown;
+  screen?: unknown;
+  screens?: unknown;
+  appearance?: unknown;
+  cursor?: unknown;
+  cursorTip?: unknown;
 }
 
 export interface QuietGlimpseWindow {
-	readonly closed: boolean;
-	readonly failure: Error | null;
-	on(event: "message", listener: (data: unknown) => void): this;
-	on(event: "closed", listener: () => void): this;
-	on(event: "error", listener: (error: Error) => void): this;
-	removeListener(event: "message", listener: (data: unknown) => void): this;
-	removeListener(event: "closed", listener: () => void): this;
-	removeListener(event: "error", listener: (error: Error) => void): this;
-	send(js: string): void;
-	close(): void;
+  readonly closed: boolean;
+  readonly failure: Error | null;
+  on(event: "message", listener: (data: unknown) => void): this;
+  on(event: "closed", listener: () => void): this;
+  on(event: "error", listener: (error: Error) => void): this;
+  removeListener(event: "message", listener: (data: unknown) => void): this;
+  removeListener(event: "closed", listener: () => void): this;
+  removeListener(event: "error", listener: (error: Error) => void): this;
+  send(js: string): void;
+  close(): void;
 }
 
 class QuietGlimpseWindowImpl extends EventEmitter implements QuietGlimpseWindow {
-	#proc: ChildProcessWithoutNullStreams;
-	#closed = false;
-	#pendingHTML: string | null;
-	#stderr = "";
-	#failure: Error | null = null;
-
-	constructor(proc: ChildProcessWithoutNullStreams, initialHTML: string) {
-		super();
-		this.#proc = proc;
-		this.#pendingHTML = initialHTML;
-		// EventEmitter treats an unobserved `error` as fatal. Keep a permanent
-		// fallback while callers attach and detach their lifecycle listeners.
-		this.on("error", () => {});
-
-		proc.stdin.on("error", () => {});
-		proc.stderr.on("data", (chunk) => {
-			this.#stderr += chunk.toString();
-		});
-
-		const rl = createInterface({ input: proc.stdout, crlfDelay: Infinity });
-		rl.on("line", (line) => {
-			let message: GlimpseProtocolMessage;
-			try {
-				message = JSON.parse(line) as GlimpseProtocolMessage;
-			} catch {
-				this.#reportError(new Error(`Malformed glimpse protocol line: ${line}`));
-				return;
-			}
-
-			switch (message.type) {
-				case "ready":
-					if (this.#pendingHTML != null) {
-						this.setHTML(this.#pendingHTML);
-						this.#pendingHTML = null;
-					}
-					break;
-				case "message":
-					this.emit("message", message.data);
-					break;
-				case "closed":
-					this.#markClosed();
-					break;
-				default:
-					break;
-			}
-		});
-
-		proc.on("error", (error) => this.#reportError(error));
-		proc.on("exit", (code, signal) => {
-			const stderr = this.#stderr.trim();
-			const failed = signal != null || (code != null && code !== 0);
-			if (!this.#closed && failed) {
-				const message = stderr || `Glimpse process exited abnormally (code: ${code}, signal: ${signal}).`;
-				this.#reportError(new Error(message));
-			}
-			this.#markClosed();
-		});
-		// Spawn failures can emit `error` and then `close` without `exit`.
-		proc.on("close", () => this.#markClosed());
-	}
-
-	send(js: string): void {
-		this.#write({ type: "eval", js });
-	}
-
-	close(): void {
-		this.#write({ type: "close" });
-	}
-
-	get closed(): boolean {
-		return this.#closed;
-	}
-
-	get failure(): Error | null {
-		return this.#failure;
-	}
-
-	#reportError(error: Error): void {
-		this.#failure ??= error;
-		this.emit("error", error);
-	}
-
-	#markClosed(): void {
-		if (this.#closed) return;
-		this.#closed = true;
-		this.emit("closed");
-	}
-
-	#write(obj: Record<string, unknown>): void {
-		if (this.#closed) return;
-		this.#proc.stdin.write(`${JSON.stringify(obj)}\n`);
-	}
-
-	setHTML(html: string): void {
-		this.#write({ type: "html", html: Buffer.from(html).toString("base64") });
-	}
+  #proc: ChildProcessWithoutNullStreams;
+  #closed = false;
+  #pendingHTML: string | null;
+  #stderr = "";
+  #failure: Error | null = null;
+
+  constructor(proc: ChildProcessWithoutNullStreams, initialHTML: string) {
+    super();
+    this.#proc = proc;
+    this.#pendingHTML = initialHTML;
+    // EventEmitter treats an unobserved `error` as fatal. Keep a permanent
+    // fallback while callers attach and detach their lifecycle listeners.
+    this.on("error", () => {});
+
+    proc.stdin.on("error", () => {});
+    proc.stderr.on("data", (chunk) => {
+      this.#stderr += chunk.toString();
+    });
+
+    const rl = createInterface({ input: proc.stdout, crlfDelay: Infinity });
+    rl.on("line", (line) => {
+      let parsed: unknown;
+      try {
+        parsed = JSON.parse(line);
+      } catch {
+        this.#reportError(new Error(`Malformed glimpse protocol line: ${line}`));
+        return;
+      }
+      if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return;
+      const message = parsed as GlimpseProtocolMessage;
+
+      switch (message.type) {
+        case "ready":
+          if (this.#pendingHTML != null) {
+            this.setHTML(this.#pendingHTML);
+            this.#pendingHTML = null;
+          }
+          break;
+        case "message":
+          this.emit("message", message.data);
+          break;
+        case "closed":
+          this.#markClosed();
+          break;
+        default:
+          break;
+      }
+    });
+
+    proc.on("error", (error) => this.#reportError(error));
+    proc.on("exit", (code, signal) => {
+      const stderr = this.#stderr.trim();
+      const failed = signal != null || (code != null && code !== 0);
+      if (!this.#closed && failed) {
+        const message =
+          stderr || `Glimpse process exited abnormally (code: ${code}, signal: ${signal}).`;
+        this.#reportError(new Error(message));
+      }
+      this.#markClosed();
+    });
+    // Spawn failures can emit `error` and then `close` without `exit`.
+    proc.on("close", () => this.#markClosed());
+  }
+
+  send(js: string): void {
+    this.#write({ type: "eval", js });
+  }
+
+  close(): void {
+    this.#write({ type: "close" });
+  }
+
+  get closed(): boolean {
+    return this.#closed;
+  }
+
+  get failure(): Error | null {
+    return this.#failure;
+  }
+
+  #reportError(error: Error): void {
+    this.#failure ??= error;
+    this.emit("error", error);
+  }
+
+  #markClosed(): void {
+    if (this.#closed) return;
+    this.#closed = true;
+    this.emit("closed");
+  }
+
+  #write(obj: Record<string, unknown>): void {
+    if (this.#closed) return;
+    this.#proc.stdin.write(`${JSON.stringify(obj)}\n`);
+  }
+
+  setHTML(html: string): void {
+    this.#write({ type: "html", html: Buffer.from(html).toString("base64") });
+  }
 }
 
 async function getNativeHostInfo(): Promise<NativeHostInfo> {
-	const glimpseModule = (await import("glimpseui")) as unknown as { getNativeHostInfo: () => NativeHostInfo };
-	return glimpseModule.getNativeHostInfo();
+  const glimpseModule = (await import("glimpseui")) as unknown as {
+    getNativeHostInfo: () => NativeHostInfo;
+  };
+  return glimpseModule.getNativeHostInfo();
 }
 
-export async function openQuietGlimpse(html: string, options: GlimpseOpenOptions = {}): Promise<QuietGlimpseWindow> {
-	const host = await getNativeHostInfo();
-	if (!existsSync(host.path)) {
-		const hint = host.buildHint ? ` ${host.buildHint}` : "";
-		throw new Error(`Glimpse host not found at '${host.path}'.${hint}`);
-	}
-	const args: string[] = [];
-
-	if (options.width != null) args.push("--width", String(options.width));
-	if (options.height != null) args.push("--height", String(options.height));
-	if (options.title != null) args.push("--title", options.title);
-	if (options.frameless) args.push("--frameless");
-	if (options.floating) args.push("--floating");
-	if (options.transparent) args.push("--transparent");
-	if (options.clickThrough) args.push("--click-through");
-	if (options.hidden) args.push("--hidden");
-	if (options.autoClose) args.push("--auto-close");
-	if (options.x != null) args.push(`--x=${options.x}`);
-	if (options.y != null) args.push(`--y=${options.y}`);
-	if (options.cursorOffset?.x != null) args.push(`--cursor-offset-x=${options.cursorOffset.x}`);
-	if (options.cursorOffset?.y != null) args.push(`--cursor-offset-y=${options.cursorOffset.y}`);
-	if (options.cursorAnchor != null) args.push("--cursor-anchor", options.cursorAnchor);
-	if (options.followMode != null) args.push("--follow-mode", options.followMode);
-	if (options.followCursor) args.push("--follow-cursor");
-
-	const proc = spawn(host.path, [...(host.extraArgs ?? []), ...args], {
-		stdio: ["pipe", "pipe", "pipe"],
-		windowsHide: process.platform === "win32",
-		env: {
-			...process.env,
-			OS_ACTIVITY_MODE: process.env.OS_ACTIVITY_MODE ?? "disable",
-		},
-	});
-
-	return new QuietGlimpseWindowImpl(proc, html);
+export async function openQuietGlimpse(
+  html: string,
+  options: GlimpseOpenOptions = {},
+): Promise<QuietGlimpseWindow> {
+  const host = await getNativeHostInfo();
+  if (!existsSync(host.path)) {
+    const hint = host.buildHint ? ` ${host.buildHint}` : "";
+    throw new Error(`Glimpse host not found at '${host.path}'.${hint}`);
+  }
+  const args: string[] = [];
+
+  if (options.width != null) args.push("--width", String(options.width));
+  if (options.height != null) args.push("--height", String(options.height));
+  if (options.title != null) args.push("--title", options.title);
+  if (options.frameless) args.push("--frameless");
+  if (options.floating) args.push("--floating");
+  if (options.transparent) args.push("--transparent");
+  if (options.clickThrough) args.push("--click-through");
+  if (options.hidden) args.push("--hidden");
+  if (options.autoClose) args.push("--auto-close");
+  if (options.x != null) args.push(`--x=${options.x}`);
+  if (options.y != null) args.push(`--y=${options.y}`);
+  if (options.cursorOffset?.x != null) args.push(`--cursor-offset-x=${options.cursorOffset.x}`);
+  if (options.cursorOffset?.y != null) args.push(`--cursor-offset-y=${options.cursorOffset.y}`);
+  if (options.cursorAnchor != null) args.push("--cursor-anchor", options.cursorAnchor);
+  if (options.followMode != null) args.push("--follow-mode", options.followMode);
+  if (options.followCursor) args.push("--follow-cursor");
+
+  const proc = spawn(host.path, [...(host.extraArgs ?? []), ...args], {
+    stdio: ["pipe", "pipe", "pipe"],
+    windowsHide: process.platform === "win32",
+    env: {
+      ...process.env,
+      OS_ACTIVITY_MODE: process.env.OS_ACTIVITY_MODE ?? "disable",
+    },
+  });
+
+  return new QuietGlimpseWindowImpl(proc, html);
 }