@pi-kaush/pi-tool-call-markers 0.3.0 → 0.3.1

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+- Restyle subagent rows: the subagent marker is now `↪` (was `&`), and single
+  calls drop the `subagent` tool label — `↪ 🤖 [coder][c3po] Implement the…` —
+  with chain/parallel step lines reordered to emoji, profile badge, name badge
+  (`1. 🐝 [workhorse][bee] …`). Single-call headings are now scraped too, so
+  agent emojis appear on single rows, not just chain/parallel steps.
+
 - Color collapsed rows (tool calls, `+ Thought`, subagents) from the
   theme's `syntaxComment` token — which ships with every theme — instead of
   the louder muted/toolTitle/toolOutput split. The bolded tool name and the

package/README.md

@@ -34,19 +34,19 @@ Collapsed tool rows use semantic theme colors with no gear, background fill, box
 
 ## Subagent plans
 
-A recognized `subagent` call renders as an unboxed plan in the shared tool aesthetic, marked with `&` instead of the ordinary `%` tool marker:
+A recognized `subagent` call renders as an unboxed plan in the shared tool aesthetic, marked with `↪` instead of the ordinary `%` tool marker:
 
 ```text
-  & subagent chain (3 steps) [repo-review]
+  ↪ subagent chain (3 steps) [repo-review]
     1. 🐝 bee [workhorse] Challenge the compatibility conclusion…
     2. 🐝 bee …
 ```
 
-Single calls stay on one `& subagent <agent> [profile] <task preview>` row; chain calls get a heading with the kind, count, and scope followed by numbered steps (parallel tasks list without numbers). Agent display names (emoji + name) are scraped from the native plan component with an args fallback, and render in `accent`; everything else stays muted, and failed subagents go full red. Subagents never join ordinary tool groups.
+Single calls stay on one `↪ [<emoji>] [<profile>][<agent>] <task preview>` row — no tool label; the `↪` marker identifies it. Chain calls get a heading with the kind, count, and scope followed by numbered steps (parallel tasks list without numbers), with each step ordered emoji, profile badge, name badge. Agent display names (emoji + name) are scraped from the native plan component — including the single-call heading — with an args fallback, and render in `accent`; everything else stays muted, and failed subagents go full red. Subagents never join ordinary tool groups.
 
 While a subagent runs, the plan headline's tail shows live progress from the streamed result details — `→ 1 turn · provider/model` in the warning tone — and a settled call keeps the same `→ N turns · provider/model` summary in muted (turns aggregate across tasks; the model shows only when every task used the same one).
 
-Malformed, ambiguous, future, or too-narrow shapes fall back to the generic `& subagent …` collapsed row rather than dropping information, and `Ctrl+O` still exposes the native subagent renderer.
+Malformed, ambiguous, future, or too-narrow shapes fall back to the generic `↪ subagent …` collapsed row rather than dropping information, and `Ctrl+O` still exposes the native subagent renderer.
 
 ## Edit diffs
 

package/package.json

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

package/src/index.ts

@@ -20,7 +20,7 @@ import { fgCollapsed } from "./muted.ts";
 
 const OUTER_INSET = 2;
 const GROUP_MARKER = "%";
-const SUBAGENT_MARKER = "&";
+const SUBAGENT_MARKER = "↪";
 const PRESENTATION_PATCHED = Symbol.for("kg.pi.toolPresentation.v3");
 const LEGACY_PRESENTATION_PATCHED = Symbol.for("kg.pi.toolPresentation.v2");
 const GROUPING_PATCHED = Symbol.for("kg.pi.toolGrouping.v1");
@@ -1028,6 +1028,19 @@ function parseStepContent(content: string): {
   };
 }
 
+// Splits a scraped "emoji name" display into its emoji prefix and bare name;
+// plain names pass through with no emoji.
+function splitEmojiName(
+  displayName: string,
+  bareName: string,
+): { emoji: string; name: string } {
+  const tokens = displayName.trim().split(/\s+/).filter(Boolean);
+  if (tokens.length > 1 && tokens[tokens.length - 1] === bareName) {
+    return { emoji: tokens.slice(0, -1).join(" "), name: bareName };
+  }
+  return { emoji: "", name: bareName };
+}
+
 // Agent display names (emoji + name) come from the subagent extension's own
 // call component when available; args only carry the bare agent name.
 function scrapeSubagentDisplayNames(
@@ -1042,10 +1055,16 @@ function scrapeSubagentDisplayNames(
   try {
     for (const raw of component.render(120)) {
       const line = sanitizeInline(stripAnsi(raw)).trim();
-      if (!line || /^subagent\b/.test(line)) continue;
-      const { displayName, bareName } = parseStepContent(
-        line.replace(/^\d+\.\s*/, ""),
-      );
+      if (!line) continue;
+      // Single calls carry the agent name on their "subagent <name>" heading
+      // line; stripping the heading word (and step numbers) lets both shapes
+      // flow through the same parse. Heading remainders without an emoji
+      // (e.g. "chain (2 steps)") degrade to displayName === bareName and are
+      // skipped by the guard below.
+      const content = line
+        .replace(/^subagent\b\s*/, "")
+        .replace(/^\d+\.\s*/, "");
+      const { displayName, bareName } = parseStepContent(content);
       if (displayName && bareName && displayName !== bareName) {
         names.set(bareName, displayName);
       }
@@ -1091,10 +1110,11 @@ function subagentProgressText(row: ToolExecutionRow): string | undefined {
   return parts.length > 0 ? parts.join(" · ") : undefined;
 }
 
-// Subagents render as an ordinary unboxed tool block: a `%` heading with the
+// Subagents render as an ordinary unboxed tool block: a `↪` heading with the
 // plan kind/count/scope, then the numbered chain steps or parallel tasks with
-// agent names in accent. Everything else stays muted (or error on failure),
-// matching the shared tool-row aesthetic.
+// agent identities (emoji, profile badge, name badge) in accent. Single calls
+// collapse to one row: `↪ <emoji> [<profile>][<name>] <task preview>`. Everything
+// else stays muted (or error on failure), matching the shared tool-row aesthetic.
 function renderSubagentPlan(
   row: ToolExecutionRow,
   width: number,
@@ -1110,19 +1130,21 @@ function renderSubagentPlan(
   const displayNames = scrapeSubagentDisplayNames(row);
   // Agent/profile/task values are model-supplied; sanitize them like every
   // other collapsed-row text so control bytes cannot reach the terminal.
-  const displayOf = (agent: string) =>
-    fgCollapsed(
-      theme,
-      nameColor,
-      displayNames.get(agent) ?? sanitizeInline(agent),
-    );
+  // Identity order: emoji, then the profile and agent-name badges.
+  const identityOf = (step: SubagentStep) => {
+    const displayName =
+      displayNames.get(step.agent) ?? sanitizeInline(step.agent);
+    const { emoji, name } = splitEmojiName(displayName, step.agent);
+    const accentPart = (text: string) => fgCollapsed(theme, nameColor, text);
+    const emojiPart = emoji ? `${accentPart(emoji)} ` : "";
+    const profilePart = step.profile
+      ? accentPart(`[${sanitizeInline(step.profile)}]`)
+      : "";
+    return `${emojiPart}${profilePart}${accentPart(`[${sanitizeInline(name)}]`)}`;
+  };
   const detailColor = failed ? "error" : "toolOutput";
-  const detailOf = (step: SubagentStep) =>
-    fgCollapsed(
-      theme,
-      detailColor,
-      `${step.profile ? ` [${sanitizeInline(step.profile)}]` : ""} ${subagentStepPreview(step.task)}`,
-    );
+  const previewOf = (step: SubagentStep) =>
+    fgCollapsed(theme, detailColor, ` ${subagentStepPreview(step.task)}`);
 
   const marker = `${fgCollapsed(theme, color, SUBAGENT_MARKER, true)} `;
   const budget = Math.max(1, width - visibleWidth(marker));
@@ -1146,14 +1168,7 @@ function renderSubagentPlan(
 
   if (plan.kind === "single") {
     const step = plan.steps[0]!;
-    return [
-      headline(
-        fgCollapsed(theme, failed ? "error" : "toolTitle", "subagent", true) +
-          " " +
-          displayOf(step.agent) +
-          detailOf(step),
-      ),
-    ];
+    return [headline(identityOf(step) + previewOf(step))];
   }
 
   const kindLabel =
@@ -1175,7 +1190,7 @@ function renderSubagentPlan(
       plan.kind === "chain"
         ? `${fgCollapsed(theme, color, `${index + 1}.`)} `
         : "";
-    lines.push(`  ${number}${displayOf(step.agent)}${detailOf(step)}`);
+    lines.push(`  ${number}${identityOf(step)}${previewOf(step)}`);
   }
   if (plan.steps.length > shown.length) {
     lines.push(