@danypops/papyrus 0.27.0 → 0.27.2

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

@@ -10,7 +10,7 @@
  * registration, its own event emission, malformed-options recovery for other tools' schemas)
  * removed since Discuss already owns its schema, persistence, and rendering.
  */
-import type { ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
+import type { AgentToolUpdateCallback, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
 import {
 	Container,
@@ -62,6 +62,16 @@ export interface AskQuestionParams {
 	allowComment?: boolean;
 	displayMode?: AskDisplayMode;
 	timeout?: number;
+	/**
+	 * 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.
+	 */
+	onUpdate?: AgentToolUpdateCallback;
 }
 
 export interface AskAnswer {
@@ -1063,6 +1073,24 @@ async function askViaDialogs(
 	return createSelectionResponse([selected], comment);
 }
 
+/**
+ * Tracks whether a live ask is genuinely mid-flight, blocked on the human. `ExtensionContext.isIdle()`
+ * means "not streaming a model response" -- it reads true while a slow, human-blocking tool call
+ * like this one is still pending, since the model already finished emitting the tool_call and
+ * is not itself generating anything. Left unguarded, that lets the active-task continuation
+ * 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.
+ */
+let livePendingCount = 0;
+
+export function isLiveAskPending(): boolean {
+	return livePendingCount > 0;
+}
+
 /**
  * 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
@@ -1081,6 +1109,25 @@ export async function askQuestion(ctx: ExtensionContext, params: AskQuestionPara
 	const displayMode: AskDisplayMode = params.displayMode ?? envDisplayMode ?? "overlay";
 	const normalizedContext = params.context?.trim() || undefined;
 
+	params.onUpdate?.({ content: [{ type: "text", text: "Waiting for human input..." }], details: undefined });
+	livePendingCount += 1;
+	try {
+		return await askQuestionBlocking(ctx, params, options, allowMultiple, allowFreeform, allowComment, displayMode, normalizedContext);
+	} finally {
+		livePendingCount -= 1;
+	}
+}
+
+async function askQuestionBlocking(
+	ctx: ExtensionContext,
+	params: AskQuestionParams,
+	options: AskOption[],
+	allowMultiple: boolean,
+	allowFreeform: boolean,
+	allowComment: boolean,
+	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);

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";
@@ -39,7 +39,7 @@ 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): 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}":`;
@@ -48,9 +48,10 @@ async function liveAnswer(ctx: ExtensionContext, discussion: Artifact): Promise<
 			question,
 			options: pending.pendingOptions.map((title) => ({ title })),
 			allowMultiple: pending.pendingOptionsMode === "multi",
+			onUpdate,
 		});
 	}
-	return askQuestion(ctx, { question });
+	return askQuestion(ctx, { question, onUpdate });
 }
 
 /**
@@ -697,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;
@@ -716,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/extension/src/index.ts

@@ -22,6 +22,7 @@ import type { GateResult } from "../../src/domain/gate.ts";
 import { formatMetadata } from "./artifact-format.ts";
 import { callService } from "./service-client.ts";
 import { registerDomainTools } from "./domain-tools.ts";
+import { isLiveAskPending } from "./discuss-ask-view.ts";
 import { registerPlaybookBridge } from "./playbook-bridge.ts";
 import type { TaskGraph, TaskStatus } from "../../src/task-service.ts";
 import { ActiveTaskContinuation, automaticPauseReason, shouldResumeFocusOnHumanInput, type ActiveTaskMarker } from "./active-task-continuation.ts";
@@ -202,6 +203,11 @@ export default async function (pi: ExtensionAPI) {
 
 	const driveActiveTasks = async (ctx: ExtensionContext): Promise<void> => {
 		if (ctx.mode !== "tui" && ctx.mode !== "rpc") return;
+		// ctx.isIdle() means "not streaming a model response" -- it reads true while a live discuss
+		// ask is still genuinely pending, blocked on the human. Queuing a "continue the active task"
+		// nudge here would start a second, concurrent turn reasoning about the very Discussion this
+		// live ask is already resolving. See discuss-ask-view.ts's isLiveAskPending() doc comment.
+		if (isLiveAskPending()) return;
 		try {
 			const sessionId = ctx.sessionManager.getSessionId();
 			const active = await callService<Record<string, unknown>, ActiveTaskMarker | null>("tasks.active", { project_root: ctx.cwd, session_id: sessionId });

package/package.json

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