@astrosheep/square 0.4.6 → 0.4.8

package/plugins/paseo/client/square-message.tsx

@@ -1,88 +1,64 @@
 import type { PluginTimelineItemProps } from "@getpaseo/plugin/client";
 import { Icon } from "@getpaseo/plugin/client/react-native";
-import { useMemo, useState } from "react";
+import { useMemo, useRef, useState } from "react";
 import { Pressable, ScrollView, Text, View } from "react-native";
-import { COLLAPSED_PREVIEW_MAX_CHARS, outputPreview, type SquareMessageData } from "../shared/message";
-import { MONO, SquareInline, SquareMarkdownBody } from "./markdown";
+import { cardReferences, reachLabel, timeLabel } from "../shared/card-format";
+import type { SquareMessageData } from "../shared/message";
+import { SquareMarkdownBody } from "./markdown";
 import { squarePalette } from "./palette";
 
-/**
- * A matte slate slip in the timeline's shared 4px-corner family: square seal ■,
- * thin quote guide under the header.
- * Header (both states): ■ origin · authors … refs · how many.
- * Collapsed: two preview lines. Expanded: the whole scene, at full width.
- * Each structured message keeps its own author, reference and body.
- */
+/** The first guide reaches 4px above its text, toward the seal; the collapsed window still shows 4 lines. */
+const GUIDE_LEAD = 4;
+const COLLAPSED_HEIGHT = 4 * 20 + GUIDE_LEAD;
+
 export function SquareMessage({ item, theme, layout }: PluginTimelineItemProps<SquareMessageData>) {
   const [expanded, setExpanded] = useState(false);
   const [hovered, setHovered] = useState(false);
+  const [overflows, setOverflows] = useState(false);
+  const scroll = useRef<ScrollView>(null);
   const palette = useMemo(() => squarePalette(theme), [theme]);
-  const items = "items" in item.data ? item.data.items : undefined;
-  const text = "text" in item.data ? item.data.text : undefined;
-  const presentations = items?.filter(entry => "origin" in entry);
-  const latest = items?.at(-1);
-  // Keep the source's own line breaks: collapsed and expanded text must wrap alike.
-  const preview = latest && "text" in latest ? outputPreview(latest.text, COLLAPSED_PREVIEW_MAX_CHARS)
-    : latest?.preview ?? text;
-  const authors = [...new Set(presentations?.flatMap(entry => entry.author === undefined ? [] : [entry.author]))];
-  const chorus = authors.length > 1;
-  const origins = [...new Set(presentations?.map(entry => entry.origin))];
-  const originName = origins.join(", ") || "Notification";
-  const badge = presentations?.at(-1)?.badge;
-  // Exact references never imply intervening messages; each origin keeps its own references.
-  const trailing = [presentations?.flatMap(entry => entry.ref === undefined ? []
-    : [origins.length > 1 ? `${entry.origin} ${entry.ref}` : entry.ref]).join(", "),
-    presentations && presentations.length > 1 ? String(presentations.length) : undefined].filter(Boolean).join(" · ");
-  const { accent, border, foreground, foregroundMuted: muted, surface1 } = palette.theme.colors;
-  // On web the header brightens its details under the cursor; touch keeps them quiet.
-  const detail = layout.platform === "web" && hovered ? foreground : muted;
-  const row = { flexDirection: "row" as const, alignItems: "center" as const, gap: 6 };
-  const guide = { marginLeft: 2.5, paddingLeft: palette.quote.paddingLeft, borderLeftWidth: palette.quote.borderLeftWidth, borderLeftColor: palette.quote.borderLeftColor };
+  const entries = "items" in item.data ? item.data.items : [{ text: item.data.text }];
+  const presentations = entries.filter(entry => "origin" in entry);
+  const originName = [...new Set(presentations.map(entry => entry.origin))].join(", ") || "Notification";
+  const refs = cardReferences(presentations);
+  const { accent, border, foregroundMuted: muted, surface1 } = palette.theme.colors;
+  const detail = layout.platform === "web" && hovered ? muted : palette.faint;
 
-  return (
-    <View style={[
-      { backgroundColor: surface1, borderWidth: palette.card.borderWidth, borderColor: border, borderRadius: palette.card.borderRadius, paddingHorizontal: 10, paddingVertical: 7 },
-      layout.platform === "web" && { boxShadow: palette.card.boxShadow },
-    ]}>
-      <Pressable
-        accessibilityRole="button"
-        accessibilityLabel={`${expanded ? "收起" : "展开"} ${originName}: ${authors.join(", ") || "Notification"}`}
-        aria-expanded={expanded}
-        onPress={() => setExpanded(value => !value)}
-        onHoverIn={() => setHovered(true)}
-        onHoverOut={() => setHovered(false)}
-        style={({ pressed }) => ({ opacity: pressed ? 0.85 : 1 })}
-      >
-        <View style={row}>
-          <View style={{ width: 6, height: 6, borderRadius: palette.seal.borderRadius, backgroundColor: accent }} />
-          <Text numberOfLines={1} style={{ color: foreground, fontSize: 11.5, lineHeight: 17, fontWeight: "600", flex: 1 }}>
-            {originName}
-            {(authors.length > 0 || badge) && (
-              <Text style={{ color: muted, fontWeight: "400", fontSize: 10.5 }}> · {[authors.join(", "), badge].filter(Boolean).join(" · ")}</Text>
-            )}
-          </Text>
-          {trailing !== "" && <Text numberOfLines={1} style={{ color: detail, fontSize: 9.5, fontFamily: MONO, fontVariant: ["tabular-nums"], flexShrink: 1 }}>{trailing}</Text>}
-          <Icon name={expanded ? "ChevronUp" : "ChevronDown"} size={10} color={detail} />
-        </View>
-        {!expanded && preview !== undefined && preview !== "" && (
-          <View style={{ ...guide, marginTop: 5 }}>
-            <SquareInline text={preview} theme={palette.theme} numberOfLines={2} lead={chorus && latest && "author" in latest ? latest.author : undefined} />
-          </View>
-        )}
-      </Pressable>
-      {expanded && (
-        <ScrollView style={{ maxHeight: layout.compact ? 280 : 400, marginTop: 5 }} nestedScrollEnabled>
-          <View style={{ ...guide, gap: 7 }}>
-            {items === undefined ? <SquareMarkdownBody text={text ?? ""} theme={palette.theme} /> : items.map((entry, index) => (
-              <View key={index} style={index > 0 ? { paddingTop: 7, borderTopWidth: palette.card.borderWidth, borderTopColor: border } : undefined}>
-                {"text" in entry
-                  ? <SquareMarkdownBody text={entry.text} theme={palette.theme} />
-                  : <SquareMarkdownBody text={entry.body} theme={palette.theme} lead={chorus ? entry.author : undefined} />}
-              </View>
-            ))}
-          </View>
-        </ScrollView>
-      )}
+  return <Pressable onPress={() => {
+    scroll.current?.scrollTo({ y: 0, animated: false });
+    setExpanded(value => !value);
+  }} accessibilityRole="button"
+    accessibilityLabel={`${expanded ? "Collapse" : "Expand"} ${originName}`} aria-expanded={expanded}
+    onHoverIn={() => setHovered(true)} onHoverOut={() => setHovered(false)}
+    style={{ backgroundColor: surface1, borderWidth: palette.card.borderWidth,
+      borderColor: border, borderRadius: palette.card.borderRadius, paddingVertical: 9, paddingHorizontal: 12 }}>
+    <View style={{ flexDirection: "row", alignItems: "center", gap: 7, height: 16 }}>
+      <View style={{ width: 5, height: 5, backgroundColor: accent }} />
+      <Text numberOfLines={1} style={{ color: muted, fontSize: 11, fontWeight: "500", flexShrink: 1 }}>{originName}</Text>
+      {entries.length > 1 && <Text style={{ color: detail, fontSize: 11 }}>{entries.length} messages</Text>}
+      <View style={{ flex: 1 }} />
+      {!!refs && <Text numberOfLines={1} style={{ color: detail, fontSize: 11, fontVariant: ["tabular-nums"], flexShrink: 1 }}>{refs}</Text>}
+      <View style={{ width: 10, height: 10 }}>
+        {overflows && <Icon name={expanded ? "ChevronUp" : "ChevronDown"} size={10} color={detail} />}
+      </View>
+    </View>
+    <View style={{ marginTop: 8 - GUIDE_LEAD, marginLeft: 2 }}>
+      <ScrollView ref={scroll} style={{ maxHeight: expanded ? 260 : COLLAPSED_HEIGHT }} scrollEnabled={expanded} nestedScrollEnabled
+        onContentSizeChange={(_, height) => setOverflows(height > COLLAPSED_HEIGHT)}>
+        {entries.map((entry, index) => {
+          const structured = "origin" in entry;
+          // A mention speaks through the guide colour alone; reply and bell keep their word.
+          const direct = structured && reachLabel(entry.reach) !== undefined;
+          const reach = structured && entry.reach !== "mention" ? reachLabel(entry.reach) : undefined;
+          return <View key={index} style={{ borderLeftWidth: 1,
+            borderLeftColor: direct ? palette.directGuide : palette.quote.borderLeftColor,
+            paddingLeft: palette.quote.paddingLeft, marginTop: index > 0 ? 8 : 0, paddingTop: index > 0 ? 0 : GUIDE_LEAD }}>
+            <SquareMarkdownBody text={structured ? entry.body : entry.text} palette={palette}
+              author={structured ? entry.author : undefined} reach={reach}
+              time={structured && entry.at !== undefined ? timeLabel(entry.at) : undefined} />
+          </View>;
+        })}
+      </ScrollView>
     </View>
-  );
+  </Pressable>;
 }

package/plugins/paseo/client/transform.ts

@@ -1,5 +1,5 @@
 import type { PluginTimelineTransformerContribution } from "@getpaseo/plugin/client";
-import { COLLAPSED_PREVIEW_MAX_CHARS, OUTPUT_DISPLAY_MAX_CHARS, outputPreview, squareCardDetailsSchema, type SquareMessageData } from "../shared/message.ts";
+import { OUTPUT_DISPLAY_MAX_CHARS, outputPreview, squareCardDetailsSchema, type SquareMessageData } from "../shared/message.ts";
 
 // Recognition is metadata-based, not a guess from a tool name or body text.
 // The same projection applies to live events and fetched history.
@@ -12,17 +12,15 @@ export const transformSquareMessage: PluginTimelineTransformerContribution<"tool
   const details = squareCardDetailsSchema.safeParse(item.metadata.details);
   let data: SquareMessageData;
   if (details.success) {
-    const items = details.data.items, latest = items.at(-1)!;
-    const preview = outputPreview("text" in latest ? latest.text : latest.preview ?? latest.body, COLLAPSED_PREVIEW_MAX_CHARS);
-    let remaining = OUTPUT_DISPLAY_MAX_CHARS - preview.length;
+    const items = details.data.items;
+    let remaining = OUTPUT_DISPLAY_MAX_CHARS;
     const clipped = items.reduce((sum, entry) => sum + ("text" in entry ? entry.text : entry.body).length, 0) > remaining;
     data = { items: items.map((entry, index) => {
       const source = "text" in entry ? entry.text : entry.body;
       const body = clipped ? outputPreview(source, Math.floor(remaining / (items.length - index))) : source;
       remaining -= body.length;
       if ("text" in entry) return { text: body };
-      const { preview: _preview, ...presentation } = entry;
-      return { ...presentation, body, ...(index === items.length - 1 ? { preview } : {}) };
+      return { ...entry, body };
     }) };
   } else {
     data = { text: outputPreview(item.detail.text) };

package/plugins/paseo/shared/card-format.ts

@@ -0,0 +1,37 @@
+import type { CardPresentation } from "./card-presentation.ts";
+
+export function reachLabel(reach?: CardPresentation["reach"]): string | undefined {
+  return reach === "mention" ? "@you" : reach === "attention" ? undefined : reach;
+}
+
+/** Calendar days, rather than elapsed hours, keep yesterday correct across DST. */
+export function timeLabel(at: number, now = Date.now(), compact = false): string {
+  const date = new Date(at), today = new Date(now);
+  const day = (value: Date) => `${value.getFullYear()}-${value.getMonth()}-${value.getDate()}`;
+  const clock = `${String(date.getHours()).padStart(2, "0")}:${String(date.getMinutes()).padStart(2, "0")}`;
+  if (day(date) === day(today)) return clock;
+  const yesterday = new Date(today);
+  yesterday.setDate(today.getDate() - 1);
+  if (day(date) === day(yesterday)) return `${compact ? "yest" : "yesterday"} ${clock}`;
+  const shortDate = compact
+    ? `${String(date.getMonth() + 1).padStart(2, "0")}/${String(date.getDate()).padStart(2, "0")}`
+    : date.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+  return `${shortDate} ${clock}`;
+}
+
+/** Only adjacent references from the same origin can form a range. */
+export function cardReferences(items: readonly CardPresentation[], originLabel: (origin: string) => string = origin => origin): string {
+  const multipleOrigins = new Set(items.map(item => item.origin)).size > 1;
+  const runs: { origin: string; ref: string; first?: number; last?: number }[] = [];
+  for (const item of items) {
+    if (item.ref === undefined) continue;
+    const match = /^act\/(\d+)$/.exec(item.ref);
+    const index = match ? Number(match[1]) : undefined;
+    const previous = runs.at(-1);
+    if (index !== undefined && previous?.origin === item.origin && previous.last !== undefined && previous.last + 1 === index) {
+      previous.last = index;
+    } else runs.push({ origin: item.origin, ref: item.ref, first: index, last: index });
+  }
+  return runs.map(run => `${multipleOrigins ? `${originLabel(run.origin)} ` : ""}${run.first !== run.last
+    ? `act/${run.first}–${run.last}` : run.ref}`).join(", ");
+}

package/plugins/paseo/shared/card-presentation.ts

@@ -4,7 +4,9 @@ export type CardPresentation = {
   readonly origin: string;
   readonly author?: string;
   readonly ref?: string;
-  readonly badge?: string;
+  /** Absent on cards produced before landing time and reach were recorded. */
+  readonly at?: number;
+  readonly reach?: 'mention' | 'reply' | 'attention' | 'bell';
   readonly body: string;
 };
 
@@ -12,5 +14,7 @@ export function isCardPresentation(value: unknown): value is CardPresentation {
   if (!value || typeof value !== 'object' || Array.isArray(value)) return false;
   const item = value as Record<string, unknown>;
   return item.kind === 'presentation' && typeof item.origin === 'string' && typeof item.body === 'string'
-    && ['author', 'ref', 'badge'].every(key => item[key] === undefined || typeof item[key] === 'string');
+    && (item.at === undefined || (typeof item.at === 'number' && Number.isFinite(item.at)))
+    && (item.reach === undefined || ['mention', 'reply', 'attention', 'bell'].includes(item.reach as string))
+    && ['author', 'ref'].every(key => item[key] === undefined || typeof item[key] === 'string');
 }

package/plugins/paseo/shared/message.ts

@@ -3,12 +3,10 @@ import { isCardPresentation, type CardPresentation } from "./card-presentation.t
 
 /** Aggregate client display budget, including omission lines; source history stays unchanged. */
 export const OUTPUT_DISPLAY_MAX_CHARS = 32_000;
-export const COLLAPSED_PREVIEW_MAX_CHARS = 1_000;
 export function outputPreview(text: string, maxChars = OUTPUT_DISPLAY_MAX_CHARS): string {
   if (maxChars <= 0) return "";
   if (text.length <= maxChars) return text;
   const middle = "\n\n… Showing the beginning and end; the middle is hidden in this preview. …\n\n";
-  // Even a small share of a multi-message budget must fit, without splitting a surrogate pair.
   if (maxChars <= middle.length) return text.slice(0, maxChars - 1).replace(/[\uD800-\uDBFF]$/, "") + "…";
   const headChars = Math.floor((maxChars - middle.length) / 2);
   const head = text.slice(0, headChars).replace(/[\uD800-\uDBFF]$/, "");
@@ -16,13 +14,10 @@ export function outputPreview(text: string, maxChars = OUTPUT_DISPLAY_MAX_CHARS)
   return head + middle + tail;
 }
 
-/** Receiver display facts, with a bounded preview derived on the client. */
-const presentationItemSchema = z.custom<CardPresentation>(isCardPresentation)
-  .and(z.object({ preview: z.string().optional() }));
+const presentationItemSchema = z.custom<CardPresentation>(isCardPresentation);
 export const squareCardDetailsSchema = z.object({
   items: z.array(z.union([presentationItemSchema, z.object({ text: z.string() })])).min(1),
 });
-
 export const squareMessageSchema = z.union([
   squareCardDetailsSchema,
   z.object({ text: z.string() }),

package/plugins/pi/square-pi.js

@@ -1,14 +1,14 @@
-import { Box, Markdown, truncateToWidth, visibleWidth } from '@earendil-works/pi-tui';
+import { Box, Markdown, stripTerminalSequences, truncateToWidth, visibleWidth } from '@earendil-works/pi-tui';
+import { cardReferences, reachLabel, timeLabel } from '../../dist/card-format.js';
 import { z } from 'zod/v4';
 
-import { Square, discover, squareClock } from '../../dist/square-api.js';
+import { Square, discover } from '../../dist/square-api.js';
 import { harnessOwner } from '../../dist/owner.js';
 import { DeliveryLedger } from '../../dist/delivery-ledger.js';
 import { deliveryFrameOverhead, renderDeliveryReminder } from '../../dist/delivery-frame.js';
 import { isCardPresentation } from '../../dist/card-presentation.js';
 import { SQUARE_TOOLS, SQUARE_TOOL_INSTRUCTIONS, createSquareToolRunner, squareToolsEnabled } from '../../dist/square-tools.js';
-import { operationEnv } from '../../dist/participant-identity.js';
-import { attachDeliverySession, detachDeliverySession } from '../../dist/session-lifecycle.js';
+import { attachDeliverySessionRoutes, detachDeliverySession } from '../../dist/session-lifecycle.js';
 import { createPiReceiver, sendPiMessage } from '../../dist/packages/agent-delivery/src/pi.js';
 
 const BUDGET_CHARS = 12_000;
@@ -26,81 +26,99 @@ function markdownTheme(theme) {
     heading: color('mdHeading'), link: color('mdLink'), linkUrl: color('mdLinkUrl'), code: color('mdCode'),
     codeBlock: color('mdCodeBlock'), codeBlockBorder: color('mdCodeBlockBorder'), quote: color('mdQuote'),
     quoteBorder: color('mdQuoteBorder'), hr: color('mdHr'), listBullet: color('mdListBullet'),
-    bold: style(theme, 'bold'), italic: (text) => fg(theme, 'muted')(style(theme, 'italic')(text)),
+    // The inline parser has already applied the body foreground; let muted win without dropping bold/link styles.
+    bold: style(theme, 'bold'), italic: (text) => fg(theme, 'muted')(style(theme, 'italic')(
+      text.replace(/\x1b\[(?:38;[\d;]+|3[0-79]|9[0-7])m/g, ''))),
     underline: style(theme, 'underline'), strikethrough: style(theme, 'strikethrough'),
   };
 }
 
-/** Keep the short references; the long origin is the part that may ellipsize. */
+/** Keep references intact before spending the remaining columns on the origin. */
 function cardHeader(left, right, width) {
-  if (!right) return truncateToWidth(left, width);
+  if (!right) return truncateToWidth(left, width, '…');
   const rightWidth = visibleWidth(right);
-  if (rightWidth + 4 >= width) return truncateToWidth(left, width);
+  if (rightWidth + 4 >= width) return truncateToWidth(right, width, '…');
   const leftWidth = width - rightWidth - 2;
-  return `${truncateToWidth(left, leftWidth)}${' '.repeat(width - Math.min(visibleWidth(left), leftWidth) - rightWidth)}${right}`;
+  const label = truncateToWidth(left, leftWidth, '…');
+  return `${label}${' '.repeat(width - visibleWidth(label) - rightWidth)}${right}`;
 }
 
 const escapeMarkdown = text => text.replace(/[!"#$%&'()*+,\-./:;<=>?@[\\\]^_`{|}~]/g, '\\$&');
 const shortOrigin = origin => origin.split(/[\\/]/).filter(Boolean).at(-1) || origin;
 
-/** The same quiet quote guide in collapsed and expanded states. */
-function guidedMarkdown(text, theme, { preview = false, lead } = {}) {
-  const source = lead ? `**${escapeMarkdown(lead)}** ${text}` : text;
-  const markdown = new Markdown(source, 0, 0, markdownTheme(theme), { color: fg(theme, 'customMessageText') });
-  const guide = fg(theme, 'mdQuoteBorder')('│ ');
+/** A final fence also covers very narrow terminals and Markdown tables/code. */
+function bounded(component) {
   return {
-    invalidate() { markdown.invalidate(); },
-    render(width) {
-      const contentWidth = Math.max(1, width - 2);
-      let lines = markdown.render(contentWidth);
-      if (preview) {
-        const visible = lines.filter(line => line.trim() !== '');
-        const clipped = visible.length > 2 || text.length >= 1_000;
-        lines = visible.slice(0, 2);
-        if (clipped && lines.length) lines[lines.length - 1] = truncateToWidth(`${lines.at(-1).trimEnd()}${fg(theme, 'dim')('…')}`, contentWidth);
-      }
-      return lines.map(line => guide + line);
-    },
+    invalidate() { component.invalidate?.(); },
+    render(width) { return component.render(Math.max(1, width)).map(line => truncateToWidth(line, Math.max(0, width), '…')); },
   };
 }
 
-/** People get the producer's display facts, never the model-facing reminder envelope. */
+/** Human display only: model-facing content and delivery receipts are independent. */
 export function renderSquareCard(message, { expanded, outputPad = 1 }, theme) {
   if (typeof message.content !== 'string') return undefined;
   const items = message.details?.items;
   if (!Array.isArray(items) || items.length === 0
     || items.some(item => !isCardPresentation(item) && typeof item?.text !== 'string')) {
-    return new Markdown(message.content, outputPad, 0, markdownTheme(theme));
+    return bounded(new Markdown(message.content, outputPad, 0, markdownTheme(theme)));
   }
   const presentations = items.filter(isCardPresentation);
-  const authors = [...new Set(presentations.flatMap(item => item.author === undefined ? [] : [item.author]))];
   const origins = [...new Set(presentations.map(item => item.origin))];
   const originName = origins.map(shortOrigin).join(', ') || 'Notification';
-  const badge = presentations.at(-1)?.badge;
-  const byline = [authors.join(', '), badge].filter(Boolean).join(' · ');
-  const refs = presentations.flatMap(item => item.ref === undefined ? []
-    : [origins.length > 1 ? `${shortOrigin(item.origin)} ${item.ref}` : item.ref]).join(', ');
-  const trailing = [refs, presentations.length > 1 ? String(presentations.length) : undefined].filter(Boolean).join(' · ');
+  const refs = cardReferences(presentations, shortOrigin);
+  const count = items.length > 1 ? fg(theme, 'dim')(`  ${items.length} messages`) : '';
+  const left = `${fg(theme, 'accent')('■')} ${fg(theme, 'muted')(originName)}${count}`;
+  const now = Date.now();
+  const bodyColor = fg(theme, 'customMessageText');
+  // Restore the body color after each styled attribution inside the Markdown source.
+  const bodyPrefix = bodyColor('\0').split('\0')[0];
+  const messages = items.map(item => {
+    const structured = isCardPresentation(item);
+    const label = structured ? reachLabel(item.reach) : undefined;
+    const name = structured && item.author !== undefined
+      ? fg(theme, 'accent')(style(theme, 'bold')(escapeMarkdown(item.author))) : '';
+    const lead = [name, label ? fg(theme, 'warning')(label) : ''].filter(Boolean).join(`${bodyPrefix} `);
+    const body = structured ? item.body : item.text;
+    // Block Markdown keeps its own first row when there is no paragraph to run into.
+    const block = /^(?: {0,3})(?:`{3}|~{3}|#{1,6}\s|>|[-+*]\s|\d+[.)]\s|\|)/.test(body);
+    const source = lead ? `${lead}${bodyPrefix}${block ? '\n\n' : ' '}${body}` : body;
+    return {
+      markdown: new Markdown(source, 0, 0, markdownTheme(theme), { color: bodyColor }),
+      guide: fg(theme, label ? 'warning' : 'borderMuted')('│ '),
+      time: structured && item.at !== undefined ? timeLabel(item.at, now, true) : '',
+    };
+  });
+  const timeWidth = Math.max(0, ...messages.map(item => visibleWidth(item.time)));
+  const gutter = timeWidth ? timeWidth + 2 : 0;
   const box = new Box(outputPad, 1, text => theme.bg?.('customMessageBg', text) ?? text);
-  const left = `${fg(theme, 'accent')('■')} ${style(theme, 'bold')(originName)}${byline ? fg(theme, 'muted')(` · ${byline}`) : ''}`;
-  const right = trailing ? fg(theme, 'dim')(trailing) : '';
-  box.addChild({ invalidate() {}, render(width) { return [cardHeader(left, right, width)]; } });
-  const bodyOf = item => isCardPresentation(item) ? item.body : item.text;
-  if (!expanded) {
-    const body = bodyOf(items.at(-1));
-    if (body.trim()) box.addChild(guidedMarkdown(body.slice(0, 1_000).replace(/[\uD800-\uDBFF]$/, ''), theme, { preview: true }));
-    return box;
-  }
-  for (const [index, item] of items.entries()) {
-    if (index > 0) box.addChild({
-      invalidate() {},
-      render(width) { return [`${fg(theme, 'mdQuoteBorder')('│ ')}${fg(theme, 'borderMuted')('─'.repeat(Math.max(1, width - 2)))}`]; },
-    });
-    box.addChild(guidedMarkdown(bodyOf(item), theme, {
-      lead: authors.length > 1 && isCardPresentation(item) ? item.author : undefined,
-    }));
-  }
-  return box;
+  box.addChild({
+    invalidate() { for (const item of messages) item.markdown.invalidate(); },
+    render(width) {
+      const bodyWidth = Math.max(1, width - 2 - gutter);
+      const lines = messages.flatMap(item => {
+        const body = item.markdown.render(bodyWidth);
+        // An empty activity can still carry attribution/time.
+        if (body.length === 0 && item.time) body.push('');
+        return body.map((words, index) => ({ guide: item.guide, words, time: index === 0 ? item.time : '' }));
+      });
+      const rows = expanded ? lines : lines.filter(line => stripTerminalSequences(line.words).trim() !== '');
+      const hidden = expanded ? 0 : Math.max(0, rows.length - 4);
+      const visible = (hidden ? rows.slice(0, 4) : rows).map((line, index) => {
+        let words = truncateToWidth(line.words, bodyWidth, '…');
+        if (hidden && index === 3) {
+          words = truncateToWidth(line.words, Math.max(0, bodyWidth - 1), '');
+          words = truncateToWidth(words, visibleWidth(stripTerminalSequences(words).trimEnd()), '') + fg(theme, 'dim')('…');
+        }
+        const time = line.time
+          ? ' '.repeat(Math.max(2, width - 2 - visibleWidth(words) - visibleWidth(line.time))) + fg(theme, 'dim')(line.time)
+          : '';
+        return truncateToWidth(line.guide + words + time, width, '…');
+      });
+      if (hidden) visible.push(truncateToWidth(fg(theme, 'dim')(`  +${hidden} ${hidden === 1 ? 'line' : 'lines'}`), width, '…'));
+      return [cardHeader(left, fg(theme, 'dim')(refs), width), ...visible];
+    },
+  });
+  return bounded(box);
 }
 
 export default function squarePiExtension(pi) {
@@ -116,13 +134,10 @@ export default function squarePiExtension(pi) {
       async execute(_id, args, signal, _onUpdate, ctx) {
         const { text, isError } = await invoke(tool, args, { signal }, () => {
           const sessionId = ctx.sessionManager.getSessionId();
-          const env = operationEnv('pi', sessionId, process.env);
           return {
             identity: { owner: harnessOwner({ channel: 'pi', session: sessionId }) },
-            open: (location, control) => Square.at({
-              cwd: ctx.cwd, env, path: location,
-            }, control),
-            discover: async (options, control) => ({ result: await discover({ cwd: ctx.cwd, env }, options, control), now: squareClock(env)() }),
+            open: (location, control) => Square.at({ cwd: ctx.cwd, path: location }, control),
+            discover: (options, control) => discover({ cwd: ctx.cwd }, options, control),
           };
         });
         return { ...(isError ? { isError } : {}), content: [{ type: 'text', text }] };
@@ -245,9 +260,10 @@ export default function squarePiExtension(pi) {
       await previous.ledger.close();
     }
     if (token !== epoch || cancellationFailed) return;
-    const owner = harnessOwner({ channel: 'pi', session: ctx.sessionManager.getSessionId() });
+    const sessionId = ctx.sessionManager.getSessionId();
+    const owner = harnessOwner({ channel: 'pi', session: sessionId });
     const signal = AbortSignal.timeout(5000);
-    const attached = await attachDeliverySession(owner, process.env, undefined, signal);
+    const attached = await attachDeliverySessionRoutes(owner, process.env, [{ kind: 'pi-native', address: { sessionId } }], signal);
     if (!attached) return;
     if (token !== epoch) {
       await detachDeliverySession(owner, attached.generation, process.env, AbortSignal.timeout(5000));

package/skills/square/SKILL.md

@@ -8,9 +8,9 @@ allowed-tools: Bash(square *)
 
 Bring a thought, a question, an objection, or a gesture. Leave private tool chatter out; quiet is welcome too.
 
-This skill explains what Square is and how to be present in it. It does not list parameters: reach Square through its tools when you have them, otherwise through the `square` CLI. The tool descriptions and `square <operation> --help` are the exact usage. The tools group listen, unlisten and ignore under `attention`.
+This skill explains what Square is and how to be present in it. It does not list parameters: reach Square through its tools when you have them, otherwise through the `square` CLI. The tool descriptions and `square <operation> --help` are the exact usage.
 
-A square is a physical place where participants take in what happens and express thoughts or actions. Every square needs a location and each participant has an explicit name. Tools take the execution body from their live harness context. Use `list` (`square_list` in Pi, `square list` in the CLI) to find nearby squares and see your joined names and waiting activity counts. Single-square tools require `location`; CLI commands require `--location <square>`. Join with an explicit `--as <name>` (tool argument `as`). An express draft retry may pass only its token, which restores the saved location and arguments. Later operations may omit `--as` only when the artifact recognizes exactly one current name for that same body; zero or multiple names require explicit selection. A name never grants custody.
+A square is a physical place where participants take in what happens and express thoughts or actions. Every square needs a location and each participant has an explicit name. Tools take the execution body from their live harness context. Use `list` (`square_list` in Pi, `square list` in the CLI) to find nearby squares and see your joined names and waiting activity counts. Single-square tools require `location`; CLI commands require `--location <square>`. Join with an explicit `--as <name>` (tool argument `as`). Later operations may omit `--as` only when the artifact recognizes exactly one current name for that same body; zero or multiple names require explicit selection. A name never grants custody.
 
 ## The rhythm
 

package/dist/claude-boundary-state.d.ts

@@ -1,20 +0,0 @@
-import { z } from 'zod/v4';
-declare const stateSchema: z.ZodObject<{
-    generation: z.ZodString;
-    promptId: z.ZodOptional<z.ZodString>;
-    stopEpoch: z.ZodString;
-    consumed: z.ZodBoolean;
-    ended: z.ZodBoolean;
-}, z.core.$strip>;
-export type ClaudeBoundary = z.infer<typeof stateSchema>;
-/** Receiver operational facts only: no cards, claims, or payload copies. */
-export declare function claudeBoundaryStore(session: string, env: NodeJS.ProcessEnv): {
-    start(attach: () => Promise<string | false>, signal?: AbortSignal): Promise<void>;
-    end(signal?: AbortSignal): Promise<ClaudeBoundary | undefined>;
-    prompt(promptId: string | undefined, signal?: AbortSignal): Promise<void>;
-    capture(promptId: string, signal?: AbortSignal): Promise<ClaudeBoundary | undefined>;
-    current(captured: ClaudeBoundary, signal?: AbortSignal): Promise<boolean>;
-    consume(captured: ClaudeBoundary, signal?: AbortSignal): Promise<void>;
-    watch<T>(signal: AbortSignal, run: () => Promise<T>): Promise<T>;
-};
-export {};

package/dist/claude-boundary-state.js

@@ -1,84 +0,0 @@
-import { createHash, randomUUID } from 'node:crypto';
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { z } from 'zod/v4';
-import { deliveryLedgerLocation } from './delivery-ledger.js';
-import { withFileLock } from './file-lock.js';
-const stateSchema = z.object({
-    generation: z.string().min(1), promptId: z.string().min(1).optional(),
-    stopEpoch: z.string().min(1), consumed: z.boolean(), ended: z.boolean(),
-});
-/** Receiver operational facts only: no cards, claims, or payload copies. */
-export function claudeBoundaryStore(session, env) {
-    const root = path.join(path.dirname(deliveryLedgerLocation(env)), 'claude-hooks');
-    const key = createHash('sha256').update(session).digest('hex');
-    const file = path.join(root, `${key}.json`);
-    async function mutate(change, signal) {
-        await fs.mkdir(root, { recursive: true, mode: 0o700 });
-        await fs.chmod(root, 0o700);
-        return withFileLock(path.join(root, `${key}.lock`), { retryMs: 10, signal: signal ?? AbortSignal.timeout(2500) }, async () => {
-            let state;
-            try {
-                state = stateSchema.parse(JSON.parse(await fs.readFile(file, 'utf8')));
-            }
-            catch (error) {
-                if (error.code !== 'ENOENT')
-                    throw error;
-            }
-            return change(state, async (next) => {
-                const temporary = `${file}.${randomUUID()}.tmp`;
-                try {
-                    await fs.writeFile(temporary, JSON.stringify(next), { mode: 0o600, flag: 'wx' });
-                    await fs.rename(temporary, file);
-                }
-                finally {
-                    await fs.rm(temporary, { force: true });
-                }
-            });
-        });
-    }
-    const matches = (state, captured) => !!state && !state.ended && !state.consumed
-        && state.generation === captured.generation && state.promptId === captured.promptId && state.stopEpoch === captured.stopEpoch;
-    return {
-        async start(attach, signal) {
-            await mutate(async (state, save) => {
-                if (state)
-                    await save({ ...state, promptId: undefined, ended: true, stopEpoch: randomUUID() });
-                const generation = await attach();
-                if (generation)
-                    await save({ generation, stopEpoch: randomUUID(), consumed: false, ended: false });
-            }, signal);
-        },
-        async end(signal) {
-            return mutate(async (state, save) => {
-                if (state)
-                    await save({ ...state, ended: true, stopEpoch: randomUUID() });
-                return state;
-            }, signal);
-        },
-        async prompt(promptId, signal) {
-            await mutate(async (state, save) => {
-                if (state && !state.ended)
-                    await save({ ...state, promptId, stopEpoch: randomUUID(), consumed: false });
-            }, signal);
-        },
-        capture(promptId, signal) {
-            return mutate(async (state) => state && !state.ended && !state.consumed && state.promptId === promptId ? state : undefined, signal);
-        },
-        current(captured, signal) { return mutate(async (state) => matches(state, captured), signal); },
-        async consume(captured, signal) {
-            await mutate(async (state, save) => {
-                if (matches(state, captured))
-                    await save({ ...state, consumed: true });
-            }, signal);
-        },
-        async watch(signal, run) {
-            await fs.mkdir(root, { recursive: true, mode: 0o700 });
-            const lock = path.join(root, `${key}.watch.lock`);
-            const handle = await fs.open(lock, 'a', 0o600);
-            await handle.close();
-            // A newer Stop waits through bounded shutdown; it must not skip a busy lock.
-            return withFileLock(lock, { retryMs: 10, signal }, run);
-        },
-    };
-}

package/dist/claude-hook.d.ts

@@ -1,2 +0,0 @@
-export declare function runClaudeHook(text: string, env?: NodeJS.ProcessEnv, sink?: (value: string) => void | Promise<void>): Promise<string>;
-export declare function runClaudeWatch(text: string, env?: NodeJS.ProcessEnv, signal?: AbortSignal, output?: (frame: string) => Promise<void>): Promise<string>;