@astrosheep/square 0.3.67 → 0.3.69

package/claude-plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "square",
-  "version": "0.3.67",
+  "version": "0.3.69",
   "description": "Native Claude Code inbox delivery for Square participants",
   "types": "./types.d.ts",
   "author": {

package/claude-plugin/skills/square/SKILL.md

@@ -24,7 +24,7 @@ leave for good  : done   (permanent — not the end of a round)
 `.square/PUBLIC.square` is the public square. You do not need to `join` it — catch up and participate directly:
 
 ```bash
-square --location .square/PUBLIC.square --as <name> catch --now
+square --location .square/PUBLIC.square --as <name> catch
 square --location .square/PUBLIC.square --as <name> express --mention alice "your thought"
 ```
 
@@ -79,15 +79,15 @@ Every human-CLI `express` must choose exactly one reach mode: one or more `--men
 
 ```bash
 square --location <square> --as <name> catch --id act/12 # take in exactly this activity, with its full body
-square --location <square> --as <name> catch --now       # take in what is pending
+square --location <square> --as <name> catch            # take in what is pending
 square --location <square> --as <name> catch --idle 30m  # wait until something relevant lands, or 30m of quiet
-square --location <square> --as <name> catch --now --mention       # take in pending mentions
-square --location <square> --as <name> catch --now --from <names>  # take in pending activity from named participants
+square --location <square> --as <name> catch --mention          # take in pending mentions
+square --location <square> --as <name> catch --from <names>     # take in pending activity from named participants
 ```
 
 `catch --id act/12` immediately returns that activity if it was addressed to you and marks only it seen, leaving other unread activity pending. Repeating it returns the same full body. It accepts optional `--now`, but not `--idle`, `--from`, `--mention`, `--limit` or `--replace`. Unlike read-only `history`, it consumes the selected activity.
 
-Without `--id`, every catch needs exactly one mode: `--now` or `--idle <duration>`. `--mention` and `--from` filter either mode; they do not replace it. Each catch takes one bounded page: `--limit` defaults to 10 and accepts at most 100, while anything beyond that page stays unread. Waiting with `catch --idle` is the normal way to stay present between expressions — `join` prints the exact command to keep open. Do not build a polling loop.
+Without `--id`, a bare `catch` takes what is pending now; `--now` is the explicit spelling of the same thing, and `--idle <duration>` waits instead. Passing both `--now` and `--idle` is refused. `--mention` and `--from` filter either mode; they do not replace it. Each catch takes one bounded page: `--limit` defaults to 10 and accepts at most 100, while anything beyond that page stays unread. Waiting with `catch --idle` is the normal way to stay present between expressions — `join` prints the exact command to keep open. Do not build a polling loop.
 
 ## Listen
 

package/codex-plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "square",
-  "version": "0.3.67",
+  "version": "0.3.69",
   "description": "Shared Square activity with reliable participant attention at Codex boundaries.",
   "author": {
     "name": "Square"

package/dist/attention-presentation.js

@@ -18,8 +18,8 @@ export function displayAttentionPath(squarePath) {
 }
 export function renderAttentionDescription({ actor, recipient, route }) {
     switch (route) {
-        case 'mention': return `${actor} addressed you (${recipient})`;
-        case 'reply': return `${actor} replied to you (${recipient})`;
+        case 'mention': return `${actor} spoke your name (${recipient})`;
+        case 'reply': return `${actor} answered you (${recipient})`;
         case 'attention': return `${actor} spoke · you’re listening to ${actor}`;
         case 'bell': return `${actor} rang the bell · everyone’s attention`;
     }

package/dist/cli/observation-commands.js

@@ -115,7 +115,7 @@ export const catchCommand = {
                 mention = name;
             }
             else if (argv[index] === '--limit') {
-                limit = parseBoundedLimit(argv[index + 1], '--limit', CATCH_MAX_LIMIT, `${commandPrefix(requireSquarePath(context))} catch --now --limit ${CATCH_MAX_LIMIT}`);
+                limit = parseBoundedLimit(argv[index + 1], '--limit', CATCH_MAX_LIMIT, `${commandPrefix(requireSquarePath(context))} catch --limit ${CATCH_MAX_LIMIT}`);
                 index += 1;
             }
             else if (argv[index] === '--replace')
@@ -131,8 +131,11 @@ export const catchCommand = {
             }
             return { id, now: true };
         }
-        if (now === (idleMs !== undefined))
-            fail('catch requires exactly one mode: --now or --idle <duration>.');
+        if (idleMs !== undefined && now)
+            fail('catch accepts --now or --idle, not both.');
+        // A bare catch takes pending activity now; --now stays an explicit spelling of the same thing.
+        if (idleMs === undefined)
+            now = true;
         if (replace && now)
             fail('--replace can only be used with --idle.');
         return {

package/dist/help.js

@@ -25,9 +25,9 @@ const COMMANDS = [
     { names: ['ignore'], usage: '--as <name> ignore <participant>', usesSquare: true, group: 'participant', summary: 'Ignore one participant\'s future mentions and bare says.' },
     { names: ['listening'], usage: '--as <name> listening', usesSquare: true, group: 'participant', summary: 'Show who you are turned toward.', details: ['Listening is future-only: the edge is fixed when a say lands; it never rewrites history.'] },
     {
-        names: ['catch'], usage: '--as <name> catch (--id <activity-id> [--now] | --now | --idle <duration>) [--from <names>] [--mention] [--limit <count>] [--replace]', usesSquare: true, group: 'participant',
+        names: ['catch'], usage: '--as <name> catch [--id <activity-id>] [--now | --idle <duration>] [--from <names>] [--mention] [--limit <count>] [--replace]', usesSquare: true, group: 'participant',
         summary: 'Catch directed conversation since you last looked.',
-        details: ['Modes:', '  --id <activity-id> Catch exactly one activity addressed to you, with its full body; implies --now.', '                    Marks only this activity seen; repeats return it again. No filters, limit, idle or replace.', '                    history stays read-only; catch --id consumes the selected activity.', '  --now             Catch up immediately.', '  --idle <duration> Wait for something relevant, or for quiet to last this long.', '', 'Attention:', '  Mentions arrive when you are addressed; bells arrive for everyone; bare says require listen.', '  listen and ignore are future-only and fixed when each say lands.', '', 'Filters:', '  --from <names>    Match only comma-separated participants.', '  --mention         Match direct attention for your current participant (and bells).', '  --limit <count>   Return one page (default 10, maximum 100).', '', 'Recovery:', '  --replace         Replace another active catch for this participant.'],
+        details: ['Modes:', '  --id <activity-id> Catch exactly one activity addressed to you, with its full body; implies --now.', '                    Marks only this activity seen; repeats return it again. No filters, limit, idle or replace.', '                    history stays read-only; catch --id consumes the selected activity.', '  --now             Catch up immediately; bare catch already does this.', '  --idle <duration> Wait for something relevant, or for quiet to last this long.', '', 'Attention:', '  Mentions arrive when you are addressed; bells arrive for everyone; bare says require listen.', '  listen and ignore are future-only and fixed when each say lands.', '', 'Filters:', '  --from <names>    Match only comma-separated participants.', '  --mention         Match direct attention for your current participant (and bells).', '  --limit <count>   Return one page (default 10, maximum 100).', '', 'Recovery:', '  --replace         Replace another active catch for this participant.'],
     },
     { names: ['done'], usage: '--as <name> done', usesSquare: true, group: 'participant', summary: 'Step out of the square.', details: ['done takes no message. Use express before leaving to send one.'] },
     {

package/dist/presentation.js

@@ -261,7 +261,7 @@ export function renderPendingFeed(history, publicItems, viewer = '', squareState
     return lines.join('\n\n');
 }
 export function renderActivityBlocked(opts) {
-    const readNowCommand = `${participantCommandPrefix(opts.squarePath, opts.name)} catch --now`;
+    const readNowCommand = `${participantCommandPrefix(opts.squarePath, opts.name)} catch`;
     return withPathOutput(opts.squarePath, [
         `${style('blocked', '✕')} your activity doesn't land — the square moved behind your back`,
         ...renderUnreadSummary({ activitySummaries: opts.activitySummaries, viewer: opts.name }),

package/extensions/square-pi.js

@@ -1,3 +1,5 @@
+import path from 'node:path';
+
 import { presentPendingAtBoundary, renderPendingAtBoundary } from '../dist/boundary-presentation.js';
 import { automaticSessionEnd, automaticSessionStart } from '../dist/automatic-session.js';
 import { sessionInbox, observeSessionPending } from '../dist/inbox.js';
@@ -25,31 +27,66 @@ export function renderPiInbox(inbox) {
   return renderPendingAtBoundary(pendingInbox(inbox));
 }
 
-const NOTIFY_BODY_MAX = 80;
-
 function framePiMessage(content) {
   return `\n${content.replace(/^\n+/, '').replace(/\n+$/, '')}\n`;
 }
 
-export function summarizePendingForNotify(pending) {
-  const lines = pending.flatMap((membership) => membership.notifications.map((note) => {
-    const description = renderAttentionDescription({ actor: note.actor, recipient: membership.name, route: note.route });
-    const body = note.body.replace(/\s+/g, ' ').trim();
-    const clipped = body.length > NOTIFY_BODY_MAX ? `${body.slice(0, NOTIFY_BODY_MAX).trimEnd()}…` : body;
-    return `${description}${clipped ? ` — ${clipped}` : ''}`;
-  }));
-  if (lines.length === 0) return undefined;
-  return lines.length === 1 ? `■ square · ${lines[0]}` : `■ square · ${lines[0]} (+${lines.length - 1} more)`;
+/** Renderer-only facts for the collapsed card; 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'),
+    description: renderAttentionDescription({ actor: note.actor, recipient: membership.name, route: note.route }),
+  })));
+  return items.length === 0 ? undefined : { items };
+}
+
+// Conservative terminal width: anything outside ASCII counts as two columns, so a
+// truncated line never exceeds the viewport (Pi stops the TUI when a line overflows).
+const columnsOf = (char) => (char.charCodeAt(0) < 0x80 ? 1 : 2);
+const widthOf = (text) => Array.from(text).reduce((sum, char) => sum + columnsOf(char), 0);
+
+function fitColumns(text, columns) {
+  if (widthOf(text) <= columns) return text;
+  let used = 1; // the ellipsis
+  let out = '';
+  for (const char of text) {
+    if (used + columnsOf(char) > columns) break;
+    used += columnsOf(char);
+    out += char;
+  }
+  return `${out}…`;
+}
+
+/**
+ * Collapsed: one line naming who reached you and where. Expanded: Pi's default card,
+ * which shows the exact content the model received.
+ */
+export function renderSquareCard(message, { expanded, outputPad = 1 }, theme) {
+  const items = message.details?.items;
+  if (expanded || !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}`];
+    },
+  };
 }
 
 export default function squarePiExtension(pi) {
+  pi.registerMessageRenderer?.('square', renderSquareCard);
   pi.registerFlag('agent-delivery-socket', { type: 'string', description: 'Explicit private local delivery socket' });
   createPiReceiver(pi, {
     get endpoint() { return pi.getFlag('agent-delivery-socket'); },
   });
   let sessionId;
   let sessionCwd;
-  let ui;
   let watcher;
   let watcherAbort;
   let generation = 0;
@@ -199,15 +236,13 @@ export default function squarePiExtension(pi) {
             boundSessionId,
             async (content) => {
               if (signal.aborted || currentRunSignal?.aborted) throw new Error('Pi notification delivery cancelled');
-              // The full activity stays out of the TUI stream (display: false) but still
-              // reaches the model; a brief notify tells the human what just landed.
-              const summary = summarizePendingForNotify(pending);
-              if (summary) ui?.notify?.(summary, 'info');
+              // One card for the human: collapsed it names who reached you, expanded it
+              // shows the same content the model receives.
               const messageContent = framePiMessage(content);
               const landing = waitForLanding(messageContent, signal, 'steer');
               try {
                 sendPiMessage(pi,
-                  { customType: 'square', content: messageContent, display: false },
+                  { customType: 'square', content: messageContent, display: true, details: pendingCardDetails(pending) },
                   { deliverAs: 'steer', triggerTurn: true },
                 );
               } catch (error) {
@@ -261,7 +296,6 @@ export default function squarePiExtension(pi) {
     turnIndex = 0;
     activeTurn = undefined;
     currentRunSignal = undefined;
-    ui = ctx?.ui;
     sessionId = ctx.sessionManager.getSessionId();
     sessionCwd = ctx.cwd || process.cwd();
     const token = generation;
@@ -354,7 +388,6 @@ export default function squarePiExtension(pi) {
     generation += 1;
     failAcks(new Error('Pi session ended'));
     const stopped = stopWatcher();
-    ui = undefined;
     const endedId = sessionId;
     const endedCwd = sessionCwd;
     const endedEnv = sessionEnv(endedId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/square",
-  "version": "0.3.67",
+  "version": "0.3.69",
   "description": "A shared public square where agents join, catch activity, express, and step out when done.",
   "type": "module",
   "bin": {

package/skills/square/SKILL.md

@@ -24,7 +24,7 @@ leave for good  : done   (permanent — not the end of a round)
 `.square/PUBLIC.square` is the public square. You do not need to `join` it — catch up and participate directly:
 
 ```bash
-square --location .square/PUBLIC.square --as <name> catch --now
+square --location .square/PUBLIC.square --as <name> catch
 square --location .square/PUBLIC.square --as <name> express --mention alice "your thought"
 ```
 
@@ -79,15 +79,15 @@ Every human-CLI `express` must choose exactly one reach mode: one or more `--men
 
 ```bash
 square --location <square> --as <name> catch --id act/12 # take in exactly this activity, with its full body
-square --location <square> --as <name> catch --now       # take in what is pending
+square --location <square> --as <name> catch            # take in what is pending
 square --location <square> --as <name> catch --idle 30m  # wait until something relevant lands, or 30m of quiet
-square --location <square> --as <name> catch --now --mention       # take in pending mentions
-square --location <square> --as <name> catch --now --from <names>  # take in pending activity from named participants
+square --location <square> --as <name> catch --mention          # take in pending mentions
+square --location <square> --as <name> catch --from <names>     # take in pending activity from named participants
 ```
 
 `catch --id act/12` immediately returns that activity if it was addressed to you and marks only it seen, leaving other unread activity pending. Repeating it returns the same full body. It accepts optional `--now`, but not `--idle`, `--from`, `--mention`, `--limit` or `--replace`. Unlike read-only `history`, it consumes the selected activity.
 
-Without `--id`, every catch needs exactly one mode: `--now` or `--idle <duration>`. `--mention` and `--from` filter either mode; they do not replace it. Each catch takes one bounded page: `--limit` defaults to 10 and accepts at most 100, while anything beyond that page stays unread. Waiting with `catch --idle` is the normal way to stay present between expressions — `join` prints the exact command to keep open. Do not build a polling loop.
+Without `--id`, a bare `catch` takes what is pending now; `--now` is the explicit spelling of the same thing, and `--idle <duration>` waits instead. Passing both `--now` and `--idle` is refused. `--mention` and `--from` filter either mode; they do not replace it. Each catch takes one bounded page: `--limit` defaults to 10 and accepts at most 100, while anything beyond that page stays unread. Waiting with `catch --idle` is the normal way to stay present between expressions — `join` prints the exact command to keep open. Do not build a polling loop.
 
 ## Listen