@astrosheep/square 0.3.25 → 0.3.27

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

@@ -1,6 +1,6 @@
 {
   "name": "square",
-  "version": "0.3.25",
+  "version": "0.3.27",
   "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.25",
+  "version": "0.3.27",
   "description": "Shared Square activity with reliable participant attention at Codex boundaries.",
   "author": {
     "name": "Square"

package/extensions/square-pi.js

@@ -1,6 +1,9 @@
 import { presentPendingAtBoundary, renderPendingAtBoundary } from '../dist/boundary-presentation.js';
 import { automaticSessionEnd, automaticSessionStart } from '../dist/automatic-session.js';
 import { waitForSessionPending } from '../dist/inbox.js';
+import { lookupSessionBindings } from '../dist/registry.js';
+
+const PI_SEND_TIMEOUT_MS = 5_000;
 
 export function pendingInbox(inbox) {
   return inbox.filter((item) => item.notifications?.length > 0);
@@ -44,8 +47,30 @@ export default function squarePiExtension(pi) {
     });
   };
 
+  // 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 = () => {
+    watcherAbort?.abort();
+    watcher = undefined;
+    watcherAbort = undefined;
+  };
+
+  const pause = (signal, delayMs) => new Promise((resolve) => {
+    const finish = () => {
+      signal.removeEventListener('abort', finish);
+      clearTimeout(timer);
+      resolve();
+    };
+    const timer = setTimeout(finish, delayMs);
+    signal.addEventListener('abort', finish, { once: true });
+  });
+
   const wake = async (piContext, token, signal) => {
     while (sessionId !== undefined && token === generation && !signal.aborted) {
+      if (lookupSessionBindings(sessionId).length === 0) {
+        await pause(signal, 1_000);
+        continue;
+      }
       const deferredRetry = retryAfterChange;
       const pending = await waitForSessionPending(sessionId, 30_000, {
         signal,
@@ -70,10 +95,21 @@ export default function squarePiExtension(pi) {
         const delivered = await presentPendingAtBoundary(
           sessionId,
           async (content) => {
-            await pi.sendMessage(
+            const send = Promise.resolve(pi.sendMessage(
               { customType: 'square', content, display: true },
               { deliverAs: 'steer', triggerTurn: true },
-            );
+            ));
+            let timer;
+            try {
+              await Promise.race([
+                send,
+                new Promise((_, reject) => {
+                  timer = setTimeout(() => reject(new Error('Pi native injection timed out')), PI_SEND_TIMEOUT_MS);
+                }),
+              ]);
+            } finally {
+              if (timer !== undefined) clearTimeout(timer);
+            }
             return true;
           },
         );
@@ -91,17 +127,15 @@ export default function squarePiExtension(pi) {
 
   pi.on('session_start', async (_event, ctx) => {
     generation += 1;
-    watcherAbort?.abort();
-    if (watcher) await watcher;
-    watcher = undefined;
-    watcherAbort = undefined;
+    stopWatcher();
     handledPending.clear();
     retryAfterChange = false;
     sessionId = ctx.sessionManager.getSessionId();
     sessionCwd = ctx.cwd || process.cwd();
     previousSessionId = process.env.SQUARE_PI_SESSION_ID;
     process.env.SQUARE_PI_SESSION_ID = sessionId;
-    try { joiningContext = await automaticSessionStart('pi', sessionId, sessionCwd); } catch { joiningContext = undefined; }
+    joiningContext = undefined;
+    void automaticSessionStart('pi', sessionId, sessionCwd).catch(() => undefined);
     watcherAbort = new AbortController();
     const token = generation;
     watcher = wake(ctx, token, watcherAbort.signal).catch(() => undefined);
@@ -130,13 +164,10 @@ export default function squarePiExtension(pi) {
 
   pi.on('session_shutdown', async () => {
     generation += 1;
-    watcherAbort?.abort();
-    if (watcher) await watcher;
-    watcher = undefined;
-    watcherAbort = undefined;
+    stopWatcher();
     for (const waiter of settledWaiters) waiter.resolve();
     settledWaiters = [];
-    if (sessionId && sessionCwd) await automaticSessionEnd('pi', sessionId, sessionCwd);
+    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;

package/package.json

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