@danypops/papyrus 0.27.2 → 0.27.4

package/extension/src/discuss-ask-view.ts

@@ -35,6 +35,19 @@ import {
 	wrapTextWithAnsi,
 } from "@earendil-works/pi-tui";
 import { renderSingleSelectRows, type AskOption } from "./discuss-ask-layout.ts";
+import { callService } from "./service-client.ts";
+
+/** Temporary RCA instrumentation for the live-observed duplicate-picker defect. Fire-and-forget: never lets a logging failure affect the actual ask. Remove once root-caused. */
+const DIAG_SOURCE = "papyrus-discuss-ask-diag";
+function diag(message: string, fields?: Record<string, unknown>): void {
+	void callService("logs.append", {
+		source_id: DIAG_SOURCE,
+		source_label: "Discuss live-ask RCA",
+		level: "info",
+		message,
+		...(fields ? { fields } : {}),
+	}).catch(() => {});
+}
 
 /** See pi-ask-user's identical safeMarkdownTheme() comment: a broken theme Proxy throws only on
  * property access, not construction, so a bare try/catch around getMarkdownTheme() alone would
@@ -62,6 +75,12 @@ export interface AskQuestionParams {
 	allowComment?: boolean;
 	displayMode?: AskDisplayMode;
 	timeout?: number;
+	/**
+	 * Joins a second concurrent call for the same key to the first's in-flight promise instead of
+	 * opening a second picker. Pass a stable id (the target Discussion's id) whenever the caller
+	 * cannot otherwise guarantee only one live ask is ever issued for that same question.
+	 */
+	key?: string;
 	/**
 	 * Streamed once before blocking on the human. A live ask can legitimately sit pending far
 	 * longer than a typical tool call (real human response time, not milliseconds) -- without any
@@ -1060,7 +1079,9 @@ async function askViaDialogs(
 
 	const selectOptions = options.map((o) => o.title);
 	if (allowFreeform) selectOptions.push(FREEFORM_SENTINEL);
+	diag("askViaDialogs: calling ui.select", { dialogOpts: dialogOpts === undefined ? null : JSON.stringify(dialogOpts), promptPreview: prompt.slice(0, 80) });
 	const selected = (await ui.select(prompt, selectOptions, dialogOpts)) as string | undefined;
+	diag("askViaDialogs: ui.select resolved", { selected: selected ?? null });
 	if (isCancelledInput(selected)) return null;
 
 	if (selected === FREEFORM_SENTINEL) {
@@ -1091,6 +1112,16 @@ export function isLiveAskPending(): boolean {
 	return livePendingCount > 0;
 }
 
+/**
+ * Keyed reentrancy join: whatever the exact external cause (an upstream retry, a duplicate turn,
+ * anything outside code this package controls -- verified Pi's own ctx.ui.custom() is a clean,
+ * single-shot, well-guarded call with no retry/timeout logic of its own), a second concurrent
+ * askQuestion() call for the SAME key must never open a second picker for the same question. It
+ * joins the already-in-flight promise instead. Keyed by the target Discussion's id (stable across
+ * a genuine duplicate call, unlike a fresh toolCallId each retry might mint).
+ */
+const pendingByKey = new Map<string, Promise<AskAnswer | undefined>>();
+
 /**
  * Discuss's live:true synchronous ask -- interactive AskComponent when a real TUI is available,
  * dialog fallback (ctx.ui.select/input) in RPC/headless mode, no-op undefined without any
@@ -1098,8 +1129,24 @@ export function isLiveAskPending(): boolean {
  * contexts all resolve to undefined.
  */
 export async function askQuestion(ctx: ExtensionContext, params: AskQuestionParams): Promise<AskAnswer | undefined> {
+	diag("askQuestion() called", { question: params.question, key: params.key, hasUI: ctx.hasUI, mode: ctx.mode, optionCount: params.options?.length ?? 0, alreadyPendingForKey: params.key !== undefined && pendingByKey.has(params.key) });
 	if (!ctx.hasUI || !ctx.ui) return undefined;
+	if (params.key !== undefined) {
+		const existing = pendingByKey.get(params.key);
+		if (existing) { diag("joining an already in-flight ask for this key", { key: params.key }); return existing; }
+	}
+	const promise = askQuestionUnguarded(ctx, params);
+	if (params.key !== undefined) {
+		const key = params.key;
+		pendingByKey.set(key, promise);
+		void promise.finally(() => {
+			if (pendingByKey.get(key) === promise) pendingByKey.delete(key);
+		});
+	}
+	return promise;
+}
 
+async function askQuestionUnguarded(ctx: ExtensionContext, params: AskQuestionParams): Promise<AskAnswer | undefined> {
 	const options = params.options ?? [];
 	const allowMultiple = params.allowMultiple ?? false;
 	const allowFreeform = params.allowFreeform ?? true;
@@ -1162,8 +1209,12 @@ async function askQuestionBlocking(
 			});
 		}
 
+		diag("calling ctx.ui.custom()", { displayMode });
 		const customResult = await ctx.ui.custom<AskResponse | null>(factory, buildCustomUIOptions(displayMode, (handle) => { overlayHandle = handle; }));
+		diag("ctx.ui.custom() resolved", { wasUndefined: customResult === undefined, result: customResult === undefined ? undefined : JSON.stringify(customResult) });
+		if (customResult === undefined) diag("falling back to askViaDialogs -- about to call ctx.ui.select with dialogOpts", { explicitTimeout: params.timeout ?? null });
 		response = customResult !== undefined ? customResult : await askViaDialogs(ctx.ui, params.question, normalizedContext, options, allowMultiple, allowFreeform, allowComment, params.timeout);
+		diag("askQuestionBlocking resolved", { response: response === null ? null : JSON.stringify(response) });
 	} finally {
 		removeOverlayInputListener?.();
 	}

package/extension/src/discuss.ts

@@ -84,8 +84,8 @@ export async function showDiscussions(ctx: ExtensionCommandContext): Promise<voi
 				const pending = (() => { try { return readDiscussionExtra(discussion.extra); } catch { return undefined; } })();
 				const question = `Reply to "${discussion.title}":`;
 				const answer = pending?.pendingOptions && pending.pendingOptions.length > 0 && pending.pendingOptionsMode
-					? await askQuestion(commandCtx, { question, options: pending.pendingOptions.map((title) => ({ title })), allowMultiple: pending.pendingOptionsMode === "multi" })
-					: await askQuestion(commandCtx, { question });
+					? await askQuestion(commandCtx, { question, options: pending.pendingOptions.map((title) => ({ title })), allowMultiple: pending.pendingOptionsMode === "multi", key: discussion.id })
+					: await askQuestion(commandCtx, { question, key: discussion.id });
 				if (!answer) return; // canceled
 				await callService("discuss.reply", { id: discussion.id, actor: ACTOR, content: answer.content, ...(answer.selected ? { selected: answer.selected } : {}), source: SOURCE });
 				commandCtx.ui.notify(answer.selected ? `Selected: ${answer.selected.join(", ")}` : "Reply added.", "info");

package/extension/src/domain-tools.ts

@@ -49,9 +49,10 @@ async function liveAnswer(ctx: ExtensionContext, discussion: Artifact, onUpdate:
 			options: pending.pendingOptions.map((title) => ({ title })),
 			allowMultiple: pending.pendingOptionsMode === "multi",
 			onUpdate,
+			key: discussion.id,
 		});
 	}
-	return askQuestion(ctx, { question, onUpdate });
+	return askQuestion(ctx, { question, onUpdate, key: discussion.id });
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/papyrus",
-  "version": "0.27.2",
+  "version": "0.27.4",
   "description": "Daemon-backed graph artifacts, evidence-bearing tasks, rules, skills, and native TUI workflows for Pi",
   "type": "module",
   "keywords": ["pi-package"],