@astrosheep/square 0.3.58 → 0.3.61

package/dist/watch.js

@@ -1,12 +1,12 @@
 import { setTimeout as sleep } from 'node:timers/promises';
 import { isSquareError, } from './model.js';
-import { SLEEP_MS, STALE_MS, WATCH_HEARTBEAT_MS, nowMs, } from './runtime.js';
+import { SLEEP_MS, STALE_MS, WATCH_HEARTBEAT_MS, inSquareCount, nowMs, } from './runtime.js';
 import { openSquare } from './square-file-adapter.js';
 import { closeOpenSquare } from './open-square.js';
 import { openParticipant } from './square-wiring.js';
 import { resolveParticipant, watchPresentation } from './views.js';
 import { acquireWatchLease, ownsWatchLease, pulseWatchLease, releaseWatchLease } from './wakes.js';
-import { renderWatchForceTakeover, renderWatchAlreadyActive, renderWatchReplaceMissing, renderWatchOutput, renderWatchReplaced, renderWatchStatus, participantCommandPrefix, joinRecoveryCommand, participantsRecoveryCommand, withPathOutput, } from './presentation.js';
+import { renderWatchForceTakeover, renderWatchAlreadyActive, renderWatchReplaceMissing, renderWatchOutput, renderWatchReplaced, renderWatchStatus, formatRefusal, participantCommandPrefix, joinRecoveryCommand, participantsRecoveryCommand, withPathOutput, } from './presentation.js';
 import { hasAutomaticDeliveryIdentity } from './registry.js';
 import { parseActivityId } from './square-core.js';
 function watchStatusExitCode(status) {
@@ -37,7 +37,7 @@ function watchOutputResult(squarePath, presentation, name, caught, opts = {}) {
             showCatchHint: !hasAutomaticDeliveryIdentity(),
             perceptions,
         }) + (caught.remaining > 0
-            ? `\n○ ${caught.remaining} matching ${caught.remaining === 1 ? 'activity remains' : 'activities remain'}\n» ${catchContinuationCommand(squarePath, name, opts)}`
+            ? `\n○ ${caught.remaining} matching ${caught.remaining === 1 ? 'activity remains' : 'activities remain'}\n${catchContinuationCommand(squarePath, name, opts)}`
             : ''),
         remaining: caught.remaining,
         ...(opts.status ? { status: opts.status } : {}),
@@ -61,7 +61,7 @@ function writeWatchOutput(squarePath, name, presentation, stdout, remaining, sta
         return;
     }
     const fallback = showCatchHint && remaining === 0
-        ? `» ${participantCommandPrefix(squarePath, name)} catch --idle 30m\n  stay available for new activity`
+        ? `${participantCommandPrefix(squarePath, name)} catch --idle 30m\n  stay available for new activity`
         : '';
     process.stdout.write(withPathOutput(squarePath, [stdout.trimEnd(), fallback].filter(Boolean).join('\n\n').trimEnd(), headerOpts));
 }
@@ -109,7 +109,7 @@ function installWatchInterruptHandler(square, squarePath, name, currentLeaseId)
     const onInterrupt = () => {
         void (async () => {
             await endWatch(square, name, currentLeaseId());
-            process.stdout.write(withPathOutput(squarePath, '✕ catch stopped'));
+            process.stdout.write(withPathOutput(squarePath, '○ you step back — catch stopped'));
             process.exit(130);
         })().catch((error) => {
             process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
@@ -144,19 +144,30 @@ async function cmdWatchNow(squarePath, name, opts) {
         await closeOpenSquare(square);
     }
 }
+async function countParticipants(square) {
+    try {
+        return inSquareCount((await square.artifact.read()).state);
+    }
+    catch {
+        return undefined;
+    }
+}
 /** `false` is reserved for a quiet --now; idle completion preserves its existing sweep boundary. */
 export async function cmdWatch(squarePath, name, opts) {
     let square;
+    let participantCount;
     try {
         square = await openSquare(squarePath, { clock: nowMs });
+        participantCount = inSquareCount((await square.artifact.read()).state);
         name = (await resolveParticipant(square, name)).name;
     }
     catch (err) {
         if (isSquareError(err)) {
-            process.stderr.write(err.message + '\n');
+            const bodyLines = [err.message];
             // The caller's own name has never joined; only a join admits it.
-            if (/^Unknown participant/.test(err.message))
-                process.stderr.write(`${joinRecoveryCommand(squarePath, name)}\n`);
+            if (/^✕ .* has never stepped into/.test(err.message))
+                bodyLines.push(joinRecoveryCommand(squarePath, name));
+            process.stderr.write(formatRefusal(squarePath, bodyLines, participantCount === undefined ? {} : { participantCount }));
             process.exit(err.code === 'not_found' ? 1 : 2);
         }
         throw err;
@@ -169,12 +180,14 @@ export async function cmdWatch(squarePath, name, opts) {
         }
     }
     catch (err) {
+        const participantCount = await countParticipants(square);
         await closeOpenSquare(square).catch(() => undefined);
         if (isSquareError(err)) {
-            process.stderr.write(err.message + '\n');
+            const bodyLines = [err.message];
             // A filter target is unknown, not the caller; the roster is the useful next read.
-            if (/^(Unknown participant|Unknown mention target)/.test(err.message))
-                process.stderr.write(`${participantsRecoveryCommand(squarePath)}\n`);
+            if (/^✕ .*(has never stepped into|is not standing in this square)/.test(err.message))
+                bodyLines.push(participantsRecoveryCommand(squarePath));
+            process.stderr.write(formatRefusal(squarePath, bodyLines, participantCount === undefined ? {} : { participantCount }));
             process.exit(err.code === 'not_found' ? 1 : 2);
         }
         throw err;

package/extensions/square-pi.js

@@ -31,12 +31,20 @@ export function renderPiInbox(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 verb = note.route === 'bell' ? 'rang the bell for' : note.route === 'mention' ? 'walked over to' : 'paid attention to';
+    const verb = note.route === 'bell'
+      ? 'rang the bell'
+      : note.route === 'mention'
+        ? `called your name (${membership.name})`
+        : `spoke within your earshot (${membership.name})`;
     const body = note.body.replace(/\s+/g, ' ').trim();
     const clipped = body.length > NOTIFY_BODY_MAX ? `${body.slice(0, NOTIFY_BODY_MAX).trimEnd()}…` : body;
-    return `${note.actor} ${verb} ${membership.name}${clipped ? ` — ${clipped}` : ''}`;
+    return `${note.actor} ${verb}${clipped ? ` — ${clipped}` : ''}`;
   }));
   if (lines.length === 0) return undefined;
   return lines.length === 1 ? `■ square · ${lines[0]}` : `■ square · ${lines[0]} (+${lines.length - 1} more)`;
@@ -203,10 +211,11 @@ export default function squarePiExtension(pi) {
             // reaches the model; a brief notify tells the human what just landed.
             const summary = summarizePendingForNotify(pending);
             if (summary) ui?.notify?.(summary, 'info');
-            const landing = waitForLanding(content, signal, 'steer');
+            const messageContent = framePiMessage(content);
+            const landing = waitForLanding(messageContent, signal, 'steer');
             try {
               Promise.resolve(pi.sendMessage(
-                { customType: 'square', content, display: false },
+                { customType: 'square', content: messageContent, display: false },
                 { deliverAs: 'steer', triggerTurn: true },
               )).catch((error) => landing.ack.settle(error));
             } catch (error) {
@@ -266,10 +275,11 @@ export default function squarePiExtension(pi) {
     const signal = watcherAbort.signal;
     void automaticSessionStart('pi', sessionId, sessionCwd, sessionEnv(sessionId)).then((context) => {
       if (context === undefined || sessionId === undefined || token !== generation) return;
-      const landing = waitForLanding(context, signal, 'nextTurn');
+      const messageContent = framePiMessage(context);
+      const landing = waitForLanding(messageContent, signal, 'nextTurn');
       try {
         Promise.resolve(pi.sendMessage(
-          { customType: 'square', content: context, display: true },
+          { customType: 'square', content: messageContent, display: true },
           { deliverAs: 'nextTurn' },
         )).catch((error) => landing.ack.settle(error));
       } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/square",
-  "version": "0.3.58",
+  "version": "0.3.61",
   "description": "A shared public square where agents join, catch activity, express, and step out when done.",
   "type": "module",
   "bin": {
@@ -21,8 +21,8 @@
     "sync-manifests": "node scripts/sync-manifests.mjs",
     "release": "npm version patch && npm run sync-manifests -- --commit && npm publish && git push --follow-tags",
     "prepublishOnly": "npm run sync-manifests && npm run build && npm run verify-release",
-    "test": "npm run build && node --test test/*.test.js",
-    "test:cli-process": "npm run build && node --test test/process/square-cli-render.test.js"
+    "test": "npm run build && node --import ./test/sandbox-env.js --test test/*.test.js",
+    "test:cli-process": "npm run build && node --import ./test/sandbox-env.js --test test/process/square-cli-render.test.js"
   },
   "keywords": [
     "brainstorm",