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

package/.pi-fleet-tested-version

@@ -1 +1 @@
-0.83.0
+0.84.4

package/index.ts

@@ -21,12 +21,15 @@ function appendPrompt(ctx: ExtensionCommandContext, prompt: string): void {
 
 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 {
-		if (activeWindow == null) return;
+		annotationAttempt += 1;
 		const windowToClose = activeWindow;
 		activeWindow = null;
+		if (windowToClose == null) return;
 		if (options.suppressResults) {
 			suppressedWindows.add(windowToClose);
 		}
@@ -42,7 +45,7 @@ export function registerAnnotateLastMessageCommand(pi: ExtensionAPI): void {
 			ctx.ui.notify("annotate-last-message requires interactive mode.", "error");
 			return;
 		}
-		if (activeWindow != null) {
+		if (annotationOpening || activeWindow != null) {
 			ctx.ui.notify("A last-message annotation window is already open.", "warning");
 			return;
 		}
@@ -54,6 +57,8 @@ export function registerAnnotateLastMessageCommand(pi: ExtensionAPI): void {
 		}
 
 		const messageData = messageResult.data;
+		annotationOpening = true;
+		const attempt = ++annotationAttempt;
 
 		try {
 			const html = buildAnnotateLastMessageHtml(messageData);
@@ -62,13 +67,28 @@ export function registerAnnotateLastMessageCommand(pi: ExtensionAPI): void {
 				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);
@@ -91,6 +111,7 @@ export function registerAnnotateLastMessageCommand(pi: ExtensionAPI): void {
 
 					const onMessage = (data: unknown): void => {
 						if (isSubmitPayload(data) || isCancelPayload(data)) {
+							requestWindowClose();
 							settle(data);
 						}
 					};
@@ -106,6 +127,7 @@ export function registerAnnotateLastMessageCommand(pi: ExtensionAPI): void {
 					const onError = (error: Error): void => {
 						if (settled) return;
 						settled = true;
+						requestWindowClose();
 						cleanup();
 						reject(error);
 					};
@@ -113,6 +135,8 @@ export function registerAnnotateLastMessageCommand(pi: ExtensionAPI): void {
 					window.on("message", onMessage);
 					window.on("closed", onClosed);
 					window.on("error", onError);
+					if (window.failure != null) onError(window.failure);
+					else if (window.closed) onClosed();
 				},
 			);
 
@@ -145,6 +169,8 @@ export function registerAnnotateLastMessageCommand(pi: ExtensionAPI): void {
 			closeActiveWindow({ suppressResults: true });
 			const message = error instanceof Error ? error.message : String(error);
 			ctx.ui.notify(`Annotation failed: ${message}`, "error");
+		} finally {
+			annotationOpening = false;
 		}
 	}
 

package/package.json

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

package/quiet-glimpse.ts

@@ -23,6 +23,8 @@ interface GlimpseProtocolMessage {
 }
 
 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;
@@ -38,11 +40,15 @@ class QuietGlimpseWindowImpl extends EventEmitter implements QuietGlimpseWindow
 	#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) => {
@@ -55,7 +61,7 @@ class QuietGlimpseWindowImpl extends EventEmitter implements QuietGlimpseWindow
 			try {
 				message = JSON.parse(line) as GlimpseProtocolMessage;
 			} catch {
-				this.emit("error", new Error(`Malformed glimpse protocol line: ${line}`));
+				this.#reportError(new Error(`Malformed glimpse protocol line: ${line}`));
 				return;
 			}
 
@@ -77,16 +83,18 @@ class QuietGlimpseWindowImpl extends EventEmitter implements QuietGlimpseWindow
 			}
 		});
 
-		proc.on("error", (error) => this.emit("error", error));
+		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.emit("error", new Error(message));
+				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 {
@@ -97,6 +105,19 @@ class QuietGlimpseWindowImpl extends EventEmitter implements QuietGlimpseWindow
 		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;