@danypops/papyrus 0.27.13 → 0.27.15

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

@@ -56,6 +56,9 @@ export type AskDisplayMode = "overlay" | "inline";
 export interface AskQuestionParams {
 	question: string;
 	context?: string;
+	/** Plain orientation line ("which discussion is this"), shown dim above the question -- not a
+	 * labeled section like context. Typically the Discussion's own title. */
+	subtitle?: string;
 	options?: AskOption[];
 	allowMultiple?: boolean;
 	allowFreeform?: boolean;
@@ -621,6 +624,7 @@ class AskComponent extends Container {
 	constructor(
 		private question: string,
 		private context: string | undefined,
+		private subtitle: string | undefined,
 		private options: AskOption[],
 		private allowMultiple: boolean,
 		private allowFreeform: boolean,
@@ -658,7 +662,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(); }
@@ -778,6 +785,9 @@ class AskComponent extends Container {
 				"",
 			];
 		}
+		// Only meaningful when reached by escaping OUT of a real select list -- see showFreeformMode's
+		// identical guard for the non-overlay layout.
+		if (this.options.length === 0) return [];
 		return [...new Text(this.theme.fg("accent", this.theme.bold("Custom answer")), 1, 0).render(width), ""];
 	}
 
@@ -861,7 +871,11 @@ class AskComponent extends Container {
 
 	private updateStaticText(): void {
 		const theme = this.theme;
-		this.titleText.setText(theme.fg("accent", theme.bold(this.mode === "comment" ? "Optional comment" : "Question")));
+		// Reuses the same slot for two different purposes: a plain "which discussion is this" subtitle
+		// normally, or "Optional comment" while in comment mode. A generic "Question" header above the
+		// real question text added nothing beyond what the question itself already says, and read
+		// confusingly like the question text WAS the header.
+		this.titleText.setText(this.mode === "comment" ? theme.fg("accent", theme.bold("Optional comment")) : this.subtitle ? theme.fg("dim", this.subtitle) : "");
 		this.questionText.setText(theme.fg("text", theme.bold(this.question)));
 		if (this.contextComponent && this.context) {
 			if (this.contextComponent instanceof Markdown) (this.contextComponent as Markdown).setText(`**Context:**\n${this.context}`);
@@ -877,12 +891,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;
@@ -981,8 +996,13 @@ class AskComponent extends Container {
 		const editor = this.ensureEditor();
 		this.setEditorText(this.freeformDraft);
 		(editor as any).focused = this._focused;
-		this.modeContainer.addChild(new Text(this.theme.fg("accent", this.theme.bold("Custom answer")), 1, 0));
-		this.modeContainer.addChild(new Spacer(1));
+		// Only meaningful when reached by escaping OUT of a real select list ("instead of these
+		// options, here's a custom one") -- with no options at all there's nothing to contrast
+		// against, so the label is pure noise.
+		if (this.options.length > 0) {
+			this.modeContainer.addChild(new Text(this.theme.fg("accent", this.theme.bold("Custom answer")), 1, 0));
+			this.modeContainer.addChild(new Spacer(1));
+		}
 		this.modeContainer.addChild(editor);
 		this.updateHelpText();
 		this.invalidate();
@@ -1031,7 +1051,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 +1078,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 +1165,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),
@@ -1159,7 +1181,7 @@ async function askQuestionBlocking(
 		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);
+			return new AskComponent(params.question, normalizedContext, params.subtitle, options, allowMultiple, allowFreeform, allowComment, displayMode, tui, theme, keybindings, shortcuts, done);
 		};
 
 		const overlayToggle = shortcuts.overlayToggle;

package/extension/src/discuss.ts

@@ -82,14 +82,15 @@ 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.
+				// Same fix as the live discuss tool: the most recent round's own content IS the real
+				// question -- the title becomes a plain orientation subtitle, not a labeled-backwards
+				// "Context:" section under a generic "Reply to <title>:" wrapper.
 				const transcript = await callService<Record<string, unknown>, DiscussionAndRounds>("discuss.show", { id: discussion.id });
-				const context = transcript.rounds.at(-1)?.content?.trim() || undefined;
+				const question = transcript.rounds.at(-1)?.content?.trim() || `Reply to "${discussion.title}":`;
+				const subtitle = discussion.title;
 				const answer = pending?.pendingOptions && pending.pendingOptions.length > 0 && pending.pendingOptionsMode
-					? await askQuestion(commandCtx, { question, context, options: pending.pendingOptions.map((title) => ({ title })), allowMultiple: pending.pendingOptionsMode === "multi" })
-					: await askQuestion(commandCtx, { question, context });
+					? await askQuestion(commandCtx, { question, subtitle, options: pending.pendingOptions.map((title) => ({ title })), allowMultiple: pending.pendingOptionsMode === "multi" })
+					: await askQuestion(commandCtx, { question, subtitle });
 				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

@@ -42,22 +42,23 @@ function text(message: string, details: unknown = {}) {
 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;
+	// The just-recorded round's own content IS the real question -- a generic "Reply to <title>:"
+	// wrapper as the primary question, with the real content demoted to "Context:", left a human
+	// staring at a labeled-backwards prompt (live-observed). The wrapper is now only a fallback for
+	// the degenerate case of empty content; the title becomes a plain orientation subtitle instead.
+	const question = latestContent?.trim() || `Reply to "${discussion.title}":`;
+	const subtitle = discussion.title;
 	if (pending?.pendingOptions && pending.pendingOptions.length > 0 && pending.pendingOptionsMode) {
 		return askQuestion(ctx, {
 			question,
-			context,
+			subtitle,
 			options: pending.pendingOptions.map((title) => ({ title })),
 			allowMultiple: pending.pendingOptionsMode === "multi",
 			onUpdate,
 			signal,
 		});
 	}
-	return askQuestion(ctx, { question, context, onUpdate, signal });
+	return askQuestion(ctx, { question, subtitle, onUpdate, signal });
 }
 
 /**

package/package.json

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