@astrosheep/square 0.3.48 → 0.3.50

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

@@ -1,6 +1,6 @@
 {
   "name": "square",
-  "version": "0.3.48",
+  "version": "0.3.50",
   "description": "Native Claude Code turn-boundary delivery for Square participants",
   "author": {
     "name": "Square"

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

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

package/dist/automatic-session.js

@@ -15,7 +15,7 @@ const providerEnv = {
     codex: 'CODEX_THREAD_ID',
     claude: 'CLAUDE_CODE_SESSION_ID',
     opencode: 'OPENCODE_SESSION_ID',
-    pi: 'SQUARE_PI_SESSION_ID',
+    pi: 'PI_SESSION_ID',
 };
 function operationEnv(provider, sessionId, env) {
     return {
@@ -24,7 +24,7 @@ function operationEnv(provider, sessionId, env) {
         CLAUDE_CODE_CHILD_SESSION: '',
         CODEX_THREAD_ID: '',
         OPENCODE_SESSION_ID: '',
-        SQUARE_PI_SESSION_ID: '',
+        PI_SESSION_ID: '',
         [providerEnv[provider]]: sessionId,
     };
 }

package/dist/boundary-presentation.js

@@ -7,7 +7,7 @@ import { openSquare } from './square-file-adapter.js';
 import { closeOpenSquare } from './open-square.js';
 import { presentPending } from './presentation-operations.js';
 import { sessionInbox } from './inbox.js';
-import { ATTENTION_BODY_MAX, renderAttentionPreview } from './attention-presentation.js';
+import { renderAttentionPreview } from './attention-presentation.js';
 const CONTEXT_MAX = 1200;
 const presentationLocks = new Map();
 function pendingCount(inbox) {
@@ -72,7 +72,9 @@ function renderBoundary(inbox) {
         complete.push({
             membership,
             actIndexes: [notification.actIndex],
-            markSeen: notification.body.replace(/\r\n/g, '\n').length <= ATTENTION_BODY_MAX,
+            // The hook output is itself a user-visible presentation, even when the
+            // preview had to clip the body. Keep clipped items from being replayed.
+            markSeen: true,
         });
     }
     return {

package/dist/codex-hook.js

@@ -17,9 +17,11 @@ export async function codexHookResponse(input, lookup = sessionInbox, env = proc
     if (hookEventName === undefined)
         return undefined;
     await recordCodexBoundary(input.session_id, hookEventName === 'Stop' ? 'Stop' : 'non-stop', env);
-    const response = await presentPendingAtBoundary(input.session_id, (context) => hookEventName === 'Stop'
-        ? { systemMessage: context }
-        : { hookSpecificOutput: { hookEventName: 'PostToolUse', additionalContext: context } }, lookup, env);
+    if (hookEventName === 'Stop') {
+        await sweepPrivilegedPending(typeof input.cwd === 'string' ? input.cwd : process.cwd(), env, deliveryAdapters, sweepDeadline).catch(() => undefined);
+        return undefined;
+    }
+    const response = await presentPendingAtBoundary(input.session_id, (context) => ({ hookSpecificOutput: { hookEventName: 'PostToolUse', additionalContext: context } }), lookup, env);
     await sweepPrivilegedPending(typeof input.cwd === 'string' ? input.cwd : process.cwd(), env, deliveryAdapters, sweepDeadline).catch(() => undefined);
     return response;
 }

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export { Square } from './square-wiring.js';
 export { SquareError } from './model.js';
 export { bindCurrentParticipant, squareAssignedParticipantName, unbindCurrentParticipant } from './registry.js';
+export { createDefaultWakeTransport } from './notifications.js';
 export { createHostLedgerPort, FileHostLedgerPort } from './host-ledger-file-adapter.js';
 export type { HostLedgerPort, PresenceRecord, EvidenceRecord } from './host-ledger.js';
 export type { PresentationSinkPort } from './ports.js';

package/dist/index.js

@@ -1,4 +1,5 @@
 export { Square } from './square-wiring.js';
 export { SquareError } from './model.js';
 export { bindCurrentParticipant, squareAssignedParticipantName, unbindCurrentParticipant } from './registry.js';
+export { createDefaultWakeTransport } from './notifications.js';
 export { createHostLedgerPort, FileHostLedgerPort } from './host-ledger-file-adapter.js';

package/dist/participant-host.js

@@ -3,7 +3,7 @@ import { defaultWakeRouteCapabilities, publishWakeRoute, retireWakeRouteFromArti
 export function processIdentity(env) {
     const choices = [
         [env.CLAUDE_CODE_SESSION_ID, 'claude-code'], [env.CODEX_THREAD_ID, 'codex'],
-        [env.OPENCODE_SESSION_ID, 'opencode'], [env.SQUARE_PI_SESSION_ID, 'pi'], [env.PASEO_AGENT_ID, 'paseo'],
+        [env.OPENCODE_SESSION_ID, 'opencode'], [env.PI_SESSION_ID, 'pi'], [env.PASEO_AGENT_ID, 'paseo'],
     ];
     const found = choices.find(([session]) => session?.trim());
     return found === undefined ? { session: `process:${process.pid}`, channel: 'unknown' } : { session: found[0].trim(), channel: found[1] };

package/dist/participant-identity.js

@@ -7,7 +7,7 @@ const nativeSessions = [
     { variable: 'CLAUDE_CODE_SESSION_ID', provider: 'claude' },
     { variable: 'CODEX_THREAD_ID', provider: 'codex' },
     { variable: 'OPENCODE_SESSION_ID', provider: 'opencode' },
-    { variable: 'SQUARE_PI_SESSION_ID', provider: 'pi' },
+    { variable: 'PI_SESSION_ID', provider: 'pi' },
 ];
 export function automaticParticipant(provider, sessionId, env) {
     const configured = env.SQUARE_PARTICIPANT_NAME?.trim();

package/dist/registry.js

@@ -12,7 +12,7 @@ const LOCAL_SESSION_SOURCES = [
     { variable: 'CLAUDE_CODE_SESSION_ID', channel: 'claude-code', child: 'CLAUDE_CODE_CHILD_SESSION' },
     { variable: 'CODEX_THREAD_ID', channel: 'codex' },
     { variable: 'OPENCODE_SESSION_ID', channel: 'opencode' },
-    { variable: 'SQUARE_PI_SESSION_ID', channel: 'pi' },
+    { variable: 'PI_SESSION_ID', channel: 'pi' },
 ];
 export function registryPath(env = process.env) { return env.SQUARE_REGISTRY || path.join(homedir(), '.square', 'sessions.ndjsonl'); }
 export async function canonicalSquarePath(squarePath) { const absolute = path.resolve(squarePath); try {

package/dist/square-projections.js

@@ -28,7 +28,7 @@ export async function projectSessionBindings(input) {
     return rows.map(bindingProjection);
 }
 export function sessionIdsFromEnvironment(env = process.env) {
-    return [env.CLAUDE_CODE_SESSION_ID, env.CODEX_THREAD_ID, env.OPENCODE_SESSION_ID, env.SQUARE_PI_SESSION_ID, env.PASEO_AGENT_ID]
+    return [env.CLAUDE_CODE_SESSION_ID, env.CODEX_THREAD_ID, env.OPENCODE_SESSION_ID, env.PI_SESSION_ID, env.PASEO_AGENT_ID]
         .map((value) => value?.trim()).filter((value) => Boolean(value));
 }
 export async function projectLocalParticipantBinding(input) {

package/dist/square-wiring.js

@@ -85,7 +85,7 @@ export class Square {
     async recognize(env) {
         if (this.square.hostLedger === undefined)
             return null;
-        const sessions = [env.CLAUDE_CODE_SESSION_ID, env.CODEX_THREAD_ID, env.OPENCODE_SESSION_ID, env.SQUARE_PI_SESSION_ID, env.PASEO_AGENT_ID]
+        const sessions = [env.CLAUDE_CODE_SESSION_ID, env.CODEX_THREAD_ID, env.OPENCODE_SESSION_ID, env.PI_SESSION_ID, env.PASEO_AGENT_ID]
             .map((value) => value?.trim()).filter((value) => Boolean(value));
         if (sessions.length === 0)
             return null;

package/extensions/square-pi.js

@@ -1,6 +1,6 @@
 import { presentPendingAtBoundary, renderPendingAtBoundary } from '../dist/boundary-presentation.js';
 import { automaticSessionEnd, automaticSessionStart } from '../dist/automatic-session.js';
-import { waitForSessionPending } from '../dist/inbox.js';
+import { sessionInbox, waitForSessionPending } from '../dist/inbox.js';
 import { projectSessionBindings } from '../dist/square-projections.js';
 import { createHostLedgerPort } from '../dist/host-ledger-file-adapter.js';
 
@@ -32,39 +32,28 @@ export function renderPiInbox(inbox) {
 export default function squarePiExtension(pi) {
   let sessionId;
   let sessionCwd;
-  let previousSessionId;
   let watcher;
   let watcherAbort;
   let generation = 0;
   const handledPending = new Set();
+  const observedPending = new Set();
   const landingAcks = new Map();
   let retryAfterChange = false;
   let retryWait;
   let turnIndex = 0;
   let activeTurn;
   let currentRunSignal;
-  const deferredSteers = new Set();
+  let detachRunAbort;
+  let cancelledRun = false;
 
-  const waitForAgentSettled = (signal) => new Promise((resolve, reject) => {
-    const deferred = {
-      release() {
-        deferredSteers.delete(deferred);
-        signal.removeEventListener('abort', abort);
-        resolve();
-      },
-    };
-    const abort = () => {
-      deferredSteers.delete(deferred);
-      signal.removeEventListener('abort', abort);
-      reject(signal.reason || new Error('Pi native injection aborted'));
-    };
-    deferredSteers.add(deferred);
-    if (signal.aborted) abort();
-    else signal.addEventListener('abort', abort, { once: true });
-  });
-
-  const releaseDeferredSteers = () => {
-    for (const deferred of [...deferredSteers]) deferred.release();
+  const cancelRunDelivery = () => {
+    cancelledRun = true;
+    for (const key of observedPending) handledPending.add(key);
+    generation += 1;
+    stopWatcher();
+    failAcks(new Error('Pi notification delivery cancelled'));
+    retryAfterChange = false;
+    retryWait = undefined;
   };
 
   const failAcks = (error) => {
@@ -87,7 +76,6 @@ export default function squarePiExtension(pi) {
         kind,
         sentAfterTurn: turnIndex,
         emptyTurnWindows: 0,
-        dropAfterSettled: false,
         settle(error) {
           if (ack.settled) return;
           ack.settled = true;
@@ -110,6 +98,10 @@ export default function squarePiExtension(pi) {
     return { promise, ack };
   };
 
+  // Each operation carries its own session coordinate. Never rewrite the process environment:
+  // Pi owns PI_SESSION_ID and several SDK sessions may coexist in one process.
+  const sessionEnv = (id) => ({ ...process.env, ...(id === undefined ? {} : { PI_SESSION_ID: id }) });
+
   // A transport may keep its promise pending while Pi is shutting down or
   // replacing a session. Never make a lifecycle hook wait for that transport.
   const stopWatcher = () => {
@@ -140,7 +132,7 @@ export default function squarePiExtension(pi) {
         excludeKeys: handledPending,
         skipImmediate: true,
         onChangeArmed: resolveArmed,
-      }).catch(() => {
+      }, sessionEnv(sessionId)).catch(() => {
         resolveArmed(false);
         return [];
       }).finally(() => signal.removeEventListener('abort', abort));
@@ -163,7 +155,7 @@ export default function squarePiExtension(pi) {
       try {
         pending = deferredRetry && retryWait !== undefined
           ? await retryWait
-          : await waitForSessionPending(sessionId, 30_000, { signal, excludeKeys: handledPending });
+          : await waitForSessionPending(sessionId, 30_000, { signal, excludeKeys: handledPending }, sessionEnv(sessionId));
       } catch {
         await pause(signal, 1_000);
         continue;
@@ -180,6 +172,7 @@ export default function squarePiExtension(pi) {
       retryWait = undefined;
 
       const keys = inboxKeys(pending);
+      for (const key of keys) observedPending.add(key);
       const deferred = armDeferredRetry();
       const retryArmed = await deferred.armed;
       if (!retryArmed) {
@@ -191,7 +184,7 @@ export default function squarePiExtension(pi) {
         await presentPendingAtBoundary(
           sessionId,
           async (content) => {
-            if (currentRunSignal?.aborted) await waitForAgentSettled(signal);
+            if (signal.aborted || currentRunSignal?.aborted) throw new Error('Pi notification delivery cancelled');
             const landing = waitForLanding(content, signal, 'steer');
             try {
               Promise.resolve(pi.sendMessage(
@@ -203,12 +196,23 @@ export default function squarePiExtension(pi) {
             }
             return landing.promise;
           },
-          undefined,
-          undefined,
+          async (id, env) => {
+            const inbox = await sessionInbox(id, env ?? sessionEnv(id));
+            if (signal.aborted || token !== generation) return [];
+            for (const key of inboxKeys(inbox)) observedPending.add(key);
+            return inbox.map((membership) => ({
+              ...membership,
+              notifications: membership.notifications.filter((note) => !handledPending.has(
+                `${membership.squarePath}\u0000${membership.name.toLocaleLowerCase()}\u0000${note.actIndex}`,
+              )),
+            }));
+          },
+          sessionEnv(sessionId),
           signal,
         );
         for (const key of keys) handledPending.add(key);
       } catch (error) {
+        if (signal.aborted || token !== generation) return;
         if (error instanceof PiDeliveryDroppedError) {
           deferred.cancel();
           continue;
@@ -224,10 +228,13 @@ export default function squarePiExtension(pi) {
   };
 
   pi.on('session_start', async (_event, ctx) => {
+    detachRunAbort?.();
+    cancelledRun = false;
     generation += 1;
     failAcks(new Error('Pi session replaced'));
     stopWatcher();
     handledPending.clear();
+    observedPending.clear();
     retryAfterChange = false;
     retryWait = undefined;
     turnIndex = 0;
@@ -235,12 +242,10 @@ export default function squarePiExtension(pi) {
     currentRunSignal = undefined;
     sessionId = ctx.sessionManager.getSessionId();
     sessionCwd = ctx.cwd || process.cwd();
-    previousSessionId = process.env.SQUARE_PI_SESSION_ID;
-    process.env.SQUARE_PI_SESSION_ID = sessionId;
     const token = generation;
     watcherAbort = new AbortController();
     const signal = watcherAbort.signal;
-    void automaticSessionStart('pi', sessionId, sessionCwd).then((context) => {
+    void automaticSessionStart('pi', sessionId, sessionCwd, sessionEnv(sessionId)).then((context) => {
       if (context === undefined || sessionId === undefined || token !== generation) return;
       const landing = waitForLanding(context, signal, 'nextTurn');
       try {
@@ -258,7 +263,13 @@ export default function squarePiExtension(pi) {
   });
 
   pi.on('agent_start', async (_event, ctx) => {
+    detachRunAbort?.();
     currentRunSignal = ctx?.getSignal?.();
+    if (ctx?.mode !== 'tui' || currentRunSignal === undefined) return;
+    const runSignal = currentRunSignal;
+    detachRunAbort = () => runSignal.removeEventListener('abort', cancelRunDelivery);
+    if (runSignal.aborted) cancelRunDelivery();
+    else runSignal.addEventListener('abort', cancelRunDelivery, { once: true });
   });
 
   pi.on('message_end', async (event) => {
@@ -277,15 +288,13 @@ export default function squarePiExtension(pi) {
     const turn = activeTurn;
     activeTurn = undefined;
     const acks = [...landingAcks.values()].flatMap((waiters) => [...waiters]);
-    if (event.message?.stopReason === 'aborted' && ctx?.mode === 'tui' && turn?.signal !== undefined) {
-      for (const ack of acks) {
-        if (ack.kind === 'steer') ack.dropAfterSettled = true;
-      }
+    if (event.message?.stopReason === 'aborted' && ctx?.mode === 'tui') {
+      if (!cancelledRun) cancelRunDelivery();
       return;
     }
     if (turn === undefined) return;
     for (const ack of acks) {
-      if (ack.kind !== 'steer' || ack.dropAfterSettled || turn.index <= ack.sentAfterTurn) continue;
+      if (ack.kind !== 'steer' || turn.index <= ack.sentAfterTurn) continue;
       if (turn.hasInput) {
         ack.emptyTurnWindows = 0;
       } else {
@@ -296,23 +305,29 @@ export default function squarePiExtension(pi) {
   });
 
   pi.on('agent_settled', async () => {
+    detachRunAbort?.();
+    detachRunAbort = undefined;
     currentRunSignal = undefined;
-    const acks = [...landingAcks.values()].flatMap((waiters) => [...waiters]);
-    for (const ack of acks) {
-      if (ack.dropAfterSettled) ack.settle(new PiDeliveryDroppedError());
-    }
-    releaseDeferredSteers();
+    if (!cancelledRun || sessionId === undefined) return;
+    const token = generation;
+    // Cancel the entire pending batch, including entries not yet sent to Pi.
+    // This is local suppression, never evidence that the model saw the activity.
+    const cancelled = await sessionInbox(sessionId, sessionEnv(sessionId));
+    if (token !== generation || sessionId === undefined) return;
+    for (const key of inboxKeys(cancelled)) handledPending.add(key);
+    cancelledRun = false;
+    watcherAbort = new AbortController();
+    watcher = wake(token, watcherAbort.signal).catch(() => undefined);
   });
 
   pi.on('session_shutdown', async () => {
+    detachRunAbort?.();
+    detachRunAbort = undefined;
+    cancelledRun = false;
     generation += 1;
     failAcks(new Error('Pi session ended'));
     stopWatcher();
-    if (sessionId && sessionCwd) void automaticSessionEnd('pi', sessionId, sessionCwd).catch(() => undefined);
-    if (process.env.SQUARE_PI_SESSION_ID === sessionId) {
-      if (previousSessionId === undefined) delete process.env.SQUARE_PI_SESSION_ID;
-      else process.env.SQUARE_PI_SESSION_ID = previousSessionId;
-    }
+    if (sessionId && sessionCwd) void automaticSessionEnd('pi', sessionId, sessionCwd, sessionEnv(sessionId)).catch(() => undefined);
     sessionId = undefined;
     sessionCwd = undefined;
     retryWait = undefined;

package/package.json

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