@astrosheep/square 0.3.106 → 0.4.1

package/plugins/paseo/OVERVIEW.md

@@ -5,10 +5,10 @@ who reached you and where. Expand it to see the original custom-message content,
 select text, or copy it in full. The card follows the active Paseo theme on
 desktop and mobile.
 
-Requires Paseo 0.11.2 or newer with custom-message tool rows (#6090). Square
-0.3.69 or newer supplies structured card headings. Older messages and joining
-context use a neutral “Square context” heading.
+Requires Paseo 0.11.2 or newer with custom-message tool rows (#6090). Structured messages
+carry producer-neutral origin, author, reference, badge and full body details. Plain messages and
+joining context use a neutral notification heading.
 
 The plugin changes presentation only. It does not send prompts or alter model
-context. If Square clipped a body before delivery, expansion shows that same
-preview and the command for reading the rest, not an additional fetch.
+context. Expansion shows the delivered full display body, within a bounded preview,
+while model-facing text stays clipped as before. No producer storage fetch is needed.

package/plugins/paseo/README.md

@@ -16,8 +16,9 @@ Paseo supplies all runtime modules. No Git preparation step is needed. Plugins
 are trusted, unsandboxed code running inside the Paseo app.
 
 Requires Paseo >=0.11.2 with custom-message tool rows (#6090). Structured notification
-cards use Square's `details.items`, including each item's `actor`, `act`, `body` and
-`route`. Missing or malformed details fall back to the original plain text.
+cards use `details.items` with producer-neutral presentation facts: `kind: 'presentation'`, `origin`,
+optional `author`, `ref` and `badge`, and the full Markdown `body`. Missing or malformed details fall
+back to the original plain text.
 
 ## Display
 
@@ -27,9 +28,9 @@ and unrecognized rows remain unchanged.
 
 The heading and expanded messages use `metadata.details.items` directly, never
 reverse-parsing notification envelopes or body text for senders, IDs or message
-boundaries. Each expanded item keeps its full source body, author, exact activity ID
-and bell marker, even when the model preview was clipped or omitted. IDs with gaps
-are not compressed into a misleading range; items from different squares remain
+boundaries. Each expanded item keeps its full source body, author, exact reference
+and badge, even when the model preview was clipped or omitted. References with gaps
+are not compressed into a misleading range; items from different origins remain
 separate. Collapsing shows only the last item's preview. Body text containing square
 tags is ordinary content, not another notification.
 
@@ -44,7 +45,7 @@ Long content scrolls inside a bounded panel. The
 card does not fetch extra activity or mark anything seen. Live events and fetched history use
 the same transformer.
 
-An accent glyph, actor and square name identify the card. The header and its arrow
+An accent glyph, author and origin label identify the card. The header and its arrow
 toggle an inline drawer. It uses Paseo theme colors, selectable text, accessible
 expansion state and compact layout on narrow displays. Removing the plugin restores
 Paseo's ordinary custom-message row.

package/plugins/paseo/client/markdown.tsx

@@ -166,14 +166,14 @@ export function SquareCue({ label, theme }: { label: ReactNode; theme: PluginThe
 }
 
 /**
- * A body of Markdown: no envelope, no route line — the words only, at full width.
- * `lead` runs the speaker into the first line; `actor` names whoever performs an action.
+ * A body of Markdown: no envelope — the words only, at full width.
+ * `lead` runs the author into the first line; `author` names whoever performs an action.
  */
-export function SquareMarkdownBody({ text, theme, lead, actor }: {
+export function SquareMarkdownBody({ text, theme, lead, author }: {
   text: string;
   theme: PluginTheme;
   lead?: string;
-  actor?: string;
+  author?: string;
 }) {
   const styles = useMemo(() => makeStyles(theme.colors), [theme.colors]);
   const tokens = useMemo(() => lexer(text).filter(token => token.type !== "space"), [text]);
@@ -182,7 +182,7 @@ export function SquareMarkdownBody({ text, theme, lead, actor }: {
     const key = `body-${index}`;
     if (isAction(token)) {
       const words = renderInlines(children(children(token)[0]!), styles, key);
-      return <SquareCue key={key} theme={theme} label={actor === undefined ? words : <>{actor} {words}</>} />;
+      return <SquareCue key={key} theme={theme} label={author === undefined ? words : <>{author} {words}</>} />;
     }
     if (pending === undefined) return renderBlocks([token], styles, key);
     const name = pending;

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

@@ -2,17 +2,17 @@ import type { PluginTimelineItemProps } from "@getpaseo/plugin/client";
 import { Icon } from "@getpaseo/plugin/client/react-native";
 import { useMemo, useState } from "react";
 import { Pressable, ScrollView, Text, View } from "react-native";
-import type { SquareMessageData } from "../shared/message";
+import { COLLAPSED_PREVIEW_MAX_CHARS, outputPreview, type SquareMessageData } from "../shared/message";
 import { MONO, SquareCue, SquareInline, 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): ■ square · who spoke … act ids · how many.
+ * 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 sender, activity id and body.
- * A bell or an *action* is stage direction, a caption on a hairline.
+ * Each structured message keeps its own author, reference and body.
+ * A badge or an *action* is stage direction, a caption on a hairline.
  */
 export function SquareMessage({ item, theme, layout }: PluginTimelineItemProps<SquareMessageData>) {
   const [expanded, setExpanded] = useState(false);
@@ -20,18 +20,20 @@ export function SquareMessage({ item, theme, layout }: PluginTimelineItemProps<S
   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?.preview ?? text;
-  const speakers = [...new Set(items?.map(entry => entry.actor))];
-  const chorus = speakers.length > 1;
-  const squares = [...new Set(items?.map(entry => entry.square))];
-  const squareName = squares.join(", ") || "Square";
-  const bell = latest?.route === "bell";
-  // Exact IDs never imply intervening activities, and different squares keep their own IDs.
-  const actIds = items?.map(entry => entry.act) ?? [];
-  const trailing = [items?.map(entry => squares.length > 1 ? `${entry.square} ${entry.act}` : entry.act).join(", "),
-    items && items.length > 1 ? String(items.length) : undefined].filter(Boolean).join(" · ");
+  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;
@@ -45,7 +47,7 @@ export function SquareMessage({ item, theme, layout }: PluginTimelineItemProps<S
     ]}>
       <Pressable
         accessibilityRole="button"
-        accessibilityLabel={`${expanded ? "收起" : "展开"} ${squareName}: ${speakers.join(", ") || "Square"}`}
+        accessibilityLabel={`${expanded ? "收起" : "展开"} ${originName}: ${authors.join(", ") || "Notification"}`}
         aria-expanded={expanded}
         onPress={() => setExpanded(value => !value)}
         onHoverIn={() => setHovered(true)}
@@ -55,9 +57,9 @@ export function SquareMessage({ item, theme, layout }: PluginTimelineItemProps<S
         <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 }}>
-            {squareName}
-            {(speakers.length > 0 || bell) && (
-              <Text style={{ color: muted, fontWeight: "400", fontSize: 10.5 }}> · {[speakers.join(", "), bell ? "🔔" : ""].filter(Boolean).join(" · ")}</Text>
+            {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>}
@@ -65,19 +67,21 @@ export function SquareMessage({ item, theme, layout }: PluginTimelineItemProps<S
         </View>
         {!expanded && preview !== undefined && preview !== "" && (
           <View style={{ ...indent, marginTop: 5, marginLeft: 2.5, paddingLeft: palette.quote.paddingLeft, borderLeftWidth: palette.quote.borderLeftWidth, borderLeftColor: palette.quote.borderLeftColor }}>
-            <SquareInline text={preview} theme={palette.theme} numberOfLines={2} lead={chorus ? latest?.actor : undefined} />
+            <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: 3 }} nestedScrollEnabled>
           <View style={{ ...indent, gap: 7 }}>
-            {items === undefined ? <SquareMarkdownBody text={text ?? ""} theme={palette.theme} /> : items.map((entry, index) => (
+            {items === undefined ? <SquareMarkdownBody text={text ?? ""} theme={palette.theme} /> : items.map((entry, index) => "text" in entry ? (
+              <SquareMarkdownBody key={index} text={entry.text} theme={palette.theme} />
+            ) : (
               <View key={index} style={{ gap: 6 }}>
-                {entry.route === "bell"
-                  ? <SquareCue theme={palette.theme} label={`${entry.actor} 🔔 · ${entry.square} · ${entry.act}`} />
-                  : <Text style={{ color: muted, fontSize: 11, fontFamily: MONO }}>{entry.square} · {entry.act}</Text>}
-                <SquareMarkdownBody text={entry.body} theme={palette.theme} lead={chorus ? entry.actor : undefined} actor={entry.actor} />
+                {entry.badge
+                  ? <SquareCue theme={palette.theme} label={[[entry.author, entry.badge].filter(Boolean).join(" "), entry.origin, entry.ref].filter(Boolean).join(" · ")} />
+                  : <Text style={{ color: muted, fontSize: 11, fontFamily: MONO }}>{[entry.origin, entry.ref].filter(Boolean).join(" · ")}</Text>}
+                <SquareMarkdownBody text={entry.body} theme={palette.theme} lead={chorus ? entry.author : undefined} author={entry.author} />
               </View>
             ))}
           </View>

package/plugins/paseo/client/transform.ts

@@ -13,13 +13,16 @@ export const transformSquareMessage: PluginTimelineTransformerContribution<"tool
   let data: SquareMessageData;
   if (details.success) {
     const items = details.data.items, latest = items.at(-1)!;
-    const preview = outputPreview(latest.preview ?? latest.body, COLLAPSED_PREVIEW_MAX_CHARS);
+    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 clipped = items.reduce((sum, entry) => sum + entry.body.length, 0) > remaining;
-    data = { items: items.map(({ preview: _preview, ...entry }, index) => {
-      const body = clipped ? outputPreview(entry.body, Math.floor(remaining / (items.length - index))) : entry.body;
+    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;
-      return { ...entry, body, ...(index === items.length - 1 ? { preview } : {}) };
+      if ("text" in entry) return { text: body };
+      const { preview: _preview, ...presentation } = entry;
+      return { ...presentation, body, ...(index === items.length - 1 ? { preview } : {}) };
     }) };
   } else {
     data = { text: outputPreview(item.detail.text) };

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

@@ -0,0 +1,16 @@
+/** Producer-neutral display facts; independent of model-facing delivery text. */
+export type CardPresentation = {
+  readonly kind: 'presentation';
+  readonly origin: string;
+  readonly author?: string;
+  readonly ref?: string;
+  readonly badge?: string;
+  readonly body: string;
+};
+
+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');
+}

package/plugins/paseo/shared/message.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { isCardPresentation, type CardPresentation } from "./card-presentation.ts";
 
 /** Aggregate client display budget, including omission lines; source history stays unchanged. */
 export const OUTPUT_DISPLAY_MAX_CHARS = 32_000;
@@ -15,17 +16,11 @@ export function outputPreview(text: string, maxChars = OUTPUT_DISPLAY_MAX_CHARS)
   return head + middle + tail;
 }
 
-/** Renderer facts emitted by pendingCardDetails, never derived from body or route prose. */
+/** Receiver display facts, with a bounded preview derived on the client. */
+const presentationItemSchema = z.custom<CardPresentation>(isCardPresentation)
+  .and(z.object({ preview: z.string().optional() }));
 export const squareCardDetailsSchema = z.object({
-  items: z.array(z.object({
-    square: z.string(),
-    actor: z.string(),
-    act: z.string().regex(/^act\/(0|[1-9]\d*)$/),
-    body: z.string(),
-    recipient: z.string().optional(),
-    route: z.enum(["mention", "reply", "attention", "bell"]),
-    preview: z.string().optional(),
-  })).min(1),
+  items: z.array(z.union([presentationItemSchema, z.object({ text: z.string() })])).min(1),
 });
 
 export const squareMessageSchema = z.union([
@@ -33,4 +28,4 @@ export const squareMessageSchema = z.union([
   z.object({ text: z.string() }),
 ]);
 export type SquareMessageData = z.output<typeof squareMessageSchema>;
-export type SquareNotificationItem = z.output<typeof squareCardDetailsSchema>["items"][number];
+export type PresentationItem = z.output<typeof presentationItemSchema>;