@danypops/papyrus 0.26.0 → 0.27.1

package/extension/src/discuss.ts

@@ -16,10 +16,10 @@ import type { ExtensionCommandContext, Theme } from "@earendil-works/pi-coding-a
 import type { Artifact } from "../../src/domain/artifact.ts";
 import type { DiscussionAndRounds } from "../../src/discussion-service.ts";
 import { readDiscussionExtra } from "../../src/domain/discussion.ts";
+import { askQuestion } from "./discuss-ask-view.ts";
 import { showArtifactBrowser } from "./artifact-browser.ts";
 import { DISCUSSION_STATE_PRESENTATION, DOC_STATUS_PRESENTATION } from "./artifact-status-presentation.ts";
 import { discussionRoundCountOf, discussionStateOf, showDiscussionDetailView } from "./discussion-detail-view.ts";
-import { pickDiscussionOptions } from "./discussion-picker.ts";
 import { callService } from "./service-client.ts";
 
 const SOURCE = "discuss-tui";
@@ -82,25 +82,13 @@ export async function showDiscussions(ctx: ExtensionCommandContext): Promise<voi
 			}
 			if (choice === "Reply") {
 				const pending = (() => { try { return readDiscussionExtra(discussion.extra); } catch { return undefined; } })();
-				if (pending?.pendingOptions && pending.pendingOptions.length > 0 && pending.pendingOptionsMode) {
-					const result = await pickDiscussionOptions(commandCtx, pending.pendingOptionsMode, pending.pendingOptions);
-					if (!result) return; // canceled
-					if (result.kind === "freeform") {
-						await callService("discuss.reply", { id: discussion.id, actor: ACTOR, content: result.text, source: SOURCE });
-						commandCtx.ui.notify("Reply added.", "info");
-						return;
-					}
-					const { selected } = result;
-					const elaboration = await commandCtx.ui.input("Elaborate (optional):", selected.join(", "));
-					if (elaboration === undefined) return; // canceled
-					await callService("discuss.reply", { id: discussion.id, actor: ACTOR, content: elaboration || selected.join(", "), selected, source: SOURCE });
-					commandCtx.ui.notify(`Selected: ${selected.join(", ")}`, "info");
-					return;
-				}
-				const content = await commandCtx.ui.input("Reply:", "");
-				if (!content) return;
-				await callService("discuss.reply", { id: discussion.id, actor: ACTOR, content, source: SOURCE });
-				commandCtx.ui.notify("Round added.", "info");
+				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 });
+				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");
 				return;
 			}
 			if (choice === "Defer") {

package/extension/src/domain-tools.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { AgentToolUpdateCallback, ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import type { Artifact } from "../../src/domain/artifact.ts";
 import { PROOF_TYPES } from "../../src/domain/checklist.ts";
@@ -9,7 +9,7 @@ import type { TaskCompletion, TaskGraph } from "../../src/task-service.ts";
 import type { SkillWorkflowRunResult } from "../../src/skill-execution.ts";
 import type { DiscussionAndRounds } from "../../src/discussion-service.ts";
 import { readDiscussionExtra, type DiscussionRound } from "../../src/domain/discussion.ts";
-import { pickDiscussionOptions } from "./discussion-picker.ts";
+import { askQuestion } from "./discuss-ask-view.ts";
 import type { OperationName } from "../../src/service.ts";
 import { emitTaskFocusEvent } from "./task-focus-events.ts";
 import { sessionSecretField } from "./session-identity.ts";
@@ -32,23 +32,26 @@ function text(message: string, details: unknown = {}) {
 }
 
 /**
- * live:true's synchronous half: renders the same picker /discuss's own "Reply" action uses when
- * the just-created round posed a structured choice, or a plain freeform prompt otherwise -- so
- * "ask" covers both a completely open question and a choice tied to this specific Discussion.
- * Returns undefined on cancel or when no interactive UI is available, never throws -- an
- * unanswered live prompt still leaves the round it already recorded intact.
+ * live:true's synchronous half: reuses the same Discuss-owned ask UI (discuss-ask-view.ts) the
+ * /discuss TUI's own "Reply" action uses when the just-created round posed a structured choice,
+ * or a plain freeform prompt otherwise -- so "ask" covers both a completely open question and a
+ * choice tied to this specific Discussion. Returns undefined on cancel or when no interactive UI
+ * is available, never throws -- an unanswered live prompt still leaves the round it already
+ * recorded intact.
  */
-async function liveAnswer(ctx: ExtensionContext, discussion: Artifact): Promise<{ content: string; selected?: string[] } | undefined> {
+async function liveAnswer(ctx: ExtensionContext, discussion: Artifact, onUpdate: AgentToolUpdateCallback | undefined): Promise<{ content: string; selected?: string[] } | undefined> {
 	if (!ctx.hasUI) return undefined;
 	const pending = (() => { try { return readDiscussionExtra(discussion.extra); } catch { return undefined; } })();
+	const question = `Reply to "${discussion.title}":`;
 	if (pending?.pendingOptions && pending.pendingOptions.length > 0 && pending.pendingOptionsMode) {
-		const result = await pickDiscussionOptions(ctx, pending.pendingOptionsMode, pending.pendingOptions);
-		if (!result) return undefined;
-		if (result.kind === "freeform") return { content: result.text };
-		return { content: result.selected.join(", "), selected: result.selected };
+		return askQuestion(ctx, {
+			question,
+			options: pending.pendingOptions.map((title) => ({ title })),
+			allowMultiple: pending.pendingOptionsMode === "multi",
+			onUpdate,
+		});
 	}
-	const content = await ctx.ui.input(`Reply to "${discussion.title}":`, "");
-	return content ? { content } : undefined;
+	return askQuestion(ctx, { question, onUpdate });
 }
 
 /**
@@ -695,9 +698,13 @@ export function registerDomainTools(pi: ExtensionAPI): void {
 			selected: Type.Optional(Type.Array(Type.String())),
 			live: Type.Optional(Type.Boolean()),
 		}),
+		// Blocks other tool calls in the same assistant turn until live:true's human answer comes
+		// back, same reasoning as pi-ask-user's own tool: the model must not batch a live ask with
+		// bash/edit/write and let those run before the human sees the prompt.
+		executionMode: "sequential",
 		renderCall(args, theme) { return renderPapyrusToolCall("Discuss", args, theme); },
 		renderResult(result, options, theme, context) { return renderPapyrusToolResult(result, options, theme, context); },
-		async execute(_id, rawParams, _signal, _onUpdate, ctx) {
+		async execute(_id, rawParams, _signal, onUpdate, ctx) {
 			try {
 				const params: Record<string, unknown> = { ...rawParams };
 				const action = params.action;
@@ -714,7 +721,7 @@ export function registerDomainTools(pi: ExtensionAPI): void {
 						? text(`Opened discussion ${artifactLine(result.discussion)}`, createArtifactDetails("discuss.open", result.discussion))
 						: text(`Round ${result.rounds[0]?.roundNumber} added to "${result.discussion.title}"`, createArtifactDetails("discuss.reply", result.discussion));
 					if (params.live !== true) return fallback;
-					const answer = await liveAnswer(ctx, result.discussion);
+					const answer = await liveAnswer(ctx, result.discussion, onUpdate);
 					if (!answer) return fallback;
 					const answered = await callService<Record<string, unknown>, DiscussionAndRounds>("discuss.reply", {
 						id: result.discussion.id, actor: "human", content: answer.content, ...(answer.selected ? { selected: answer.selected } : {}), source: "discuss-live",

package/package.json

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

package/src/constants.ts

@@ -175,9 +175,6 @@ export const DISCUSSION_ACTOR_MAX_LENGTH = 128;
 export const DISCUSSION_OPTIONS_MIN_COUNT = 2;
 export const DISCUSSION_OPTIONS_MAX_COUNT = 10;
 export const DISCUSSION_OPTION_MAX_LENGTH = 200;
-/** The multi-select picker's idle auto-cancel countdown and its render tick (also drives the cursor-row blink). Single-select has no equivalent -- it delegates to Pi's own native ctx.ui.select, whose input loop this package does not control. */
-export const DISCUSSION_PICKER_IDLE_TIMEOUT_MS = 30_000;
-export const DISCUSSION_PICKER_TICK_MS = 500;
 /** Bounds for the generic graph projection protocol (external bounded contexts). */
 export const GRAPH_PROJECTION_MAX_ARTIFACTS_PER_BATCH = 500;
 export const GRAPH_PROJECTION_MAX_EDGES_PER_BATCH = 1_000;

package/extension/src/discussion-picker.ts

@@ -1,148 +0,0 @@
-/**
- * discussion-picker.ts — the structured-choice picker for /discuss's "Reply" action and the
- * discuss tool's own live:true synchronous ask.
- *
- * "single" mode (mutually exclusive) needs nothing bespoke for the pick list itself: the Pi
- * extension UI already provides exactly that (ctx.ui.select). "multi" (allow several) has no
- * native equivalent anywhere in @earendil-works/pi-coding-agent or pi-tui (checked both) -- so
- * that one is a small, genuinely domain-specific checkbox-list component, not a generic library
- * replacement. Both modes get a numbered quick-select (press the row's digit instead of
- * scrolling with arrows) and an appended "type your own answer" row, itself numbered the same
- * way -- a genuinely open question is exactly as valid an answer as any of the posed options.
- */
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
-import { DISCUSSION_PICKER_IDLE_TIMEOUT_MS, DISCUSSION_PICKER_TICK_MS } from "../../src/constants.ts";
-import type { DiscussionOptionsMode } from "../../src/domain/discussion.ts";
-
-const FREEFORM_LABEL = "Something else (type your own answer)";
-
-export type DiscussionPickResult = { kind: "selected"; selected: string[] } | { kind: "freeform"; text: string };
-
-/** digit "1".."9" -> index 0-8, "0" -> index 9 (DISCUSSION_OPTIONS_MAX_COUNT is 10) -- standard terminal-menu numbering, not 0-indexed. */
-function digitToIndex(data: string, rowCount: number): number | undefined {
-	if (data === "0") return rowCount >= 10 ? 9 : undefined;
-	if (data.length === 1 && data >= "1" && data <= "9") {
-		const index = Number(data) - 1;
-		return index < rowCount ? index : undefined;
-	}
-	return undefined;
-}
-
-function rowNumberLabel(index: number): string {
-	if (index < 9) return `${index + 1}`;
-	if (index === 9) return "0";
-	return " "; // beyond the 1-9,0 quick-select range (should not happen given DISCUSSION_OPTIONS_MAX_COUNT=10, but never crash rendering)
-}
-
-async function promptFreeformAnswer(ctx: ExtensionContext): Promise<DiscussionPickResult | undefined> {
-	const text = await ctx.ui.input("Your answer:", "");
-	return text ? { kind: "freeform", text } : undefined;
-}
-
-/**
- * Toggle with space or a row's number, confirm with enter (refuses an empty confirm -- at least
- * one pick is required), cancel with escape. Picking the freeform row exits the checkbox flow
- * entirely rather than adding it to the selection.
- *
- * Idle countdown: auto-cancels after DISCUSSION_PICKER_IDLE_TIMEOUT_MS of no input at all --
- * the first keystroke of any kind stops it permanently (not a pause; it never resumes for this
- * picker instance), since a countdown ticking while someone is actively engaging is pressure,
- * not a nudge. The same tick also drives a slow, deliberately noticeable blink on the cursor
- * row -- checked rows stay steadily highlighted, everything else stays dimmed, so the eye reads
- * "what's chosen" at a glance independent of where the cursor happens to be.
- */
-async function pickMultiple(ctx: ExtensionContext, title: string, options: string[], allowFreeform: boolean, idleTimeoutMs: number, tickMs: number): Promise<DiscussionPickResult | undefined> {
-	return ctx.ui.custom<DiscussionPickResult | undefined>((tui, theme, _keybindings, done) => {
-		const rows = allowFreeform ? [...options, FREEFORM_LABEL] : options;
-		const freeformIndex = allowFreeform ? rows.length - 1 : -1;
-		const checked = new Set<number>();
-		let selectedIndex = 0;
-		let hasInteracted = false;
-		let remainingMs = idleTimeoutMs;
-		let blinkOn = true;
-		const tick = setInterval(() => {
-			blinkOn = !blinkOn;
-			if (!hasInteracted) {
-				remainingMs -= tickMs;
-				if (remainingMs <= 0) { finish(undefined); return; }
-			}
-			tui.requestRender();
-		}, tickMs);
-		const finish = (value: DiscussionPickResult | undefined) => { clearInterval(tick); done(value); };
-		const chooseFreeform = () => { promptFreeformAnswer(ctx).then(finish); };
-		const toggle = (index: number) => {
-			if (index === freeformIndex) { chooseFreeform(); return; }
-			if (checked.has(index)) checked.delete(index); else checked.add(index);
-			tui.requestRender();
-		};
-		return {
-			invalidate() {},
-			render(width: number): string[] {
-				const lines: string[] = [
-					theme.bold(title),
-					theme.fg("muted", "number/space toggle \u00b7 enter confirm \u00b7 esc cancel"),
-					"",
-				];
-				rows.forEach((option, index) => {
-					const isCursor = index === selectedIndex;
-					const isChecked = checked.has(index);
-					const cursorGlyph = isCursor && blinkOn ? theme.fg("accent", "\u276f") : " ";
-					const box = index === freeformIndex ? "  " : isChecked ? theme.fg("success", "[x]") : "[ ]";
-					let label = option;
-					if (isChecked) label = theme.bold(theme.fg("success", label));
-					else if (isCursor) label = theme.bold(theme.fg("accent", label));
-					else label = theme.fg("dim", label);
-					lines.push(truncateToWidth(`${cursorGlyph} ${rowNumberLabel(index)}. ${box} ${label}`, width, ""));
-				});
-				lines.push("");
-				lines.push(theme.fg("dim", `${checked.size} selected`));
-				if (!hasInteracted) lines.push(theme.fg("dim", `auto-cancels in ${Math.max(0, Math.ceil(remainingMs / 1000))}s (press any key to stop)`));
-				return lines;
-			},
-			handleInput(data: string) {
-				hasInteracted = true;
-				const digit = digitToIndex(data, rows.length);
-				if (digit !== undefined) { selectedIndex = digit; toggle(digit); return; }
-				if (matchesKey(data, "up")) selectedIndex = (selectedIndex - 1 + rows.length) % rows.length;
-				else if (matchesKey(data, "down")) selectedIndex = (selectedIndex + 1) % rows.length;
-				else if (data === " ") { toggle(selectedIndex); return; }
-				else if (matchesKey(data, "enter")) {
-					if (selectedIndex === freeformIndex && checked.size === 0) { chooseFreeform(); return; }
-					if (checked.size === 0) return; // refuse an empty confirm -- selecting nothing isn't a valid answer
-					finish({ kind: "selected", selected: [...checked].sort((a, b) => a - b).map((index) => rows[index]!) });
-					return;
-				} else if (matchesKey(data, "escape")) { finish(undefined); return; }
-				else return;
-				tui.requestRender();
-			},
-		};
-	});
-}
-
-/**
- * Picks one (single) or several (multi) of the given options, or a freeform typed answer
- * instead, or undefined if the user cancels. Takes the base ExtensionContext (just .ui) rather
- * than the wider ExtensionCommandContext, since a tool's execute() only ever receives the
- * former -- the discuss tool's own live mode reuses this same picker, not just the /discuss
- * TUI panel. Single mode's numbered quick-select is not guaranteed: it delegates to Pi's own
- * native ctx.ui.select, which this package does not control the key handling of.
- */
-export async function pickDiscussionOptions(
-	ctx: ExtensionContext,
-	mode: DiscussionOptionsMode,
-	options: string[],
-	allowFreeform = true,
-	/** Test seam: real timers, not faked global time -- pass tiny values to exercise the idle-cancel/blink logic quickly and deterministically. */
-	idleTimeoutMs = DISCUSSION_PICKER_IDLE_TIMEOUT_MS,
-	tickMs = DISCUSSION_PICKER_TICK_MS,
-): Promise<DiscussionPickResult | undefined> {
-	if (mode === "single") {
-		const rows = allowFreeform ? [...options, FREEFORM_LABEL] : options;
-		const pick = await ctx.ui.select("Pick one:", rows);
-		if (!pick) return undefined;
-		if (allowFreeform && pick === FREEFORM_LABEL) return promptFreeformAnswer(ctx);
-		return { kind: "selected", selected: [pick] };
-	}
-	return pickMultiple(ctx, "Pick one or more:", options, allowFreeform, idleTimeoutMs, tickMs);
-}