ticlawk 0.1.16-dev.30 → 0.1.16-dev.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ticlawk",
-  "version": "0.1.16-dev.30",
+  "version": "0.1.16-dev.31",
   "description": "Local connector that links agent harnesses (Claude Code, Codex, OpenClaw, opencode, Pi) to the Ticlawk mobile app.",
   "type": "module",
   "main": "ticlawk.mjs",

package/src/adapters/ticlawk/api.mjs

@@ -30,8 +30,9 @@ export function getConnectorWsUrl() {
   return DEFAULT_CONNECTOR_WS_URL;
 }
 
-// Agent event writes must preserve per-agent order while still allowing
-// different agents to proceed concurrently.
+// Non-terminal event writes are serialized per agent for stable logs.
+// Terminal turn events bypass this queue so telemetry cannot hold up the
+// delivery lifecycle.
 const agentEventQueues = new Map(); // agentId -> Promise
 
 export class TiclawkUpdateRequiredError extends Error {
@@ -710,58 +711,71 @@ export async function setWorkstreamCharter({ actingAgentId, conversationId, char
 export async function postEvent({ agent, agent_id, runtime_host_id, session_id, cwd, runtime_version, event, required = false }) {
   const agentId = agent_id || null;
   const queueKey = agentId || `${agent}:${session_id || ''}`;
-  const previous = agentEventQueues.get(queueKey) || Promise.resolve(null);
   const eventName = event?.worker_event_name || event?.hook_event_name || event?.event_name || 'unknown';
   const turnId = event?.turn_id || event?.reply_to_message_id || null;
   const seq = event?.event_seq ?? null;
   const deltaChars = typeof event?.delta === 'string' ? event.delta.length : null;
 
+  if (eventName === 'worker.message.delta') {
+    debugLog('events', 'delta.drop', {
+      agent,
+      agentId,
+      sessionId: shortId(session_id),
+      turnId: shortId(turnId),
+      deltaChars,
+    });
+    return null;
+  }
+
+  const postOnce = async () => {
+    const startedAt = Date.now();
+    try {
+      const result = await apiFetch('/api/events', {
+        method: 'POST',
+        body: JSON.stringify({ agent, agent_id: agentId, runtime_host_id, session_id, cwd, runtime_version, event }),
+        timeout: 5000,
+      });
+      if (required && result?.matched === false) {
+        throw new Error(`event was not matched (${eventName})`);
+      }
+      debugLog('events', 'post.ok', {
+        agent,
+        agentId,
+        sessionId: shortId(session_id),
+        runtimeVersion: runtime_version ?? null,
+        turnId: shortId(turnId),
+        eventName,
+        seq,
+        durationMs: Date.now() - startedAt,
+      });
+      return result;
+    } catch (err) {
+      debugError('events', 'post.failed', {
+        agent,
+        agentId,
+        sessionId: shortId(session_id),
+        runtimeVersion: runtime_version ?? null,
+        turnId: shortId(turnId),
+        eventName,
+        seq,
+        durationMs: Date.now() - startedAt,
+        error: err?.message || 'unknown error',
+      });
+      if (required) {
+        throw err;
+      }
+      return null;
+    }
+  };
+
+  if (eventName === 'worker.turn.complete' || eventName === 'worker.turn.error') {
+    return postOnce();
+  }
+
+  const previous = agentEventQueues.get(queueKey) || Promise.resolve(null);
   const queued = previous
     .catch(() => null)
-    .then(async () => {
-      const startedAt = Date.now();
-      try {
-        const result = await apiFetch('/api/events', {
-          method: 'POST',
-          body: JSON.stringify({ agent, agent_id: agentId, runtime_host_id, session_id, cwd, runtime_version, event }),
-          timeout: 5000,
-        });
-        if (required && result?.matched === false) {
-          throw new Error(`event was not matched (${eventName})`);
-        }
-        debugLog('events', 'post.ok', {
-          agent,
-          agentId,
-          sessionId: shortId(session_id),
-          runtimeVersion: runtime_version ?? null,
-          turnId: shortId(turnId),
-          eventName,
-          seq,
-          deltaChars,
-          durationMs: Date.now() - startedAt,
-        });
-        return result;
-      } catch (err) {
-        debugError('events', 'post.failed', {
-          agent,
-          agentId,
-          sessionId: shortId(session_id),
-          runtimeVersion: runtime_version ?? null,
-          turnId: shortId(turnId),
-          eventName,
-          seq,
-          deltaChars,
-          durationMs: Date.now() - startedAt,
-          error: err?.message || 'unknown error',
-        });
-        if (required) {
-          throw err;
-        }
-        // Best-effort by default. Callers that need a hard failure set
-        // `required: true` (used for the final reply path).
-        return null;
-      }
-    });
+    .then(postOnce);
 
   agentEventQueues.set(queueKey, queued);
   queued.finally(() => {

package/src/adapters/ticlawk/index.mjs

@@ -1168,10 +1168,9 @@ export function createTiclawkAdapter(ctx) {
     id: 'ticlawk',
 
     async start() {
-      // No stale-delivery recovery anywhere — if the daemon is killed
-      // mid-claim, the row stays `claimed` forever. lease_expires_at
-      // was dropped in X1; no cron has replaced it. Rare in practice;
-      // when it happens the fix is a one-row UPDATE in supabase.
+      // Stale claimed deliveries are recovered conservatively by the
+      // claim RPC; this startup path only refreshes local bindings and
+      // asks for the next drain.
       await refreshBindings('startup');
       await syncCredentials('startup');
       await requestDrain('startup');

package/src/core/events/worker-events.mjs

@@ -1,22 +1,9 @@
-import { createHash } from 'node:crypto';
-
 const workerEventSeq = new Map();
-const DELTA_LOG_PREVIEW_CHARS = 48;
 
 function shortId(value) {
   return value ? String(value).slice(0, 8) : null;
 }
 
-function hashText(text) {
-  return createHash('sha1').update(String(text)).digest('hex').slice(0, 12);
-}
-
-function previewDelta(text) {
-  const normalized = String(text).replace(/\n/g, '\\n');
-  if (normalized.length <= DELTA_LOG_PREVIEW_CHARS) return normalized;
-  return normalized.slice(0, DELTA_LOG_PREVIEW_CHARS) + '…';
-}
-
 function nextWorkerEventMeta({ agent, sessionId, turnId }) {
   const key = `${agent}:${sessionId || ''}:${turnId || 'session'}`;
   const seq = (workerEventSeq.get(key) || 0) + 1;
@@ -37,6 +24,16 @@ export async function emitWorkerEvent({ adapter, binding, agent, sessionId, cwd
   if (!sessionId || typeof adapter.emitEvent !== 'function') return;
   const eventName = event?.worker_event_name || event?.hook_event_name || 'unknown';
   const logicalTurnId = replyToMessageId || turnId || event?.turn_id || null;
+  if (eventName === 'worker.message.delta') {
+    logger?.debugLog?.('events', 'delta.drop', {
+      bindingId: binding.id,
+      agent,
+      sessionId: shortId(sessionId),
+      turnId: shortId(logicalTurnId),
+      chars: typeof event?.delta === 'string' ? event.delta.length : null,
+    });
+    return;
+  }
   const { key, seq, originTs } = nextWorkerEventMeta({ agent, sessionId, turnId: logicalTurnId });
   const enrichedEvent = {
     ...event,
@@ -45,29 +42,14 @@ export async function emitWorkerEvent({ adapter, binding, agent, sessionId, cwd
     event_seq: seq,
     origin_ts: originTs,
   };
-  if (typeof event?.delta === 'string' && event.delta) {
-    enrichedEvent.delta_chars = event.delta.length;
-    enrichedEvent.delta_hash = hashText(event.delta);
-    logger?.debugLog?.('events', 'delta.recv', {
-      bindingId: binding.id,
-      agent,
-      sessionId: shortId(sessionId),
-      turnId: shortId(logicalTurnId),
-      seq,
-      chars: event.delta.length,
-      hash: enrichedEvent.delta_hash,
-      preview: previewDelta(event.delta),
-    });
-  } else {
-    logger?.debugLog?.('events', 'event.recv', {
-      bindingId: binding.id,
-      agent,
-      sessionId: shortId(sessionId),
-      turnId: shortId(logicalTurnId),
-      seq,
-      eventName,
-    });
-  }
+  logger?.debugLog?.('events', 'event.recv', {
+    bindingId: binding.id,
+    agent,
+    sessionId: shortId(sessionId),
+    turnId: shortId(logicalTurnId),
+    seq,
+    eventName,
+  });
   await adapter.emitEvent(binding, {
     agent,
     sessionId,
@@ -78,3 +60,17 @@ export async function emitWorkerEvent({ adapter, binding, agent, sessionId, cwd
     clearWorkerEventMeta(key);
   }
 }
+
+export function emitWorkerEventBestEffort(args) {
+  void emitWorkerEvent(args).catch((err) => {
+    const event = args?.event || {};
+    const eventName = event.worker_event_name || event.hook_event_name || 'unknown';
+    args?.logger?.debugError?.('events', 'event.best-effort-failed', {
+      bindingId: args?.binding?.id || null,
+      agent: args?.agent || null,
+      sessionId: shortId(args?.sessionId),
+      eventName,
+      error: err?.message || 'unknown error',
+    });
+  });
+}

package/src/core/runtime-support.mjs

@@ -1,8 +1,7 @@
 import { getStreamingMode } from './config.mjs';
 import { getAgentHome } from './agent-home.mjs';
+import { debugError } from './logger.mjs';
 const ERROR_MAX_CHARS = 500;
-const DEFAULT_DELTA_FLUSH_MS = 250;
-const DEFAULT_DELTA_FLUSH_CHARS = 64;
 const MAX_SCOPED_RUNTIME_SESSIONS = 50;
 
 function truncateError(text) {
@@ -75,12 +74,21 @@ export async function reportSubprocessFailure({ adapter, binding, inbound, runti
   // skips fan-out to member-role agents, breaking what would otherwise
   // be a failure→fan-out→failure cascade when several agents share a
   // broken runtime.
-  await adapter.postAgentReply(binding, {
-    conversationId: inbound?.conversationId || null,
-    text,
-    replyToMessageId: inbound?.messageId || null,
-    visibility: 'admin',
-  });
+  try {
+    await adapter.postAgentReply(binding, {
+      conversationId: inbound?.conversationId || null,
+      text,
+      replyToMessageId: inbound?.messageId || null,
+      visibility: 'admin',
+    });
+  } catch (err) {
+    debugError('runtime', 'failure-notice.failed', {
+      agentId: binding?.id || null,
+      runtimeName,
+      messageId: inbound?.messageId || null,
+      error: err?.message || 'unknown error',
+    });
+  }
 }
 
 export function terminalRuntimeFailure(reason = 'runtime failure') {
@@ -205,81 +213,3 @@ export function buildRuntimeSessionMetaPatch(meta = {}, scope = {}, result = {})
     lastRotatedAt,
   };
 }
-
-export function createDeltaAggregator({
-  flushDelta,
-  flushMs = DEFAULT_DELTA_FLUSH_MS,
-  flushChars = DEFAULT_DELTA_FLUSH_CHARS,
-}) {
-  let buffer = '';
-  let pendingMeta = null;
-  let timer = null;
-  let flushChain = Promise.resolve();
-
-  const clearTimer = () => {
-    if (!timer) return;
-    clearTimeout(timer);
-    timer = null;
-  };
-
-  const startFlush = () => {
-    if (!buffer || typeof flushDelta !== 'function') return flushChain;
-    const text = buffer;
-    const meta = pendingMeta || {};
-    buffer = '';
-    pendingMeta = null;
-    clearTimer();
-    flushChain = flushChain
-      .catch(() => {})
-      .then(() => flushDelta({ text, ...meta }));
-    return flushChain;
-  };
-
-  const scheduleFlush = () => {
-    if (!buffer || timer) return;
-    timer = setTimeout(() => {
-      timer = null;
-      void startFlush();
-    }, flushMs);
-    timer.unref?.();
-  };
-
-  return {
-    push(text, meta = {}) {
-      const normalized = typeof text === 'string' ? text : '';
-      if (!normalized) return;
-
-      const nextMeta = {
-        sessionId: meta.sessionId || null,
-        turnId: meta.turnId || null,
-        cwd: meta.cwd || '',
-      };
-
-      const sameContext = !pendingMeta
-        || (
-          pendingMeta.sessionId === nextMeta.sessionId
-          && pendingMeta.turnId === nextMeta.turnId
-          && pendingMeta.cwd === nextMeta.cwd
-        );
-
-      if (!sameContext && buffer) {
-        void startFlush();
-      }
-
-      pendingMeta = nextMeta;
-      buffer += normalized;
-
-      if (buffer.length >= flushChars) {
-        void startFlush();
-        return;
-      }
-
-      scheduleFlush();
-    },
-
-    async flush() {
-      clearTimer();
-      await startFlush();
-    },
-  };
-}

package/src/runtimes/_shared/handbook/COMMUNICATION.md

@@ -24,6 +24,8 @@ The reply target is the precise chat destination for this message. Treat it as a
 - When reporting a result to a human, first decide whether the result itself is a file or artifact. If it is, attach it. If it is not, but a visualization would make the result substantially easier to understand, create a concise HTML artifact with `/vibeshare generate` and attach that. Do not create artifacts for ordinary text answers.
 - Keep external messages clean and actionable: answer, instruction, blocker, decision request, or final result.
 - Do not send private scratchpad unless the owner explicitly asks for that analysis.
+- When the work is complete or blocked, send one concise final recipient-facing summary through `ticlawk message send --target <target>`.
+- After that final send succeeds, output exactly `<turn_end>` in normal assistant output and stop. Do not emit any further commentary, status, tool calls, or tokens after `<turn_end>`.
 
 ## Reading Context
 

package/src/runtimes/_shared/standing-prompt.mjs

@@ -88,7 +88,9 @@ function buildReadInstructions(ctx = {}) {
   const handbookFiles = files.filter((name) => name !== 'MEMORY.md');
   const memoryList = memoryFiles.map((name, index) => `${index + 1}. \`${name}\``).join('\n');
   const handbookList = handbookFiles.map((name, index) => `${index + 1}. \`${name}\``).join('\n');
-  return `Read this file every time before acting because it may be updated:
+  return `To reply to the user or group, use \`ticlawk message send --target <target>\`. Normal assistant output is private and is not sent to the user. Details are in \`COMMUNICATION.md\`.
+
+Read this file every time before acting because it may be updated:
 ${memoryList}
 
 Read these files if you haven't already. Otherwise, skip:

package/src/runtimes/claude-code/index.mjs

@@ -23,7 +23,7 @@ import {
 } from './session.mjs';
 import { discoverSessions } from './transcripts.mjs';
 import { buildImageMessageFromInbound } from '../../core/media/inbound.mjs';
-import { emitWorkerEvent } from '../../core/events/worker-events.mjs';
+import { emitWorkerEventBestEffort } from '../../core/events/worker-events.mjs';
 import {
   shouldStreamRuntime,
   reportSubprocessFailure,
@@ -160,7 +160,7 @@ export const claudeCodeRuntime = {
             appendSystemPrompt,
             onEvent: async (event) => {
               if (event?.type === 'turn.started') {
-                await emitWorkerEvent({
+                emitWorkerEventBestEffort({
                   adapter,
                   binding,
                   agent: this.name,
@@ -173,21 +173,6 @@ export const claudeCodeRuntime = {
                   },
                   logger: ctx.logger,
                 });
-              } else if (event?.type === 'message.delta' && event.text) {
-                await emitWorkerEvent({
-                  adapter,
-                  binding,
-                  agent: this.name,
-                  sessionId: event.sessionId || targetSessionId || binding.id,
-                  cwd: projectDir,
-                  replyToMessageId: inbound.messageId || null,
-                  event: {
-                    hook_event_name: 'worker.message.delta',
-                    worker_event_name: 'worker.message.delta',
-                    delta: event.text,
-                  },
-                  logger: ctx.logger,
-                });
               }
             },
           })
@@ -200,7 +185,7 @@ export const claudeCodeRuntime = {
         claudePath,
         claudeVersion,
       }, { status: 'connected' });
-      await emitWorkerEvent({
+      emitWorkerEventBestEffort({
         adapter,
         binding: nextBinding,
         agent: this.name,
@@ -215,7 +200,7 @@ export const claudeCodeRuntime = {
       });
       return true;
     } catch (err) {
-      await emitWorkerEvent({
+      emitWorkerEventBestEffort({
         adapter,
         binding,
         agent: this.name,
@@ -247,7 +232,7 @@ export const claudeCodeRuntime = {
 
   async reconcileAfterRestart(binding, ctx) {
     const meta = binding.runtimeMeta || {};
-    await emitWorkerEvent({
+    emitWorkerEventBestEffort({
       adapter: ctx.adapter,
       binding,
       agent: this.name,

package/src/runtimes/claude-code/session.mjs

@@ -231,23 +231,19 @@ export function streamCCPrompt({
     let seenTurnStart = false;
     let activeSessionId = sessionId || null;
     let finalText = '';
-    let eventChain = Promise.resolve();
 
     const emit = (event) => {
       if (typeof onEvent !== 'function') return;
-      eventChain = eventChain
+      void Promise.resolve()
         .then(() => onEvent(event))
         .catch(() => {});
-      return eventChain;
     };
 
     const settle = (fn, value) => {
       if (settled) return;
       settled = true;
       if (timeout) clearTimeout(timeout);
-      eventChain
-        .catch(() => {})
-        .finally(() => fn(value));
+      fn(value);
     };
 
     const parseLine = (line) => {
@@ -267,7 +263,6 @@ export function streamCCPrompt({
         const deltaText = parsed.event?.delta?.text;
         if (typeof deltaText === 'string' && deltaText) {
           finalText += deltaText;
-          emit({ type: 'message.delta', sessionId: activeSessionId, text: deltaText });
         }
         return;
       }

package/src/runtimes/codex/index.mjs

@@ -21,10 +21,9 @@ import {
   requireCodexPath,
 } from './session.mjs';
 import { buildCodexInputFromInbound } from '../../core/media/inbound.mjs';
-import { emitWorkerEvent } from '../../core/events/worker-events.mjs';
+import { emitWorkerEventBestEffort } from '../../core/events/worker-events.mjs';
 import {
   shouldStreamRuntime,
-  createDeltaAggregator,
   reportSubprocessFailure,
   terminalRuntimeFailure,
   updateBindingRuntimeMeta,
@@ -226,25 +225,6 @@ export const codexRuntime = {
     const sessionScope = resolveRuntimeSessionScope(meta, inbound);
     const shouldRotate = sessionScope.shouldRotate;
     const targetSessionId = shouldRotate ? null : sessionScope.sessionId;
-    const deltaAggregator = createDeltaAggregator({
-      flushDelta: async ({ text, sessionId, turnId, cwd }) => {
-        await emitWorkerEvent({
-          adapter,
-          binding,
-          agent: this.name,
-          sessionId: sessionId || targetSessionId || binding.id,
-          turnId: turnId || null,
-          cwd: cwd || agentHome,
-          replyToMessageId: inbound.messageId || null,
-          event: {
-            hook_event_name: 'worker.message.delta',
-            worker_event_name: 'worker.message.delta',
-            delta: text,
-          },
-          logger: ctx.logger,
-        });
-      },
-    });
     try {
       const runtimeCodexPath = requireCodexPath(meta.codexPath || meta.runtimePath);
       const runtimeCodexVersion = getCodexRuntimeHealth(runtimeCodexPath).version || meta.codexVersion || null;
@@ -273,7 +253,7 @@ export const codexRuntime = {
             developerInstructions,
             onEvent: async (event) => {
               if (event?.type === 'turn.started') {
-                await emitWorkerEvent({
+                emitWorkerEventBestEffort({
                   adapter,
                   binding,
                   agent: this.name,
@@ -287,12 +267,6 @@ export const codexRuntime = {
                   },
                   logger: ctx.logger,
                 });
-              } else if (event?.type === 'message.delta' && event.text) {
-                deltaAggregator.push(event.text, {
-                  sessionId: event.sessionId || targetSessionId || binding.id,
-                  turnId: event.turnId || null,
-                  cwd: agentHome,
-                });
               }
             },
           })
@@ -300,7 +274,6 @@ export const codexRuntime = {
             input: codexInput,
           });
 
-      await deltaAggregator.flush();
       const nextBinding = await updateBindingRuntimeMeta(ctx, binding, {
         ...buildRuntimeSessionMetaPatch(meta, sessionScope, {
           sessionId: result?.sessionId,
@@ -310,7 +283,7 @@ export const codexRuntime = {
         codexPath: runtimeCodexPath,
         codexVersion: runtimeCodexVersion,
       }, { status: 'connected' });
-      await emitWorkerEvent({
+      emitWorkerEventBestEffort({
         adapter,
         binding: nextBinding,
         agent: this.name,
@@ -326,7 +299,6 @@ export const codexRuntime = {
       });
       return true;
     } catch (err) {
-      await deltaAggregator.flush().catch(() => {});
       const failureInfo = err?.info || {
         ok: false,
         kind: 'exit-error',
@@ -341,7 +313,7 @@ export const codexRuntime = {
           lastGatewayFailureReason: failureInfo.errorMessage || err?.message || 'Codex app-server error',
         }, { status: 'degraded' }).catch(() => binding);
       }
-      await emitWorkerEvent({
+      emitWorkerEventBestEffort({
         adapter,
         binding: failureBinding,
         agent: this.name,
@@ -369,7 +341,7 @@ export const codexRuntime = {
 
   async reconcileAfterRestart(binding, ctx) {
     const meta = binding.runtimeMeta || {};
-    await emitWorkerEvent({
+    emitWorkerEventBestEffort({
       adapter: ctx.adapter,
       binding,
       agent: this.name,

package/src/runtimes/codex/session.mjs

@@ -368,14 +368,12 @@ export function streamCodexPrompt({
     let finalText = '';
     let threadPath = null;
     const ignoredChildEventsLogged = new Set();
-    let eventChain = Promise.resolve();
 
     const emit = (event) => {
       if (typeof onEvent !== 'function') return;
-      eventChain = eventChain
+      void Promise.resolve()
         .then(() => onEvent(event))
         .catch(() => {});
-      return eventChain;
     };
 
     const settle = (fn, value) => {
@@ -387,9 +385,7 @@ export function streamCodexPrompt({
       }
       pending.clear();
       try { child.kill('SIGTERM'); } catch {}
-      eventChain
-        .catch(() => {})
-        .finally(() => fn(value));
+      fn(value);
     };
 
     const send = (method, params = {}) => {
@@ -451,12 +447,6 @@ export function streamCodexPrompt({
         const delta = params?.delta;
         if (typeof delta === 'string' && delta && isRootContext(params)) {
           finalText += delta;
-          emit({
-            type: 'message.delta',
-            sessionId: rootThreadId,
-            turnId: rootTurnId,
-            text: delta,
-          });
         } else if (typeof delta === 'string' && delta) {
           logIgnoredChildEvent('codex.non-root-agent-delta', params);
         }

package/src/runtimes/opencode/index.mjs

@@ -25,10 +25,9 @@ import {
   requireOpenCodePath,
 } from './session.mjs';
 import { buildOpenCodeInputFromInbound } from '../../core/media/inbound.mjs';
-import { emitWorkerEvent } from '../../core/events/worker-events.mjs';
+import { emitWorkerEventBestEffort } from '../../core/events/worker-events.mjs';
 import {
   shouldStreamRuntime,
-  createDeltaAggregator,
   reportSubprocessFailure,
   terminalRuntimeFailure,
   updateBindingRuntimeMeta,
@@ -167,25 +166,6 @@ export const openCodeRuntime = {
     const shouldRotate = sessionScope.shouldRotate;
     const targetSessionId = shouldRotate ? null : sessionScope.sessionId;
 
-    const deltaAggregator = createDeltaAggregator({
-      flushDelta: async ({ text, sessionId, cwd }) => {
-        await emitWorkerEvent({
-          adapter,
-          binding,
-          agent: this.name,
-          sessionId: sessionId || targetSessionId || binding.id,
-          cwd: cwd || agentHome,
-          replyToMessageId: inbound.messageId || null,
-          event: {
-            hook_event_name: 'worker.message.delta',
-            worker_event_name: 'worker.message.delta',
-            delta: text,
-          },
-          logger: ctx.logger,
-        });
-      },
-    });
-
     try {
       const opencodePath = requireOpenCodePath(runtimeOpenCodePath);
       const opencodeVersion = getOpenCodeRuntimeHealth(opencodePath).version || meta.opencodeVersion || null;
@@ -210,7 +190,7 @@ export const openCodeRuntime = {
             files,
             onEvent: async (event) => {
               if (event?.type === 'turn.started') {
-                await emitWorkerEvent({
+                emitWorkerEventBestEffort({
                   adapter,
                   binding,
                   agent: this.name,
@@ -223,17 +203,11 @@ export const openCodeRuntime = {
                   },
                   logger: ctx.logger,
                 });
-              } else if (event?.type === 'message.delta' && event.text) {
-                deltaAggregator.push(event.text, {
-                  sessionId: event.sessionId || targetSessionId || binding.id,
-                  cwd: agentHome,
-                });
               }
             },
           })
         : await this.runTurn({ sessionId: targetSessionId, cwd: agentHome, opencodePath, agentEnv }, message, { files, standingPrompt, forceStandingPrompt });
 
-      await deltaAggregator.flush();
       const observedSessionId = result?.sessionId || targetSessionId;
       if (observedSessionId) {
         standingPromptSeen.add(`${binding.id}|${observedSessionId}|${protocolOverlayKey}`);
@@ -248,7 +222,7 @@ export const openCodeRuntime = {
         opencodePath,
         opencodeVersion,
       }, { status: 'connected' });
-      await emitWorkerEvent({
+      emitWorkerEventBestEffort({
         adapter,
         binding: nextBinding,
         agent: this.name,
@@ -263,8 +237,7 @@ export const openCodeRuntime = {
       });
       return true;
     } catch (err) {
-      await deltaAggregator.flush().catch(() => {});
-      await emitWorkerEvent({
+      emitWorkerEventBestEffort({
         adapter,
         binding,
         agent: this.name,
@@ -296,7 +269,7 @@ export const openCodeRuntime = {
 
   async reconcileAfterRestart(binding, ctx) {
     const meta = binding.runtimeMeta || {};
-    await emitWorkerEvent({
+    emitWorkerEventBestEffort({
       adapter: ctx.adapter,
       binding,
       agent: this.name,

package/src/runtimes/opencode/session.mjs

@@ -193,10 +193,9 @@ function buildOpenCodeRunArgs({ sessionId, message, files = [] }) {
 /**
  * Spawn `opencode run` and resolve with the final result.
  *
- * If `onEvent` is provided it is invoked for each parsed event during
- * the turn — `{ type: 'turn.started', sessionId }`,
- * `{ type: 'message.delta', sessionId, text }`, etc. — so callers can
- * forward typing indicators / partial text to the chat client.
+ * If `onEvent` is provided it is invoked for lifecycle events such as
+ * `{ type: 'turn.started', sessionId }`. Token deltas are kept local to
+ * build the final text and are not emitted to the caller.
  *
  * Resolves with `{ sessionId, cwd, text, durationMs }` on success.
  * Rejects with an Error whose `.info` carries `{ ok: false, kind, ... }`
@@ -246,18 +245,19 @@ export function runOpenCodePrompt({
     let lastError = null;
     let settled = false;
     let turnStartedEmitted = false;
-    let eventChain = Promise.resolve();
 
     const emit = (event) => {
       if (typeof onEvent !== 'function') return;
-      eventChain = eventChain.then(() => onEvent(event)).catch(() => {});
+      void Promise.resolve()
+        .then(() => onEvent(event))
+        .catch(() => {});
     };
 
     const settle = (fn, value) => {
       if (settled) return;
       settled = true;
       if (timeout) clearTimeout(timeout);
-      eventChain.catch(() => {}).finally(() => fn(value));
+      fn(value);
     };
 
     const handleEvent = (event) => {
@@ -273,7 +273,6 @@ export function runOpenCodePrompt({
         const delta = extractEventText(event);
         if (delta) {
           finalText += delta;
-          emit({ type: 'message.delta', sessionId: activeSessionId, text: delta });
         }
       }
 

package/src/runtimes/pi/index.mjs

@@ -19,10 +19,9 @@ import {
   requirePiPath,
   runPiPrompt,
 } from './session.mjs';
-import { emitWorkerEvent } from '../../core/events/worker-events.mjs';
+import { emitWorkerEventBestEffort } from '../../core/events/worker-events.mjs';
 import {
   shouldStreamRuntime,
-  createDeltaAggregator,
   reportSubprocessFailure,
   terminalRuntimeFailure,
   updateBindingRuntimeMeta,
@@ -138,24 +137,6 @@ export const piRuntime = {
     const sessionScope = resolveRuntimeSessionScope(meta, inbound);
     const shouldRotate = sessionScope.shouldRotate;
     const targetSessionId = shouldRotate ? null : sessionScope.sessionId;
-    const deltaAggregator = createDeltaAggregator({
-      flushDelta: async ({ text, sessionId, cwd }) => {
-        await emitWorkerEvent({
-          adapter,
-          binding,
-          agent: this.name,
-          sessionId: sessionId || targetSessionId || binding.id,
-          cwd: cwd || agentHome,
-          replyToMessageId: inbound.messageId || null,
-          event: {
-            hook_event_name: 'worker.message.delta',
-            worker_event_name: 'worker.message.delta',
-            delta: text,
-          },
-          logger: ctx.logger,
-        });
-      },
-    });
 
     try {
       const runtimePiPath = requirePiPath(meta.piPath || meta.runtimePath);
@@ -181,7 +162,7 @@ export const piRuntime = {
             images,
             onEvent: async (event) => {
               if (event?.type === 'turn.started') {
-                await emitWorkerEvent({
+                emitWorkerEventBestEffort({
                   adapter,
                   binding,
                   agent: this.name,
@@ -194,17 +175,11 @@ export const piRuntime = {
                   },
                   logger: ctx.logger,
                 });
-              } else if (event?.type === 'message.delta' && event.text) {
-                deltaAggregator.push(event.text, {
-                  sessionId: event.sessionId || targetSessionId || binding.id,
-                  cwd: agentHome,
-                });
               }
             },
           })
         : await this.runTurn({ sessionId: targetSessionId, cwd: agentHome, piPath: runtimePiPath, agentEnv }, message, { images, standingPrompt, forceStandingPrompt });
 
-      await deltaAggregator.flush();
       const observedSessionId = result?.sessionId || targetSessionId;
       if (observedSessionId) {
         standingPromptSeen.add(`${binding.id}|${observedSessionId}|${protocolOverlayKey}`);
@@ -218,7 +193,7 @@ export const piRuntime = {
         piPath: runtimePiPath,
         piVersion: runtimePiVersion,
       }, { status: 'connected' });
-      await emitWorkerEvent({
+      emitWorkerEventBestEffort({
         adapter,
         binding: nextBinding,
         agent: this.name,
@@ -233,8 +208,7 @@ export const piRuntime = {
       });
       return true;
     } catch (err) {
-      await deltaAggregator.flush().catch(() => {});
-      await emitWorkerEvent({
+      emitWorkerEventBestEffort({
         adapter,
         binding,
         agent: this.name,
@@ -266,7 +240,7 @@ export const piRuntime = {
 
   async reconcileAfterRestart(binding, ctx) {
     const meta = binding.runtimeMeta || {};
-    await emitWorkerEvent({
+    emitWorkerEventBestEffort({
       adapter: ctx.adapter,
       binding,
       agent: this.name,

package/src/runtimes/pi/session.mjs

@@ -223,12 +223,13 @@ export function runPiPrompt({
     let activeSessionFile = null;
     let finalText = '';
     let settled = false;
-    let eventChain = Promise.resolve();
     const pending = new Map();
 
     const emit = (event) => {
       if (typeof onEvent !== 'function') return;
-      eventChain = eventChain.then(() => onEvent(event)).catch(() => {});
+      void Promise.resolve()
+        .then(() => onEvent(event))
+        .catch(() => {});
     };
 
     const settle = (fn, value) => {
@@ -240,7 +241,7 @@ export function runPiPrompt({
       }
       pending.clear();
       try { child.kill('SIGTERM'); } catch {}
-      eventChain.catch(() => {}).finally(() => fn(value));
+      fn(value);
     };
 
     const sendRaw = (payload) => {
@@ -308,7 +309,6 @@ export function runPiPrompt({
           const delta = extractDeltaFromEvent(event);
           if (delta) {
             finalText += delta;
-            emit({ type: 'message.delta', sessionId: activeSessionId, text: delta });
           }
           return;
         }