@llblab/pi-telegram 0.50.1 → 0.51.1

package/lib/bindings.ts

@@ -52,6 +52,7 @@ export interface TelegramQueueBindingRuntime<TContext> {
   mutation: Queue.TelegramQueueMutationController<TContext>;
   dispatchNext: (ctx: TContext) => void;
   requestNextDispatchAnnouncement: () => void;
+  cancelNextDispatchAnnouncement: () => void;
   watchdog: Queue.TelegramQueueDispatchWatchdogRuntime<TContext>;
 }
 
@@ -69,12 +70,12 @@ export function createTelegramQueueBindingRuntime<TContext>(deps: {
           onItemsDiscarded: (
             items: readonly Queue.TelegramQueueItem<TContext>[],
             ctx: TContext,
-          ) => void;
+          ) => boolean;
           isItemReady: (item: Queue.TelegramQueueItem<TContext>) => boolean;
           onPromptHandedOff?: (
             item: Queue.PendingTelegramTurn,
             ctx: TContext,
-          ) => void;
+          ) => boolean;
           onControlSettled: (
             item: Queue.PendingTelegramControlItem<TContext>,
             ctx: TContext,
@@ -96,6 +97,9 @@ export function createTelegramQueueBindingRuntime<TContext>(deps: {
   updateStatus: (ctx: TContext, error?: string) => void;
   sendTextReply: Queue.TelegramQueueDispatchRuntimeDeps<TContext>["sendTextReply"];
   sendUserMessage: Queue.TelegramQueueDispatchRuntimeDeps<TContext>["sendUserMessage"];
+  reconcileNextDispatchAnnouncementReplyOwnership?: (
+    item: Queue.PendingTelegramTurn,
+  ) => void;
   recordRuntimeEvent?: TelegramRuntimeEventRecorder;
 }): TelegramQueueBindingRuntime<TContext> {
   const settleDiscardedItems = (
@@ -108,8 +112,7 @@ export function createTelegramQueueBindingRuntime<TContext>(deps: {
     if (durableItems.length === 0) return true;
     const settlement = deps.admission.getSettlement();
     if (!settlement) return false;
-    settlement.onItemsDiscarded(durableItems, ctx);
-    return durableItems.every((item) => !settlement.isItemReady(item));
+    return settlement.onItemsDiscarded(durableItems, ctx) === true;
   };
   const mutation = Queue.createTelegramQueueMutationController({
     ...deps.store,
@@ -150,8 +153,7 @@ export function createTelegramQueueBindingRuntime<TContext>(deps: {
       if ((item.admissionReceipts?.length ?? 0) === 0) return true;
       const settlement = deps.admission.getSettlement();
       if (!settlement?.onPromptHandedOff) return false;
-      settlement.onPromptHandedOff(item, ctx);
-      return !settlement.isItemReady(item);
+      return settlement.onPromptHandedOff(item, ctx) === true;
     },
     onControlSettled(item, ctx) {
       deps.admission.getSettlement()?.onControlSettled(item, ctx);
@@ -161,6 +163,8 @@ export function createTelegramQueueBindingRuntime<TContext>(deps: {
     },
     updateStatus: deps.updateStatus,
     sendTextReply: deps.sendTextReply,
+    reconcileNextDispatchAnnouncementReplyOwnership:
+      deps.reconcileNextDispatchAnnouncementReplyOwnership,
     recordRuntimeEvent: deps.recordRuntimeEvent,
     ...deps.promptDispatch,
     sendUserMessage: deps.sendUserMessage,
@@ -169,6 +173,7 @@ export function createTelegramQueueBindingRuntime<TContext>(deps: {
     mutation,
     dispatchNext: dispatch.dispatchNext,
     requestNextDispatchAnnouncement: dispatch.requestNextDispatchAnnouncement,
+    cancelNextDispatchAnnouncement: dispatch.cancelNextDispatchAnnouncement,
     watchdog: Queue.createTelegramQueueDispatchWatchdogRuntime({
       hasQueuedItems: deps.store.hasQueuedItems,
       dispatchNextQueuedTelegramTurn: dispatch.dispatchNext,
@@ -1143,7 +1148,7 @@ export function registerTelegramLifecycleRuntimeHooks({
     getActiveTurn: activeTurnRuntime.get,
     loadConfig: configStore.load,
     extractAssistant: Replies.extractRunAssistantMessage,
-    isRecoveredAssistantAlreadyPublished: (assistant) =>
+    isAssistantAlreadyPublished: (assistant) =>
       !!assistant.text && assistantOutputRuntime.hasAdmittedTelegramIntermediate(assistant.text),
     getFoldQueuedPromptsIntoHistory:
       lifecycle.shouldFoldQueuedPromptsIntoHistory,

package/lib/bus-follower.ts

@@ -11,7 +11,11 @@ import { basename } from "node:path";
 import * as Sync from "./sync.ts";
 import * as Threads from "./threads.ts";
 import { parseTelegramUpdateJournalQueueOwner, type TelegramUpdateJournalStoreOptions } from "./journal.ts";
-import type { TelegramLockEntry, TelegramLockState } from "./locks.ts";
+import {
+  TELEGRAM_BUS_LEADER_STALE_HEARTBEAT_MS,
+  type TelegramLockEntry,
+  type TelegramLockState,
+} from "./locks.ts";
 import type {
   TelegramQueueHandoffPayload,
   TelegramQueueHandoffStageResult,
@@ -60,6 +64,8 @@ export const TELEGRAM_BUS_FOLLOWER_PROMOTION_GRACE_MS = 2_500;
 export const TELEGRAM_FOLLOWER_SESSION_HANDOFF_TTL_MS = 30_000;
 export const TELEGRAM_BUS_FOLLOWER_CLIENT_TIMEOUT_MS = 30_000;
 export const TELEGRAM_BUS_FOLLOWER_REGISTRATION_WAIT_MS = 30_000;
+export const TELEGRAM_BUS_FOLLOWER_HEARTBEAT_TIMEOUT_MS =
+  TELEGRAM_BUS_LEADER_STALE_HEARTBEAT_MS;
 export const TELEGRAM_BUS_FOLLOWER_REGISTRATION_RETRY_ATTEMPTS =
   TELEGRAM_BUS_REGISTRATION_RETRY.attempts;
 export const TELEGRAM_BUS_FOLLOWER_REGISTRATION_RETRY_DELAY_MS =
@@ -126,7 +132,7 @@ export interface TelegramBusFollowerRegistrationRuntime<TContext> {
       restoreWorkspace?: boolean;
     },
   ) => Promise<boolean>;
-  setContext: (ctx: TContext) => void;
+  setContext: (ctx: TContext) => void | Promise<void>;
   disconnectFromLeader?: () => Promise<boolean>;
   renameThread?: (
     target: TelegramTarget & { threadId: number },
@@ -301,6 +307,7 @@ export interface TelegramBusFollowerRegistrationRuntimeDeps<
   registrationRetryAttempts?: number;
   registrationRetryDelayMs?: number;
   heartbeatMs?: number;
+  heartbeatTimeoutMs?: number;
   recordRuntimeEvent?: (
     category: string,
     error: unknown,
@@ -623,6 +630,22 @@ export function createTelegramBusFollowerRuntimeAssembly<
 >(
   ports: TelegramBusFollowerRuntimeAssemblyPorts<TContext>,
 ): TelegramBusFollowerRuntimeAssembly<TContext> {
+  // Binding startup needs registration identity before it can grant inbound authority.
+  let readyContext: { generation: string; ctx: TContext; sessionGeneration: number | undefined } | undefined;
+  const isReadyContext = (ctx?: TContext): boolean => Boolean(readyContext &&
+    (ctx === undefined || readyContext.ctx === ctx) &&
+    ports.registrationState.getGeneration() === readyContext.generation &&
+    ports.registration.getSessionGeneration?.() === readyContext.sessionGeneration &&
+    ports.registration.isContextActive?.(readyContext.ctx) !== false);
+  const prepareContext = async (ctx: TContext): Promise<void> => {
+    const generation = ports.registrationState.getGeneration();
+    const sessionGeneration = ports.registration.getSessionGeneration?.();
+    readyContext = undefined;
+    await ports.registration.onRegistered?.(ctx);
+    if (generation && ports.registrationState.getGeneration() === generation &&
+        ports.registration.getSessionGeneration?.() === sessionGeneration &&
+        ports.registration.isContextActive?.(ctx) !== false) readyContext = { generation, ctx, sessionGeneration };
+  };
   const sharedRuntimeDeps = {
     instanceId: ports.instanceId,
     registrationState: ports.registrationState,
@@ -632,7 +655,9 @@ export function createTelegramBusFollowerRuntimeAssembly<
     ...ports.receiver,
     instanceId: ports.instanceId,
     recordRuntimeEvent: ports.recordRuntimeEvent,
-    getRegistrationGeneration: ports.registrationState.getGeneration,
+    getRegistrationGeneration() {
+      return isReadyContext() ? readyContext?.generation : undefined;
+    },
     handleReplaceTarget: createTelegramBusFollowerTargetReplacementHandler({
       ...ports.targetReplacement,
       ...sharedRuntimeDeps,
@@ -650,8 +675,21 @@ export function createTelegramBusFollowerRuntimeAssembly<
     ...sharedRuntimeDeps,
     startReceiving: receiver.start,
     stopReceiving: receiver.stop,
+    onRegistered: prepareContext,
     onHeartbeatFailure: recovery,
   });
+  const baseRegistration = registration;
+  registration = {
+    ...baseRegistration,
+    async setContext(ctx) {
+      const sessionGeneration = ports.registration.getSessionGeneration?.();
+      if (ports.registration.isContextActive?.(ctx) === false) return;
+      await baseRegistration.setContext(ctx);
+      if (ports.registration.getSessionGeneration?.() !== sessionGeneration ||
+          ports.registration.isContextActive?.(ctx) === false) return;
+      if (!isReadyContext(ctx)) await prepareContext(ctx);
+    },
+  };
   return { receiver, registration };
 }
 
@@ -1194,7 +1232,13 @@ export function createTelegramBusFollowerSessionRefreshHook<TContext>(
     }
     if (!deps.registrationState.isRegistered()) return;
     if (deps.isSessionActive && !deps.isSessionActive(ctx)) return;
-    deps.registrationRuntime.setContext(ctx);
+    try {
+      await deps.registrationRuntime.setContext(ctx);
+    } catch (error) {
+      deps.recordRuntimeEvent("bus", error, { phase: "follower-session-refresh" });
+      return;
+    }
+    if (deps.isSessionActive && !deps.isSessionActive(ctx)) return;
     deps.updateStatus(ctx);
     deps.recordRuntimeEvent(
       "bus",
@@ -1582,6 +1626,10 @@ export function createTelegramBusFollowerRegistrationRuntime<
   const getNowMs = deps.getNowMs ?? Date.now;
   const getPid = deps.getPid ?? (() => process.pid);
   const heartbeatMs = deps.heartbeatMs ?? 1000;
+  const heartbeatTimeoutMs =
+    deps.heartbeatTimeoutMs ??
+    deps.timeoutMs ??
+    TELEGRAM_BUS_FOLLOWER_HEARTBEAT_TIMEOUT_MS;
   const registrationTimeoutMs =
     deps.registrationTimeoutMs ?? deps.timeoutMs ?? 30000;
   const registrationRetryAttempts =
@@ -1596,6 +1644,7 @@ export function createTelegramBusFollowerRegistrationRuntime<
   let activeLeaderSocketPath: string | undefined;
   let activeAuthSecret: string | undefined;
   let activeRegistrationGeneration: string | undefined;
+  let registrationAttempt: { ctx: TContext; sessionGeneration: number | undefined } | undefined;
   let activeContext: TContext | undefined;
   let lastKnownTarget: TelegramTarget | undefined;
   let lastKnownSlot: string | undefined;
@@ -1606,6 +1655,7 @@ export function createTelegramBusFollowerRegistrationRuntime<
     heartbeatInterval = undefined;
   };
   const stop = () => {
+    registrationAttempt = undefined;
     stopHeartbeat();
     activeAuthSecret = undefined;
     activeRegistrationGeneration = undefined;
@@ -1640,7 +1690,7 @@ export function createTelegramBusFollowerRegistrationRuntime<
     try {
       const response = await sendTelegramBusLocalEnvelope({
         socketPath: leaderSocketPath,
-        timeoutMs: deps.timeoutMs,
+        timeoutMs: heartbeatTimeoutMs,
         retry: getTelegramBusTransportRetryPolicy({
           endpoint: leaderSocketPath,
           operation: "operation",
@@ -1729,6 +1779,24 @@ export function createTelegramBusFollowerRegistrationRuntime<
   };
   return {
     registerWithLeader: async (ctx, leader, options) => {
+      if (deps.isContextActive?.(ctx) === false) return false;
+      const sessionGeneration = deps.getSessionGeneration?.();
+      const attempt = { ctx, sessionGeneration };
+      registrationAttempt = attempt;
+      const isCurrentRequest = () => registrationAttempt === attempt &&
+        deps.getSessionGeneration?.() === sessionGeneration && deps.isContextActive?.(ctx) !== false;
+      const abandonOwnedRequest = async (): Promise<void> => {
+        if (registrationAttempt !== attempt) return;
+        registrationAttempt = undefined;
+        stopHeartbeat();
+        activeLeaderSocketPath = undefined;
+        activeAuthSecret = undefined;
+        activeRegistrationGeneration = undefined;
+        activeContext = undefined;
+        deps.registrationState?.setRegistered(false);
+        deps.setActiveAuthSecret?.(undefined);
+        await deps.stopReceiving?.();
+      };
       const pendingHandoff = options
         ? undefined
         : getTelegramFollowerSessionHandoff();
@@ -1750,6 +1818,7 @@ export function createTelegramBusFollowerRegistrationRuntime<
         deps.getLeaderSocketPath?.() ??
         getTelegramBusSocketPath();
       await deps.startReceiving?.();
+      if (!isCurrentRequest()) { await abandonOwnedRequest(); return false; }
       activeAuthSecret = deps.getLeaderAuthSecret
         ? deps.getLeaderAuthSecret(leader)
         : leader?.busSecret;
@@ -1781,7 +1850,7 @@ export function createTelegramBusFollowerRegistrationRuntime<
           sessionId: deps.getSessionId?.(ctx),
           pid: getPid(),
           processBirthId: deps.getProcessBirthId?.(),
-          sessionGeneration: deps.getSessionGeneration?.(),
+          sessionGeneration,
           target:
             registrationOptions?.target ??
             deps.registrationState?.getTarget() ??
@@ -1815,6 +1884,7 @@ export function createTelegramBusFollowerRegistrationRuntime<
           },
         });
       } catch (error) {
+        if (!isCurrentRequest()) { await abandonOwnedRequest(); return false; }
         stopHeartbeat();
         activeLeaderSocketPath = undefined;
         activeAuthSecret = undefined;
@@ -1823,14 +1893,7 @@ export function createTelegramBusFollowerRegistrationRuntime<
         await deps.stopReceiving?.();
         throw error;
       }
-      if (deps.isContextActive && !deps.isContextActive(ctx)) {
-        stopHeartbeat();
-        activeLeaderSocketPath = undefined;
-        activeAuthSecret = undefined;
-        deps.setActiveAuthSecret?.(undefined);
-        await deps.stopReceiving?.();
-        return false;
-      }
+      if (!isCurrentRequest()) { await abandonOwnedRequest(); return false; }
       const compatibility = getTelegramBusProtocolCompatibility({
         local: deps.protocolIdentity,
         remote: response?.kind === "bus.ack" ? response.protocol : undefined,
@@ -1880,6 +1943,7 @@ export function createTelegramBusFollowerRegistrationRuntime<
         try {
           await deps.onRegistered?.(ctx);
         } catch (error) {
+          if (!isCurrentRequest()) { await abandonOwnedRequest(); return false; }
           stopHeartbeat();
           activeLeaderSocketPath = undefined;
           activeAuthSecret = undefined;
@@ -1889,7 +1953,9 @@ export function createTelegramBusFollowerRegistrationRuntime<
           await deps.stopReceiving?.();
           throw error;
         }
+        if (!isCurrentRequest()) { await abandonOwnedRequest(); return false; }
         await requestHeartbeat();
+        if (!isCurrentRequest()) { await abandonOwnedRequest(); return false; }
         startHeartbeat(leaderSocketPath);
         if (
           pendingHandoffOptions &&
@@ -1909,6 +1975,8 @@ export function createTelegramBusFollowerRegistrationRuntime<
       return false;
     },
     setContext(ctx) {
+      if (registrationAttempt && (registrationAttempt.ctx !== ctx ||
+          registrationAttempt.sessionGeneration !== deps.getSessionGeneration?.())) registrationAttempt = undefined;
       activeContext = ctx;
     },
     async setThreadDisplayMode(mode) {