@danypops/papyrus 0.27.9 → 0.27.11

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

@@ -35,27 +35,6 @@ 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";
-let diagSequence = 0;
-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,
-		operation_id: `diag-${Date.now()}-${++diagSequence}`,
-		...(fields ? { fields } : {}),
-	}).catch((error) => {
-		void callService("logs.append", {
-			source_id: DIAG_SOURCE, source_label: "Discuss live-ask RCA", level: "error",
-			message: `diag() itself failed: ${error instanceof Error ? error.message : String(error)}`,
-			operation_id: `diag-error-${Date.now()}-${++diagSequence}`,
-		}).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
@@ -84,19 +63,10 @@ export interface AskQuestionParams {
 	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
-	 * progress signal, a tool call sitting silent that long looks indistinguishable from a dead
-	 * one to anything upstream watching for stalled calls. pi-ask-user's own original code (the
-	 * prior art this view is adapted from) sent exactly this same heartbeat before presenting its
-	 * UI; dropping it during the port was the regression that let two independent executions of
-	 * the same live ask run concurrently, each opening its own picker for the same question.
+	 * Streamed once before blocking on the human, matching pi-ask-user's own original code (the
+	 * prior art this view is adapted from) -- gives the tool call's progress UI something to show
+	 * during a wait that legitimately runs far longer than a typical tool call (real human response
+	 * time, not milliseconds).
 	 */
 	onUpdate?: AgentToolUpdateCallback;
 	/**
@@ -943,7 +913,7 @@ class AskComponent extends Container {
 		if (this.singleSelectList) return this.singleSelectList;
 		const list = new WrappedSingleSelectList(this.options, this.allowFreeform, this.allowComment, this.theme, this.keybindings, this.shortcuts.commentToggle);
 		list.onSubmit = (result) => this.handleSelectionSubmit([result], list.isCommentEnabled());
-		list.onCancel = () => { diag("single-select onCancel fired (tui.select.cancel keybinding matched)"); this.onDone(null); };
+		list.onCancel = () => this.onDone(null);
 		list.onEnterFreeform = () => this.showFreeformMode();
 		this.singleSelectList = list;
 		return list;
@@ -1099,9 +1069,7 @@ 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) {
@@ -1122,9 +1090,8 @@ async function askViaDialogs(
  * driver (extension/src/index.ts's driveActiveTasks, on agent_settled) queue a "continue the
  * active task" nudge as a `deliverAs: "nextTurn"` message while this exact live ask is still
  * awaiting an answer -- starting a second, concurrent turn that reasons about the very Discussion
- * this call is already resolving, independently of it. A live-observed bug (two pickers for the
- * same question, one orphaned and later auto-resolving with fabricated "defer" text) traced back
- * to exactly this race. driveActiveTasks checks isLiveAskPending() and skips queuing while true.
+ * this call is already resolving, independently of it. driveActiveTasks checks isLiveAskPending()
+ * and skips queuing while true.
  */
 let livePendingCount = 0;
 
@@ -1132,16 +1099,6 @@ 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
@@ -1149,21 +1106,8 @@ const pendingByKey = new Map<string, Promise<AskAnswer | undefined>>();
  * 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;
+	return askQuestionUnguarded(ctx, params);
 }
 
 async function askQuestionUnguarded(ctx: ExtensionContext, params: AskQuestionParams): Promise<AskAnswer | undefined> {
@@ -1212,15 +1156,9 @@ async function askQuestionBlocking(
 	let hasAnnouncedHide = false;
 	let response: AskResponse | null;
 	try {
-		diag("factory about to construct AskComponent", { hasSignal: params.signal !== undefined, signalAlreadyAborted: params.signal?.aborted ?? null, hasExplicitTimeout: params.timeout !== undefined, allowMultiple });
-		const factory = (tui: TUI, theme: Theme, keybindings: KeybindingsManager, realDone: (result: AskResponse | null) => void) => {
-			const startedAt = Date.now();
-			const done = (result: AskResponse | null) => {
-				diag("done() invoked -- generic catch-all", { elapsedMs: Date.now() - startedAt, result: result === null ? null : JSON.stringify(result), stack: new Error().stack?.split("\n").slice(1, 6).join(" | ") });
-				realDone(result);
-			};
-			if (params.signal) params.signal.addEventListener("abort", () => { diag("tool call signal fired abort -- resolving null"); done(null); }, { once: true });
-			if (params.timeout && params.timeout > 0) setTimeout(() => { diag("explicit params.timeout expired -- resolving null", { timeout: params.timeout }); done(null); }, params.timeout);
+		const factory = (tui: TUI, theme: Theme, keybindings: KeybindingsManager, done: (result: AskResponse | null) => void) => {
+			if (params.signal) params.signal.addEventListener("abort", () => done(null), { once: true });
+			if (params.timeout && params.timeout > 0) setTimeout(() => done(null), params.timeout);
 			return new AskComponent(params.question, normalizedContext, options, allowMultiple, allowFreeform, allowComment, displayMode, tui, theme, keybindings, shortcuts, done);
 		};
 
@@ -1235,12 +1173,8 @@ 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", key: discussion.id })
-					: await askQuestion(commandCtx, { question, key: discussion.id });
+					? await askQuestion(commandCtx, { question, options: pending.pendingOptions.map((title) => ({ title })), allowMultiple: pending.pendingOptionsMode === "multi" })
+					: await askQuestion(commandCtx, { question });
 				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

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

package/package.json

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