@llblab/pi-kit 0.5.0 → 0.5.2

package/node_modules/@llblab/pi-telegram/lib/status.ts

@@ -291,6 +291,7 @@ export interface TelegramStatusBarTheme {
 export interface TelegramStatusBarState {
   hasBotToken: boolean;
   pollingActive: boolean;
+  pollingStopReason?: string;
   paired: boolean;
   busRole?: TelegramBridgeBusRole;
   busLifecyclePhase?: TelegramBridgeBusLifecyclePhase;
@@ -699,6 +700,7 @@ export function createTelegramBridgeStatusRuntime<
           queuedItems: queuedItemCount,
         }),
         queuedStatus: deps.formatQueuedStatus(queuedItems),
+        pollingStopReason: deps.getPollingState?.().stopReason,
         error,
       };
     },
@@ -889,6 +891,8 @@ export function buildTelegramStatusBarText(
     : "";
   if (!state.hasBotToken)
     return `${label} ${theme.fg("muted", "not configured")}${queued}`;
+  if (state.pollingStopReason === "persistent-conflict" && state.busRole !== "follower")
+    return `${label} ${theme.fg("error", "error")}`;
   if (!state.paired)
     return `${label} ${theme.fg("warning", "awaiting pairing")}${queued}`;
   if (state.busLifecyclePhase === "electing")

package/node_modules/@llblab/pi-telegram/lib/updates.ts

@@ -481,12 +481,7 @@ const TELEGRAM_UPDATE_ADMISSION_BINDING = Symbol(
 
 interface TelegramUpdateAdmissionBinding {
   sourceUpdateId: number;
-  report: (
-    outcome: Extract<
-      TelegramUpdateAdmissionOutcome,
-      { kind: "deferred" | "queued" }
-    >,
-  ) => void;
+  report: (outcome: TelegramUpdateAdmissionOutcome) => void;
 }
 
 export type TelegramQueueAdmissionReceiptLike = TelegramQueueAdmissionReceipt;
@@ -589,6 +584,16 @@ export function collectTelegramAdmissionSourceUpdateIds(
   return [...sourceUpdateIds].sort((left, right) => left - right);
 }
 
+/** Report source completion; true means reported, not a durable settlement acknowledgement. */
+export function reportTelegramUpdateCompleted(value: unknown): boolean {
+  const binding = getTelegramUpdateAdmissionBinding(value);
+  if (!binding) return false;
+  const execution = getTelegramUpdateExecutionFence(value);
+  if (execution && !execution.isCurrent()) return false;
+  binding.report({ kind: "complete" });
+  return true;
+}
+
 export function reportTelegramUpdateDeferred(value: unknown): boolean {
   const binding = getTelegramUpdateAdmissionBinding(value);
   if (!binding) return false;
@@ -1810,10 +1815,7 @@ export interface TelegramUpdateWorkerRuntime<TContext> {
   signal: () => void;
   settleDeferred: (input: {
     updateId: number;
-    outcome: Extract<
-      TelegramUpdateAdmissionOutcome,
-      { kind: "deferred" | "queued" }
-    >;
+    outcome: TelegramUpdateAdmissionOutcome;
     signal: AbortSignal;
   }) => void;
   isQueueReceiptCommitted: (
@@ -2160,6 +2162,7 @@ export function createTelegramUpdateWorkerRuntime<TContext>(
     failurePhase: string,
     error: unknown,
     currentUpdateId?: number,
+    extraDetails?: Record<string, unknown>,
   ): "blocked" => {
     blocked = true;
     state.lastFailureAtMs = getNowMs();
@@ -2168,6 +2171,7 @@ export function createTelegramUpdateWorkerRuntime<TContext>(
       phase: failurePhase,
       generation: owner?.generation,
       ...(currentUpdateId !== undefined ? { updateId: currentUpdateId } : {}),
+      ...extraDetails,
     });
     transition("blocked", currentUpdateId, blockedReason);
     return "blocked";
@@ -2553,6 +2557,10 @@ export function createTelegramUpdateWorkerRuntime<TContext>(
             `Telegram queue receipt ${normalized.receiptId} conflicts with committed authority.`,
           ),
           currentUpdateId,
+          {
+            receiptId: normalized.receiptId,
+            sourceUpdateIds: normalized.sourceUpdateIds,
+          },
         );
       }
       return "duplicate";
@@ -3012,6 +3020,13 @@ export function createTelegramUpdateWorkerRuntime<TContext>(
         return;
       }
       const claim = claims.get(input.updateId);
+      if (input.outcome.kind === "complete") {
+        // Expiry may retire only a still-deferred source, never accepted queue work.
+        if (claim !== "deferred") return;
+        const result = commitCompletedBatch(expectedOwner, [input.updateId]);
+        if (!result) transition("idle", input.updateId);
+        return;
+      }
       if (input.outcome.kind === "deferred") {
         if (claim === "queued") return;
         if (claim !== "deferred") {
@@ -3447,10 +3462,7 @@ export interface TelegramUpdateAdmissionHandleDeps<
   ) => Promise<void>;
   registry?: TelegramUpdateHandlerRegistry;
   onLateOutcome?: (
-    outcome: Extract<
-      TelegramUpdateAdmissionOutcome,
-      { kind: "deferred" | "queued" }
-    >,
+    outcome: TelegramUpdateAdmissionOutcome,
     details: {
       updateId: number;
       ctx: TContext;
@@ -3461,24 +3473,15 @@ export interface TelegramUpdateAdmissionHandleDeps<
 }
 
 function mergeTelegramReportedAdmissionOutcome(
-  current:
-    | Extract<
-        TelegramUpdateAdmissionOutcome,
-        { kind: "deferred" | "queued" }
-      >
-    | undefined,
-  next: Extract<
-    TelegramUpdateAdmissionOutcome,
-    { kind: "deferred" | "queued" }
-  >,
+  current: TelegramUpdateAdmissionOutcome | undefined,
+  next: TelegramUpdateAdmissionOutcome,
   updateId: number,
-): Extract<
-  TelegramUpdateAdmissionOutcome,
-  { kind: "deferred" | "queued" }
-> {
+): TelegramUpdateAdmissionOutcome {
   if (!current || current.kind === "deferred") return next;
   if (next.kind === "deferred") return current;
-  if (areTelegramQueueAdmissionReceiptsEqual(current, next)) return current;
+  if (current.kind === "complete" && next.kind === "complete") return current;
+  if (current.kind === "queued" && next.kind === "queued" &&
+      areTelegramQueueAdmissionReceiptsEqual(current, next)) return current;
   throw new TelegramUpdateAdmissionOutcomeError(
     `Telegram update ${updateId} reported conflicting queue outcomes.`,
   );
@@ -3523,12 +3526,7 @@ export function createTelegramUpdateAdmissionHandle<
     execution.assertCurrent();
     if (verdict === "consume") return { kind: "complete" };
     let immediate = true;
-    let outcome:
-      | Extract<
-          TelegramUpdateAdmissionOutcome,
-          { kind: "deferred" | "queued" }
-        >
-      | undefined;
+    let outcome: TelegramUpdateAdmissionOutcome | undefined;
     const boundUpdate = bindTelegramUpdateExecutionFence(
       bindTelegramUpdateAdmissionSource(update, (next) => {
         if (immediate) {

package/node_modules/@llblab/pi-telegram/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llblab/pi-telegram",
-  "version": "0.43.0",
+  "version": "0.43.2",
   "private": false,
   "publishConfig": {
     "access": "public"

package/node_modules/@llblab/pi-telegram/skills/telegram-bridge/references/diagnosis.md

@@ -13,4 +13,6 @@ These slash commands are registered Pi commands, not shell executables or agent
 
 When `PI_CODING_AGENT_DIR` selects another compatible runtime, resolve its equivalent `tmp/telegram` directory.
 
+A `persistent-conflict` polling stop means the bounded competing-`getUpdates` threshold triggered full transport stand-down, not cancellation of accepted local Pi work. The terminal diagnostic distinguishes lost local ownership from a competing client despite an apparently owned lock. Check other profiles, agent directories, installations, or non-Pi clients sharing the bot; after removing the competition, reconnect through the supported Pi command. Do not restart repeatedly or alter lock files to compete for the stream.
+
 Do not mutate ownership files, bridge state, journals, bindings, or locks to force recovery. Use supported commands and preserve exact profile, target, transport, and session authority. Never claim successful delivery without transport evidence.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llblab/pi-kit",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -45,7 +45,7 @@
     "@llblab/pi-codex-usage": "0.9.4",
     "@llblab/pi-grow-loop": "0.7.4",
     "@llblab/pi-state-flow": "0.3.0",
-    "@llblab/pi-telegram": "0.43.0",
+    "@llblab/pi-telegram": "0.43.2",
     "@llblab/skills": "1.14.0"
   },
   "bundledDependencies": [