@astrosheep/square 0.3.58 → 0.3.61

package/dist/cli/square-commands.js

@@ -1,15 +1,16 @@
 import { cmdActivity } from '../activity.js';
 import { formatActivityId, formatHardCap, parseActivityId, } from '../model.js';
-import { participantCommandPrefix, participantIdentity, quoteShell, renderEventCli, renderAmbientEvent, withPathOutput, } from '../presentation.js';
+import { formatRefusal, participantCommandPrefix, participantIdentity, quoteShell, renderRoomChangeText, renderAmbientEvent, withPathOutput, } from '../presentation.js';
 import { claimSessionParticipant, hasAutomaticDeliveryIdentity, localSessionIdentities, lookupParticipant, readParticipantOwner, recordSessionDone, } from '../registry.js';
 import { createHostLedgerPort } from '../host-ledger-file-adapter.js';
 import { sessionIdsFromEnvironment } from '../square-projections.js';
-import { nowMs } from '../runtime.js';
+import { actId, nowMs } from '../runtime.js';
 import { createSquare, openSquare } from '../square-file-adapter.js';
 import { closeOpenSquare } from '../open-square.js';
 import { openParticipant, Square } from '../square-wiring.js';
 import { entryPresentation, eventPresentation } from '../views.js';
 import { createDefaultWakeTransport } from '../notifications.js';
+import { style } from '../tty-style.js';
 import { fail, parseBoundedLimit, parseHardCap, parsePositiveInteger, readStdin, requireParticipant, requireSquarePath, requireValue, resolveBody, usage, } from './context.js';
 const JOIN_DEFAULT_LAST = 10;
 const JOIN_MAX_LAST = 100;
@@ -57,7 +58,7 @@ export const buildCommand = {
         await createSquare(squarePath, intent.options, snippet);
         const cap = intent.options.hardCap === null ? 'unlimited' : formatHardCap(intent.options.hardCap);
         const throttle = intent.options.throttlePerMinute === undefined ? [] : [`  · throttle ${intent.options.throttlePerMinute}/min`];
-        return withPathOutput(squarePath, ['✓ built', `  · cap ${cap}`, ...throttle, '  · participants (none seeded — first join adds names)'].join('\n'), { participantCount: 0 });
+        return withPathOutput(squarePath, ['✓ the square is open', `  · cap ${cap}`, ...throttle, '  · nobody here yet — the first join steps in'].join('\n'), { participantCount: 0 });
     },
     present: (result) => process.stdout.write(result),
 };
@@ -95,12 +96,13 @@ export const joinCommand = {
             const reconnect = before.joined && identity !== undefined && owner?.sessionId === identity.sessionId;
             const isRejoin = before.joined;
             if (isRejoin && !intent.kick && !reconnect) {
-                fail([
+                process.stderr.write(formatRefusal(squarePath, [
                     `✕ ${participantIdentity(intent.name)} shoos you out of the square`,
                     `  · a same-named participant stands here — the name is taken`,
-                    `  · --kick banishes her and the name becomes yours`,
-                    `» ${participantCommandPrefix(squarePath, intent.name)} join --kick`,
-                ].join('\n'));
+                    `  · --kick banishes the one standing there — the name becomes yours`,
+                    `${participantCommandPrefix(squarePath, intent.name)} join --kick`,
+                ], { participantCount: before.participantCount }));
+                process.exit(2);
             }
             const takeoverNeeded = isRejoin && intent.kick;
             const oldBindings = takeoverNeeded ? await lookupParticipant(squarePath, intent.name) : [];
@@ -134,20 +136,20 @@ export const joinCommand = {
             const contextText = after.joinContext;
             const fallback = hasAutomaticDeliveryIdentity()
                 ? []
-                : ['', `» ${participantCommandPrefix(squarePath, joinedName)} catch --idle 30m`, '  no session delivery detected — keep this catch open for new activity'];
+                : ['', `${participantCommandPrefix(squarePath, joinedName)} catch --idle 30m`, '  the square has no way to call you — keep this catch open and stay within earshot'];
             const scene = after.scene;
             const entryLine = !isRejoin
-                ? '● You stepped into the square'
+                ? '● you stepped into the square'
                 : reconnect && !intent.kick
                     ? '● you are already in the square'
                     : `✓ you banished the original ${participantIdentity(joinedName)} — the name is yours`;
             const output = [
                 entryLine,
                 '',
-                "Don't treat Square as a public dumping ground. Speak here only when you genuinely think someone else needs to know; otherwise you are needlessly interrupting them.",
+                "· carved into the fountain's edge: every word here lands on a real ear — speak when someone needs it.",
                 ...(reconnect || scene === '' ? [] : ['', scene]),
-                ...(isRejoin || contextText === '' ? [] : ['', 'context', contextText]),
-                ...(isRejoin || activities === '' ? [] : ['', 'recent activity', activities]),
+                ...(isRejoin || contextText === '' ? [] : ['', style('dim', 'context'), contextText]),
+                ...(isRejoin || activities === '' ? [] : ['', style('dim', 'recent activity'), activities]),
                 ...fallback,
             ].join('\n');
             return withPathOutput(squarePath, output, { participantCount: after.participantCount });
@@ -173,7 +175,7 @@ function parseActivity(argv, context) {
         else if (argument === '--no-wait')
             noWait = true;
         else if (argument === '--beside')
-            fail('✕ express does not know --beside\n» square express --help');
+            fail('✕ express does not know --beside\nsquare express --help');
         else if (argument === '--bell')
             bell = true;
         else if (argument === '--no-mention')
@@ -194,11 +196,11 @@ function parseActivity(argv, context) {
     }
     const reach = bell ? 'bell' : undefined;
     if (bell && (noMention || mentions.length > 0))
-        fail('✕ --bell cannot be combined with --mention or --no-mention\n» square express --help');
+        fail('✕ --bell cannot be combined with --mention or --no-mention\nsquare express --help');
     if (noMention && mentions.length > 0)
-        fail('✕ --no-mention cannot be combined with --mention\n» square express --help');
+        fail('✕ --no-mention cannot be combined with --mention\nsquare express --help');
     if (!bell && !noMention && mentions.length === 0)
-        fail('✕ express needs --mention <name>, --no-mention, or --bell\n» square express --help');
+        fail('✕ express needs --mention <name>, --no-mention, or --bell\nsquare express --help');
     if (bodyArgs.length !== 1) {
         if (bodyArgs.length === 0) {
             if (!process.stdin.isTTY)
@@ -320,7 +322,7 @@ export const doneCommand = {
         const name = result.activity.actor;
         const presentation = await openSquare(squarePath, { clock: nowMs });
         const participantCount = (await entryPresentation(presentation, name).finally(() => closeOpenSquare(presentation))).participantCount;
-        return withPathOutput(squarePath, `○ ${participantIdentity(name)} steps out of the square — done · just now`, { participantCount });
+        return withPathOutput(squarePath, `○ ${participantIdentity(name)} steps out of the square — done · ${result.activity.id} · just now`, { participantCount });
     },
     present: (result) => process.stdout.write(result),
 };
@@ -341,7 +343,7 @@ export const holdCommand = {
             const presentationSquare = await openSquare(squarePath, { clock: nowMs });
             const presentation = await eventPresentation(presentationSquare, result.activity.id);
             await closeOpenSquare(presentationSquare);
-            return withPathOutput(squarePath, renderEventCli(presentation.activity), { participantCount: presentation.participantCount, held: true });
+            return withPathOutput(squarePath, `· ${renderRoomChangeText(presentation.activity)} · ${actId(presentation.activity.index)} · just now`, { participantCount: presentation.participantCount, held: true });
         }
         finally {
             await square.close();
@@ -365,7 +367,7 @@ export const resumeCommand = {
             const presentationSquare = await openSquare(squarePath, { clock: nowMs });
             const presentation = await eventPresentation(presentationSquare, result.activity.id);
             await closeOpenSquare(presentationSquare);
-            return withPathOutput(squarePath, renderEventCli(presentation.activity), { participantCount: presentation.participantCount });
+            return withPathOutput(squarePath, `✓ ${renderRoomChangeText(presentation.activity)} · ${actId(presentation.activity.index)} · just now`, { participantCount: presentation.participantCount });
         }
         finally {
             await square.close();

package/dist/decisions.d.ts

@@ -58,6 +58,8 @@ export type ActDecision = {
     type: 'bell_quota';
     nextAt: number;
 };
+/** The unread activity a viewer has not caught up to, grouped by speaker. */
+export declare function unreadActivitySummaries(squareState: SquareState, name: string, now: number): UnreadActivitySummary[];
 export declare function decideAct(squareState: SquareState, input: {
     name: string;
     body: string;

package/dist/decisions.js

@@ -9,7 +9,7 @@ export function resolveKnownName(squareState, name) {
     validateName(name);
     const known = resolveRosterName(squareState, name);
     if (known === undefined) {
-        throw new SquareError('invalid_args', `Unknown participant "${participantIdentity(name)}".`);
+        throw new SquareError('invalid_args', `✕ ${participantIdentity(name)} has never stepped into this square`);
     }
     return known;
 }
@@ -66,6 +66,40 @@ function requireStanding(squareState, act) {
     throw new Error(`Unexpected standing validation result: ${result.reason}`);
 }
 const UNREAD_PREVIEW_LIMIT = 3;
+/** The unread activity a viewer has not caught up to, grouped by speaker. */
+export function unreadActivitySummaries(squareState, name, now) {
+    const delivery = deriveDeliveryModel(squareState);
+    const delta = actDelta(squareState.acts, delivery.cursorFor(name));
+    const unreadPublic = directedPeerSays(squareState, delta, name, delivery);
+    const sayCountByActor = new Map();
+    const unreadByParticipant = new Map();
+    for (const item of unreadPublic) {
+        if (item.kind === 'say') {
+            const key = item.actor.toLocaleLowerCase();
+            sayCountByActor.set(key, (sayCountByActor.get(key) ?? 0) + 1);
+        }
+        if (sameName(item.actor, name))
+            continue;
+        const actorKey = item.actor.toLocaleLowerCase();
+        const currentSummary = unreadByParticipant.get(item.actor);
+        unreadByParticipant.set(item.actor, {
+            count: (currentSummary?.count ?? 0) + 1,
+            latestAt: currentSummary === undefined ? item.at : Math.max(currentSummary.latestAt, item.at),
+            previews: [
+                ...(currentSummary?.previews ?? []),
+                { number: sayCountByActor.get(actorKey) ?? 1, act: item, perception: delivery.perceive(item, name) },
+            ].slice(-UNREAD_PREVIEW_LIMIT),
+        });
+    }
+    return [...unreadByParticipant.entries()]
+        .map(([participant, summary]) => ({
+        name: participant,
+        count: summary.count,
+        latestActivityAgeMs: Math.max(0, now - summary.latestAt),
+        previews: summary.previews,
+    }))
+        .sort((a, b) => a.latestActivityAgeMs - b.latestActivityAgeMs || a.name.localeCompare(b.name));
+}
 export function decideAct(squareState, input) {
     const { now, force } = input;
     const name = resolveStandingName(squareState, input.name);
@@ -81,7 +115,7 @@ export function decideAct(squareState, input) {
         validateName(requested);
         const resolved = joinedNames.find((candidate) => sameName(candidate, requested));
         if (resolved === undefined) {
-            throw new SquareError('invalid_args', `Unknown mention target ${participantIdentity(requested)}.`);
+            throw new SquareError('invalid_args', `✕ ${participantIdentity(requested)} is not standing in this square`);
         }
         if (!mentionNames.some((existing) => sameName(existing, resolved))) {
             if (mentionNames.length >= MAX_IDENTITY_SET_SIZE) {
@@ -126,34 +160,7 @@ export function decideAct(squareState, input) {
     const delta = actDelta(squareState.acts, delivery.cursorFor(name));
     const unreadPublic = directedPeerSays(squareState, delta, name, delivery);
     const unreadRoomChanges = [];
-    const sayCountByActor = new Map();
-    const unreadByParticipant = new Map();
-    for (const item of unreadPublic) {
-        if (item.kind === 'say') {
-            const key = item.actor.toLocaleLowerCase();
-            sayCountByActor.set(key, (sayCountByActor.get(key) ?? 0) + 1);
-        }
-        if (sameName(item.actor, name))
-            continue;
-        const actorKey = item.actor.toLocaleLowerCase();
-        const currentSummary = unreadByParticipant.get(item.actor);
-        unreadByParticipant.set(item.actor, {
-            count: (currentSummary?.count ?? 0) + 1,
-            latestAt: currentSummary === undefined ? item.at : Math.max(currentSummary.latestAt, item.at),
-            previews: [
-                ...(currentSummary?.previews ?? []),
-                { number: sayCountByActor.get(actorKey) ?? 1, act: item, perception: delivery.perceive(item, name) },
-            ].slice(-UNREAD_PREVIEW_LIMIT),
-        });
-    }
-    const activitySummaries = [...unreadByParticipant.entries()]
-        .map(([participant, summary]) => ({
-        name: participant,
-        count: summary.count,
-        latestActivityAgeMs: Math.max(0, now - summary.latestAt),
-        previews: summary.previews,
-    }))
-        .sort((a, b) => a.latestActivityAgeMs - b.latestActivityAgeMs || a.name.localeCompare(b.name));
+    const activitySummaries = unreadActivitySummaries(squareState, name, now);
     const latestActivityAgeMs = activitySummaries[0]?.latestActivityAgeMs;
     const hasUnread = unreadPublic.length > 0;
     const hasFreshUnreadActivity = latestActivityAgeMs !== undefined && latestActivityAgeMs <= UNREAD_BLOCK_GRACE_MS;
@@ -168,7 +175,7 @@ export function decideAct(squareState, input) {
             ...(reach !== undefined ? { reach } : {}),
             ...(reply !== undefined ? { reply } : {}),
         },
-        confirmation: `● heads turn your way — #${ownActCount}`,
+        confirmation: `● your activity lands — #${ownActCount}`,
         ownActCount,
         pendingPublic: unreadPublic,
         pendingRoomChanges: unreadRoomChanges,

package/dist/list.js

@@ -5,6 +5,7 @@ import { closeOpenSquare } from './open-square.js';
 import { listPresentation } from './views.js';
 import { formatRelativeTime } from './time.js';
 import { participantIdentity, quoteShell } from './presentation.js';
+import { style } from './tty-style.js';
 const DEFAULT_LIST_DEPTH = 4;
 const MAX_LIST_DEPTH = 16;
 const DEFAULT_LIST_LIMIT = 20;
@@ -84,35 +85,37 @@ function renderSquareList(items, stopped, depth, limit, after) {
     const page = after === undefined ? items : items.filter((item) => item.path.localeCompare(after) > 0);
     const shownItems = page.slice(0, limit);
     if (items.length === 0) {
-        return [`(no squares found)`, ...(stopped ? [`○ discovery stopped after examining ${LIST_DISCOVERY_BUDGET} filesystem entries; results may be incomplete`] : [])].join('\n') + '\n';
+        return [`(no squares found)`, ...(stopped ? [style('dim', `○ the walk stopped early — deeper squares may still be hiding`)] : [])].join('\n') + '\n';
     }
     const now = Date.now();
     const lines = ['squares'];
     for (const item of shownItems) {
-        lines.push(`${item.activities > 0 ? '●' : '○'} ${characterPreview(item.path)} · ${formatRelativeTime(item.lastActiveAt, now)} · ${item.participants.length} in square · ${item.activities} activities`);
+        const glyph = item.activities > 0 ? '●' : style('dim', '○');
+        lines.push(`${glyph} ${characterPreview(item.path)}${style('dim', ` · ${formatRelativeTime(item.lastActiveAt, now)} · ${item.participants.length} in the square · ${item.activities} ${item.activities === 1 ? 'activity' : 'activities'}`)}`);
         const shownContext = item.context.slice(0, CONTEXT_PREVIEW_LINES);
         if (shownContext.length === 0) {
-            lines.push('  context · (none)');
+            lines.push(`  ${style('dim', 'context')} · (none)`);
         }
         else {
-            shownContext.forEach((line, index) => lines.push(`  ${index === 0 ? 'context' : '       '} · ${characterPreview(line)}`));
+            shownContext.forEach((line, index) => lines.push(`  ${index === 0 ? style('dim', 'context') : '       '} · ${characterPreview(line)}`));
             const hiddenContext = item.context.length - shownContext.length;
             if (hiddenContext > 0)
-                lines.push(`          · … ${hiddenContext} more ${hiddenContext === 1 ? 'line' : 'lines'}`);
+                lines.push(style('dim', `          · … ${hiddenContext} more ${hiddenContext === 1 ? 'line' : 'lines'}`));
         }
         const shownParticipants = item.participants.slice(0, PARTICIPANT_PREVIEW_COUNT);
         const hiddenParticipants = item.participants.length - shownParticipants.length;
-        lines.push(`  participants · ${shownParticipants.length === 0 ? 'nobody' : shownParticipants.map((participant) => participantIdentity(characterPreview(participant))).join(' · ')}${hiddenParticipants > 0 ? ` · … ${hiddenParticipants} more` : ''}`);
+        const participantNames = shownParticipants.length === 0 ? 'nobody' : shownParticipants.map((participant) => participantIdentity(characterPreview(participant))).join(' · ');
+        lines.push(`  ${style('dim', 'participants')} · ${participantNames}${hiddenParticipants > 0 ? style('dim', ` · … ${hiddenParticipants} more`) : ''}`);
     }
     const hiddenItems = page.length - shownItems.length;
     if (hiddenItems > 0) {
         const cursor = shownItems.at(-1)?.path;
-        lines.push(stopped ? '  … more squares' : `  … ${hiddenItems} more ${hiddenItems === 1 ? 'square' : 'squares'}`);
+        lines.push(style('dim', stopped ? '  … more squares' : `  … ${hiddenItems} more ${hiddenItems === 1 ? 'square' : 'squares'}`));
         if (cursor !== undefined)
-            lines.push(`» square list --depth ${depth} --limit ${limit} --after ${quoteShell(cursor)}`);
+            lines.push(`square list --depth ${depth} --limit ${limit} --after ${quoteShell(cursor)}`);
     }
     if (stopped)
-        lines.push(`○ discovery stopped after examining ${LIST_DISCOVERY_BUDGET} filesystem entries; results may be incomplete`);
+        lines.push(style('dim', `○ the walk stopped early — deeper squares may still be hiding`));
     return lines.join('\n') + '\n';
 }
 function parseListOptions(args, usage) {

package/dist/presentation.d.ts

@@ -6,6 +6,8 @@ export type WatchStatus = 'stale' | 'empty-now' | 'quorum' | 'capped';
 interface HeaderOptions {
     participantCount?: number;
     held?: boolean;
+    /** Refusal bodies go to stderr, which stays literal even when it is a TTY. */
+    plain?: boolean;
 }
 interface ParticipantOutputOptions {
     squarePath: string;
@@ -46,6 +48,11 @@ interface WatchStatusOptions extends ParticipantOutputOptions {
 }
 export declare function displayPath(squarePath: string, cwd?: string): string;
 export declare function withPathOutput(squarePath: string, body?: string, opts?: HeaderOptions): string;
+/** The same header/blank/body layout as withPathOutput, for refusal bodies written to stderr. */
+export declare function formatRefusal(squarePath: string, bodyLines: string[], opts?: {
+    participantCount?: number;
+    held?: boolean;
+}): string;
 export declare function quoteShell(value: string): string;
 export declare function commandPrefix(squarePath: string): string;
 export declare function participantCommandPrefix(squarePath: string, name: string): string;