@astrosheep/square 0.3.77 → 0.3.79

package/plugins/pi/square-pi.js

@@ -1,14 +1,15 @@
 import path from 'node:path';
-import { Text } from '@earendil-works/pi-tui';
+import { Container, Markdown, Spacer, Text } from '@earendil-works/pi-tui';
 import { z } from 'zod/v4';
 
-import { createSquareApplication } from '../../dist/square-application.js';
+import { Square } from '../../dist/square-api.js';
 import { SQUARE_TOOLS, SQUARE_TOOL_INSTRUCTIONS, squareToolFailure } from '../../dist/square-tools.js';
 
 import { presentPendingAtBoundary, renderPendingAtBoundary } from '../../dist/boundary-presentation.js';
 import { automaticSessionEnd, automaticSessionStart, operationEnv } from '../../dist/automatic-session.js';
 import { sessionInbox, observeSessionPending } from '../../dist/inbox.js';
 import { previewAttentionBody, renderAttentionDescription, renderAttentionFull } from '../../dist/attention-presentation.js';
+import { formatActivityId } from '../../dist/square-core.js';
 import { createPiReceiver, sendPiMessage } from '../../dist/packages/agent-delivery/src/pi.js';
 
 class PiDeliveryDroppedError extends Error {
@@ -36,15 +37,17 @@ function framePiMessage(content) {
   return `\n${content.replace(/^\n+/, '').replace(/\n+$/, '')}\n`;
 }
 
-/** Renderer-only summary and full text; Pi never sends `details` to the model. */
+/** Renderer-only card facts for Pi and Paseo; Pi never sends `details` to the model. */
 export function pendingCardDetails(pending) {
   const items = pending.flatMap((membership) => membership.notifications.map((note) => ({
     square: path.basename(membership.squarePath, '.square'),
     actor: note.actor,
     recipient: membership.name,
     route: note.route,
+    act: formatActivityId(note.actIndex),
     preview: previewAttentionBody(note.body),
-    description: renderAttentionDescription({ actor: note.actor, recipient: membership.name, route: note.route }),
+    description: renderAttentionDescription({ actor: note.actor, route: note.route }),
+    body: note.body,
   })));
   if (items.length === 0) return undefined;
   const fullText = pending.flatMap((membership) => membership.notifications.map((note) => renderAttentionFull({
@@ -73,31 +76,67 @@ function fitColumns(text, columns) {
   return `${out}…`;
 }
 
+const fg = (theme, color, text) => theme.fg?.(color, text) ?? text;
+const style = (theme, name) => (text) => theme[name]?.(text) ?? text;
+
+function markdownTheme(theme) {
+  const color = (name) => (text) => fg(theme, name, text);
+  return {
+    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: style(theme, 'italic'), underline: style(theme, 'underline'),
+    strikethrough: style(theme, 'strikethrough'),
+  };
+}
+
+/** One styled line that never exceeds the width; truncated lines stay unstyled so escapes are never cut. */
+function fitLine(parts, width) {
+  const plain = parts.map(([text]) => text).join('');
+  return widthOf(plain) <= width ? parts.map(([text, paint]) => paint(text)).join('') : fitColumns(plain, width);
+}
+
 /**
- * Collapsed: one line naming who reached you and where. Expanded: the complete
- * notification text from renderer details, wrapped by Pi's terminal component.
+ * Collapsed: who reached you and where, then the first line of what they said.
+ * Expanded: each activity as a heading line and its Markdown body; the model's
+ * framing and continuation hints are not for human eyes.
  */
 export function renderSquareCard(message, { expanded, outputPad = 1 }, theme) {
-  if (expanded) {
-    return typeof message.details?.fullText === 'string'
-      ? new Text(message.details.fullText, outputPad, 0)
-      : undefined;
-  }
   const items = message.details?.items;
-  if (!Array.isArray(items) || items.length === 0) return undefined;
-  const [first] = items;
-  const tail = ` · ${first.square}${items.length > 1 ? ` +${items.length - 1}` : ''}`;
-  return {
-    invalidate() {},
-    render(width) {
-      const room = Math.max(1, width - outputPad * 2 - 2);
-      // Style only an untruncated line, so escape codes never count toward or get cut by the width.
-      const line = widthOf(first.description + tail) <= room
-        ? `${first.description}${theme.fg('dim', tail)}`
-        : fitColumns(first.description + tail, room);
-      return [`${' '.repeat(outputPad)}${theme.fg('customMessageLabel', '■')} ${line}`];
-    },
-  };
+  if (!Array.isArray(items) || items.length === 0 || items.some((item) => typeof item.body !== 'string')) return undefined;
+  const pad = ' '.repeat(outputPad);
+  const dim = (text) => fg(theme, 'dim', text);
+  if (!expanded) {
+    const [first] = items;
+    const more = items.length > 1 ? ` +${items.length - 1}` : '';
+    // A glance, not a render: drop the commonest inline markers so the line reads as speech.
+    const opening = (first.body.split('\n').find((line) => line.trim() !== '') ?? '')
+      .trim().replace(/^(#{1,6}|>|[-*+])\s+/, '').replace(/\*\*|__|`/g, '');
+    return {
+      invalidate() {},
+      render(width) {
+        const room = Math.max(1, width - outputPad * 2 - 2);
+        return [
+          `${pad}${fg(theme, 'customMessageLabel', '■')} ${fitLine([[first.description, (t) => t], [` · ${first.square} · ${first.recipient}${more}`, dim]], room)}`,
+          ...(opening ? [`${pad}  ${fitLine([[opening, dim]], room)}`] : []),
+        ];
+      },
+    };
+  }
+  const card = new Container();
+  for (const [index, item] of items.entries()) {
+    if (index > 0) card.addChild(new Spacer(1));
+    card.addChild({
+      invalidate() {},
+      render(width) {
+        const room = Math.max(1, width - outputPad * 2 - 2);
+        return [`${pad}${fg(theme, 'customMessageLabel', '●')} ${fitLine([[item.description, (t) => t], [`  ${item.square} · ${item.recipient} · ${item.act}`, dim]], room)}`];
+      },
+    });
+    card.addChild(new Spacer(1));
+    card.addChild(new Markdown(item.body, outputPad + 2, 0, markdownTheme(theme)));
+  }
+  return card;
 }
 
 export default function squarePiExtension(pi) {
@@ -112,14 +151,15 @@ export default function squarePiExtension(pi) {
       namespace: { name: 'square', description: 'Participate in a shared public square.', instructions: SQUARE_TOOL_INSTRUCTIONS },
       async execute(_id, args, signal, _onUpdate, ctx) {
         try {
-          const app = createSquareApplication({
+          const square = await Square.at({
             cwd: ctx.cwd,
             env: operationEnv('pi', ctx.sessionManager.getSessionId(), process.env),
-            squarePath: args.location,
+            path: args.location,
             participant: args.as,
-          }, { presentation: false });
-          // Without a resource owner the facade closes each call's connection, including on cancellation.
-          const { data } = await tool.run(app, args, { signal });
+          }, { signal });
+          let data;
+          try { data = await tool.run(square, args, { signal }); }
+          finally { await square.close(); }
           return { content: [{ type: 'text', text: JSON.stringify(data) }], details: data, structuredContent: data };
         } catch (error) {
           const data = { error: squareToolFailure(error, signal) };

package/skills/square/SKILL.md

@@ -37,9 +37,9 @@ I disagree — the cache is the wrong layer for this.
 
 **Reach.** Every activity chooses who it is meant for:
 
-- **Mention** participants to address them. An `@name` in the body that matches a standing participant counts too; code spans, emails, and URLs never do. Mentioned participants hear the full body; everyone else sees you walk over to them.
-- **Reply** to an activity to reach its author the same way.
-- **Ring the bell** only when every participant needs it.
+- **Mention** participants to address them. An `@name` in the body that matches a standing participant counts too; code spans, emails, and URLs never do. Unmatched names stay literal, with a notice to you. Mentioned participants hear the full body; everyone else sees you walk over to them.
+- **Reply** to an activity to also reach its author, regardless of the other reach you choose.
+- **Ring the bell** only when every participant needs it. Body `@names` stay literal; explicit mentions cannot combine with a bell.
 - **Land it bare** when it is meant for no one in particular. Only participants listening to you receive it.
 
 Addressing is not a secrecy boundary. Everything stays readable through `history`.

package/dist/square-application.d.ts

@@ -1,38 +0,0 @@
-import type { Activity, ExpressResult, HistoryQuery, OperationControl, Participant, ParticipantStatus, SquareApplication, SquareApplicationContext, SquareAtInput, SquareBuildInput, SquareSnapshot } from './square-facade.js';
-export type * from './square-facade.js';
-export { createSquareResourceOwner } from './open-square.js';
-export { formatActivityId, parseActivityId, MAX_IDENTITY_SET_SIZE } from './square-core.js';
-export { CATCH_DEFAULT_LIMIT, CATCH_MAX_LIMIT } from './catch-decisions.js';
-export { HELD_WAIT_BUDGET_MS } from './runtime.js';
-export { HISTORY_DEFAULT_LIMIT, HISTORY_MAX_LIMIT } from './views.js';
-export { DEFAULT_LIST_DEPTH, MAX_LIST_DEPTH, DEFAULT_LIST_LIMIT, MAX_LIST_LIMIT } from './list.js';
-/** Supported SDK resource. It owns one open artifact; application operations use
- * the same owner functions directly, not an application -> SDK -> application chain. */
-export declare class Square {
-    readonly location: string;
-    private readonly square;
-    private readonly transport;
-    private constructor();
-    static at(input: SquareAtInput, control?: OperationControl): Promise<Square>;
-    static build(input: SquareBuildInput): Promise<Square>;
-    static inMemory(input: Omit<SquareBuildInput, 'path'>): Square;
-    private handle;
-    join(name: string, control?: OperationControl): Promise<Participant>;
-    takeover(name: string, control?: OperationControl): Promise<Participant>;
-    doneOwnedSession(name: string, body: string, expectedEpoch: number, control?: OperationControl): Promise<ExpressResult>;
-    implicitJoin(name: string, control?: OperationControl): Promise<{
-        readonly state: 'joined' | 'active' | 'done';
-        readonly participant?: Participant;
-    }>;
-    participants(): Promise<ParticipantStatus[]>;
-    snapshot(control?: OperationControl): Promise<SquareSnapshot>;
-    history(query?: HistoryQuery, control?: OperationControl): Promise<Activity[]>;
-    recognize(env: NodeJS.ProcessEnv): Promise<Participant | null>;
-    close(): Promise<void>;
-    endOwnedSession(name: string, sessionId: string, expectedEpoch?: number): Promise<ExpressResult | null>;
-    retireEndedSessionRoutes(sessionId: string): Promise<void>;
-}
-export declare function createSquareApplication(context: SquareApplicationContext): SquareApplication;
-export declare function createSquareApplication(context: SquareApplicationContext, demand: {
-    readonly presentation: false;
-}): SquareApplication<false>;