@danypops/papyrus 0.27.12 → 0.27.14

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

@@ -658,7 +658,10 @@ class AskComponent extends Container {
 		this.addChild(new BoxBorderBottom((s) => theme.fg("accent", s)));
 
 		this.updateStaticText();
-		this.showSelectMode();
+		// A freeform-only ask (no options at all) has no select list to show -- start directly in
+		// the freeform editor instead of a select mode that would have nothing to render.
+		if (this.options.length === 0) this.showFreeformMode();
+		else this.showSelectMode();
 	}
 
 	override invalidate(): void { super.invalidate(); this.updateStaticText(); this.updateHelpText(); }
@@ -877,12 +880,13 @@ class AskComponent extends Container {
 
 		if (this.mode === "freeform" || this.mode === "comment") {
 			const alternateCancelKeys = this.keybindings.getKeys("tui.select.cancel").filter((key) => key !== "escape" && key !== "esc");
+			const canGoBack = this.options.length > 0;
 			const hints = [
 				keybindingHint(theme, this.keybindings, "tui.input.submit", this.mode === "comment" ? "submit/skip" : "submit"),
 				keybindingHint(theme, this.keybindings, "tui.input.newLine", "newline"),
-				literalHint(theme, "esc", "back"),
+				literalHint(theme, "esc", canGoBack ? "back" : "cancel"),
 				overlayHint,
-				alternateCancelKeys.length > 0 ? literalHint(theme, formatKeyList(alternateCancelKeys), "cancel") : null,
+				canGoBack && alternateCancelKeys.length > 0 ? literalHint(theme, formatKeyList(alternateCancelKeys), "cancel") : null,
 			].filter((hint): hint is string => !!hint).join(" • ");
 			this.helpText.setText(theme.fg("dim", hints));
 			return;
@@ -1031,7 +1035,8 @@ class AskComponent extends Container {
 	handleInput(data: string): void {
 		if (this.handlePromptScrollInput(data)) { this.tui.requestRender(); return; }
 		if (this.mode === "freeform" || this.mode === "comment") {
-			if (matchesKey(data, Key.escape)) { this.showSelectMode(); return; }
+			// A freeform-only ask has no select mode to go back to -- escape cancels outright.
+			if (matchesKey(data, Key.escape)) { if (this.options.length > 0) this.showSelectMode(); else this.onDone(null); return; }
 			if (this.keybindings.matches(data, "tui.select.cancel")) { this.onDone(null); return; }
 			this.ensureEditor().handleInput(data);
 			this.tui.requestRender();
@@ -1057,6 +1062,11 @@ async function askViaDialogs(
 	const dialogOpts = timeout ? { timeout } : undefined;
 	const prompt = context ? `${question}\n\nContext:\n${context}` : question;
 
+	if (options.length === 0) {
+		const answer = (await ui.input(prompt, "Type your answer...", dialogOpts)) as string | undefined;
+		return isCancelledInput(answer) ? null : createFreeformResponse(answer);
+	}
+
 	if (allowMultiple) {
 		const rawSelections = (await ui.input(`${prompt}\n\nOptions (select one or more):\n${formatOptionsForMessage(options)}`, "Type your selection(s)...", dialogOpts)) as string | undefined;
 		if (isCancelledInput(rawSelections)) return null;
@@ -1139,13 +1149,9 @@ async function askQuestionBlocking(
 	displayMode: AskDisplayMode,
 	normalizedContext: string | undefined,
 ): Promise<AskAnswer | undefined> {
-	if (options.length === 0) {
-		const prompt = normalizedContext ? `${params.question}\n\nContext:\n${normalizedContext}` : params.question;
-		const answer = await ctx.ui.input(prompt, "Type your answer...", params.timeout ? { timeout: params.timeout } : undefined);
-		const response = createFreeformResponse(answer);
-		return response ? toAskAnswer(response) : undefined;
-	}
-
+	// A freeform-only ask (no options) still goes through the same rich AskComponent/ctx.ui.custom()
+	// path below, not a bare ctx.ui.input() -- otherwise it renders as a plain, contextless single
+	// line while every options-bearing ask gets the full bordered box, title, and markdown context.
 	const shortcuts: ResolvedAskShortcuts = {
 		overlayToggle: resolveShortcut(undefined, process.env["PAPYRUS_DISCUSS_OVERLAY_TOGGLE_KEY"], DEFAULT_OVERLAY_TOGGLE_KEY),
 		commentToggle: resolveShortcut(undefined, process.env["PAPYRUS_DISCUSS_COMMENT_TOGGLE_KEY"], DEFAULT_COMMENT_TOGGLE_KEY),

package/extension/src/discuss.ts

@@ -83,9 +83,13 @@ export async function showDiscussions(ctx: ExtensionCommandContext): Promise<voi
 			if (choice === "Reply") {
 				const pending = (() => { try { return readDiscussionExtra(discussion.extra); } catch { return undefined; } })();
 				const question = `Reply to "${discussion.title}":`;
+				// Same fix as the live discuss tool: the title alone isn't the actual question -- show
+				// the most recent round's real content as context, not a bare title prompt.
+				const transcript = await callService<Record<string, unknown>, DiscussionAndRounds>("discuss.show", { id: discussion.id });
+				const context = transcript.rounds.at(-1)?.content?.trim() || undefined;
 				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, context, options: pending.pendingOptions.map((title) => ({ title })), allowMultiple: pending.pendingOptionsMode === "multi" })
+					: await askQuestion(commandCtx, { question, context });
 				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

@@ -39,20 +39,25 @@ function text(message: string, details: unknown = {}) {
  * is available, never throws -- an unanswered live prompt still leaves the round it already
  * recorded intact.
  */
-async function liveAnswer(ctx: ExtensionContext, discussion: Artifact, onUpdate: AgentToolUpdateCallback | undefined, signal: AbortSignal | undefined): Promise<{ content: string; selected?: string[] } | undefined> {
+async function liveAnswer(ctx: ExtensionContext, discussion: Artifact, latestContent: string | undefined, onUpdate: AgentToolUpdateCallback | undefined, signal: AbortSignal | 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}":`;
+	// The discussion's title alone is often not the actual question -- a human staring at a bare
+	// "Reply to '<title>':" prompt with no visible content has no way to tell what's being asked.
+	// The just-recorded round's own content is the real question text; show it as context.
+	const context = latestContent?.trim() || undefined;
 	if (pending?.pendingOptions && pending.pendingOptions.length > 0 && pending.pendingOptionsMode) {
 		return askQuestion(ctx, {
 			question,
+			context,
 			options: pending.pendingOptions.map((title) => ({ title })),
 			allowMultiple: pending.pendingOptionsMode === "multi",
 			onUpdate,
 			signal,
 		});
 	}
-	return askQuestion(ctx, { question, onUpdate, signal });
+	return askQuestion(ctx, { question, context, onUpdate, signal });
 }
 
 /**
@@ -722,7 +727,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, onUpdate, signal);
+					const answer = await liveAnswer(ctx, result.discussion, result.rounds[0]?.content, onUpdate, signal);
 					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.27.12",
+  "version": "0.27.14",
   "description": "Daemon-backed graph artifacts, evidence-bearing tasks, rules, skills, and native TUI workflows for Pi",
   "type": "module",
   "keywords": ["pi-package"],