ftown-bridge 0.19.17 → 0.19.19

package/opencode-plugin/ftown.js

@@ -65,6 +65,11 @@ export function registerFtownOpencodePlugin(client, options = {}) {
   // The opencode session id this plugin instance tracks — updated from every
   // event that carries one, so it stays correct across TUI session switches.
   let currentSessionId;
+  // Serializes turn-end handling: opencode may emit BOTH session.status(idle)
+  // and session.idle for the same boundary. Unordered, two concurrent drains
+  // could read the same undelivered mail before either marks it delivered and
+  // inject it twice.
+  let turnEndChain = Promise.resolve();
 
   async function request(path, init = {}) {
     const pointer = await readBridgePointer();
@@ -98,10 +103,10 @@ export function registerFtownOpencodePlugin(client, options = {}) {
     });
   }
 
-  async function drainMail() {
+  async function listInbox(peek) {
     if (!ftownSessionId) return [];
     const response = await request(
-      `/api/sessions/${encodeURIComponent(ftownSessionId)}/inbox?wait=0`,
+      `/api/sessions/${encodeURIComponent(ftownSessionId)}/inbox?wait=0${peek ? '&peek=1' : ''}`,
       { method: 'GET' },
     );
     if (!response) return [];
@@ -113,12 +118,18 @@ export function registerFtownOpencodePlugin(client, options = {}) {
     }
   }
 
+  /**
+   * Peek first, and only mark delivered AFTER the prompt was accepted. If
+   * submission fails, mail stays queued for the next boundary instead of
+   * being silently lost between a marking drain and a failed injection.
+   */
   async function deliverMail() {
-    const messages = await drainMail();
-    if (messages.length === 0 || !currentSessionId) return;
+    if (!currentSessionId) return;
+    const messages = await listInbox(true);
+    if (messages.length === 0) return;
     const formatted = messages.map(formatMail).join('\n');
-    // Submitting a prompt starts a new turn; when it finishes, session.idle
-    // fires again and any mail that arrived meanwhile is delivered then.
+    // Submitting a prompt starts a new turn; when it finishes, the next idle
+    // boundary fires and any mail that arrived meanwhile is delivered then.
     await client.session.prompt({
       path: { id: currentSessionId },
       body: {
@@ -132,17 +143,39 @@ export function registerFtownOpencodePlugin(client, options = {}) {
         ],
       },
     });
+    // Accepted — only now let the bridge mark the peeked messages delivered.
+    await listInbox(false);
   }
 
-  function trackSessionId(properties) {
-    const id = properties?.info?.id ?? properties?.sessionID ?? properties?.info?.sessionID;
+  /**
+   * Extract the opencode SESSION id from event properties. `info.id` is only
+   * trustworthy on session.created — on message.updated it is a MESSAGE id
+   * (msg_…), which must never be stored as the resume id.
+   */
+  function trackSessionId(properties, preferInfoId = false) {
+    const id = properties?.sessionID
+      ?? properties?.info?.sessionID
+      ?? (preferInfoId ? properties?.info?.id : undefined);
     if (typeof id === 'string' && id.trim()) currentSessionId = id.trim();
   }
 
+  /** Turn boundary: mark idle, then drain and inject pending mail. */
+  function endTurn(properties) {
+    trackSessionId(properties);
+    const run = turnEndChain.then(async () => {
+      await postHook('Stop');
+      await deliverMail();
+    }).catch(() => {
+      // A failed hook POST or mail delivery must never crash the agent TUI.
+    });
+    turnEndChain = run;
+    return run;
+  }
+
   async function handleEvent(event) {
     switch (event.type) {
       case 'session.created':
-        trackSessionId(event.properties);
+        trackSessionId(event.properties, true);
         await postHook('SessionStart');
         break;
       case 'message.updated': {
@@ -152,10 +185,17 @@ export function registerFtownOpencodePlugin(client, options = {}) {
         break;
       }
       case 'session.idle':
+        await endTurn(event.properties);
+        break;
+      case 'session.status': {
         trackSessionId(event.properties);
-        await postHook('Stop');
-        await deliverMail();
+        // v1.18.x fires session.status(busy/idle) reliably; session.idle may
+        // not reach plugins at all. Busy keeps the mail pump from nudging
+        // mid-turn; idle is a full turn boundary.
+        if (event.properties?.status?.type === 'busy') await postHook('PreToolUse');
+        else if (event.properties?.status?.type === 'idle') await endTurn(event.properties);
         break;
+      }
       case 'session.error':
         trackSessionId(event.properties);
         await postHook('SessionEnd', { reason: 'error' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ftown-bridge",
-  "version": "0.19.17",
+  "version": "0.19.19",
   "description": "CLI bridge for ftown — generic PTY-over-Centrifugo relay",
   "type": "module",
   "main": "dist/index.js",