@pi-kaush/pi-tool-call-markers 0.3.7 → 0.3.9

package/CHANGELOG.md

@@ -22,6 +22,13 @@
   existing `!`-block shape (1/0) come from one code path instead of the body
   width being hardcoded.
 
+- Separate asked questions with one painted blank row. Adjacent questions ran
+  together as one wall of text; each question/answer pair now gets a blank body
+  row between it and the next. A lone question keeps its outcome on the
+  following line, and a global outcome (still awaiting, or declined) is
+  separated from a multi-question ask so it cannot read as answering only the
+  last question.
+
 - Extract the railed prompt shell into `src/prompt-shell.ts`. User `!` blocks
   and asked-question blocks share one implementation of the inset, rail,
   surface background, and background repaint instead of two.

package/README.md

@@ -55,6 +55,7 @@ A call that asks the user something is a user-input moment, not an execution row
   ▎
   ▎ > Which call-site shape should `notifications:` use?
   ▎ User: Nested within subagent (Recommended)
+  ▎
   ▎ > Which tier should the flag read at runtime?
   ▎ User: Client only, Client and server
   ▎
@@ -66,6 +67,7 @@ The block reuses `pi-content-layout`'s submitted-prompt geometry — the same ra
 - **Answers, not options.** Each question shows its answer: an option label, typed custom text, or multi-select labels joined with commas. A question left blank reads `User: (no answer)`, a decline reads `User declined to answer questions`, and a validation failure keeps Pi's native failure row.
 - **Quoted questions.** The question is the model's text read inside a user-input shell, so it renders italic under a `>` marker and the answer stays upright: the answer is the user's own words. A theme without italics renders the question plainly.
 - **Prompt-shell tones.** The rail uses `borderAccent` and the body paints on `userMessageBg`, with the question in `text`, the `User:` label in `muted`, the answer in `userMessageText`, and a live row's `awaiting your answer…` in `warning`.
+- **One blank row per question.** Questions are separated by a painted blank row so a multi-question ask stays scannable. A lone question keeps its outcome on the following line.
 - **No grouping.** Question blocks never join an adjacent tool group and carry no tool glyph. `Ctrl+O` still restores Pi's native expanded rendering.
 
 ## Edit diffs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-kaush/pi-tool-call-markers",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "description": "Compact and group Pi tool calls, with a bundled extension for adjacent thinking blocks.",
   "license": "MIT",
   "author": "Kaushik Gopal",

package/src/question-block.ts

@@ -41,7 +41,9 @@ type AnswerEntry = {
 type QuestionLine =
   | { kind: "question"; text: string }
   | { kind: "answer"; text: string }
-  | { kind: "status"; text: string; tone: "muted" | "warning" };
+  | { kind: "status"; text: string; tone: "muted" | "warning" }
+  // A painted blank body row; the shell gives it the prompt surface.
+  | { kind: "spacer" };
 
 // rpiv's canonical decline text, reused verbatim so the transcript says what
 // the model was told.
@@ -173,30 +175,38 @@ function questionLines(
   }
   if (pairs.length === 0) return undefined;
 
-  const lines: QuestionLine[] = [];
-  const questions = pairs.map(
-    (pair): QuestionLine => ({ kind: "question", text: pair.question }),
-  );
-  if (row.isPartial === true) {
-    return [
-      ...questions,
-      { kind: "status", text: AWAITING_TEXT, tone: "warning" },
-    ];
-  }
-  if (
+  const pending = row.isPartial === true;
+  const declined =
+    !pending &&
     isRecord(details) &&
     details.cancelled === true &&
-    pairs.every((pair) => pair.answer === undefined)
-  ) {
-    return [
-      ...questions,
-      { kind: "status", text: DECLINE_TEXT, tone: "muted" },
-    ];
-  }
-  for (const pair of pairs) {
-    lines.push({ kind: "question", text: pair.question });
-    lines.push({ kind: "answer", text: pair.answer ?? NO_ANSWER_TEXT });
+    pairs.every((pair) => pair.answer === undefined);
+
+  // One group per question. Groups are separated by a painted blank row so a
+  // multi-question ask stays scannable.
+  const groups: QuestionLine[][] = pairs.map((pair) => {
+    const group: QuestionLine[] = [{ kind: "question", text: pair.question }];
+    if (!pending && !declined) {
+      group.push({ kind: "answer", text: pair.answer ?? NO_ANSWER_TEXT });
+    }
+    return group;
+  });
+  if (pending || declined) {
+    const status: QuestionLine = pending
+      ? { kind: "status", text: AWAITING_TEXT, tone: "warning" }
+      : { kind: "status", text: DECLINE_TEXT, tone: "muted" };
+    // A lone question keeps its outcome on the following line; a
+    // multi-question ask separates the global outcome so it cannot read as
+    // answering only the last question.
+    if (groups.length > 1) groups.push([status]);
+    else groups[0]!.push(status);
   }
+
+  const lines: QuestionLine[] = [];
+  groups.forEach((group, index) => {
+    if (index > 0) lines.push({ kind: "spacer" });
+    lines.push(...group);
+  });
   return lines;
 }
 
@@ -258,6 +268,7 @@ function styleLine(
   width: number,
   theme: QuestionTheme,
 ): string[] {
+  if (line.kind === "spacer") return [""];
   const prefix =
     line.kind === "question"
       ? QUESTION_PREFIX

package/src/thinking-block-merger.ts

@@ -148,10 +148,23 @@ type MarkdownLikeChild = {
 // the italic default style is what identifies the trace: Pi passes it for
 // thinking content and for nothing else. Callers gate on the row actually
 // carrying thinking, so no other italic block is touched.
-function unitalicizeSettledThinking(row: AssistantMessageRow): void {
+// Pi 1.0 wraps each thinking child in a MouseRegion (click toggles
+// visibility); older versions hang the Markdown/Text directly. Walk both
+// shapes so the restyle reaches the node either way.
+function contentNodes(row: AssistantMessageRow): unknown[] {
   const children = row.contentContainer?.children;
-  if (!Array.isArray(children)) return;
+  if (!Array.isArray(children)) return [];
+  const nodes: unknown[] = [];
   for (const child of children) {
+    nodes.push(child);
+    const inner = (child as { child?: unknown } | undefined)?.child;
+    if (inner !== undefined && inner !== null) nodes.push(inner);
+  }
+  return nodes;
+}
+
+function unitalicizeSettledThinking(row: AssistantMessageRow): void {
+  for (const child of contentNodes(row)) {
     const markdown = child as MarkdownLikeChild | undefined;
     const style = markdown?.defaultTextStyle;
     if (style?.italic !== true) continue;
@@ -174,11 +187,9 @@ function restyleHiddenThinkingLabel(row: AssistantMessageRow): void {
     return;
   }
   const label = row.hiddenThinkingLabel;
-  const children = row.contentContainer?.children;
-  if (!Array.isArray(children)) return;
   if (!stylesThinkingLabels()) return;
   const styled = visibleThoughtLabel(label);
-  for (const child of children) {
+  for (const child of contentNodes(row)) {
     const textChild = child as TextLikeChild | undefined;
     if (
       typeof textChild?.text !== "string" ||