@llblab/pi-telegram 0.5.0 → 0.5.1

package/README.md

@@ -82,7 +82,7 @@ Use these inside the Telegram DM with your bot:
 - **`/status`**: View session stats, cost, and use inline buttons to change models.
 - **`/model`**: Open the interactive model selector.
 - **`/compact`**: Start session compaction (only works when the session is idle).
-- **`/stop`**: Abort the active run.
+- **`/stop`**: Abort the active run and clear all waiting Telegram queue items.
 
 Telegram command admission is explicit: `/compact`, `/stop`, `/help`, `/start`, `/status`, and `/model` execute immediately. Synthetic model-switch continuation turns still enter the high-priority control lane so they can resume before normal queued prompts when pi becomes safe to dispatch.
 

package/docs/architecture.md

@@ -92,7 +92,7 @@ Admission contract:
 
 | Admission             | Examples                                             | Queue shape                                                          | Dispatch rank |
 | --------------------- | ---------------------------------------------------- | -------------------------------------------------------------------- | ------------- |
-| Immediate execution   | `/compact`, `/stop`, `/help`, `/start`               | Does not enter the Telegram queue                                    | N/A           |
+| Immediate execution   | `/compact`, `/stop`, `/help`, `/start`               | Does not enter the Telegram queue; `/stop` also clears queued items  | N/A           |
 | Control queue         | Model-switch continuation turns and future deferred controls | `queueLane: control`; accepts control items and continuation prompts | 0             |
 | Priority prompt queue | A waiting prompt promoted by `👍`                    | `kind: prompt`, `queueLane: priority`                                | 1             |
 | Default prompt queue  | Normal Telegram text/media turns                     | `kind: prompt`, `queueLane: default`                                 | 2             |
@@ -113,7 +113,7 @@ This prevents queue races around rapid follow-ups, `/compact`, and mixed local p
 
 ### Abort Behavior
 
-When `/stop` aborts an active Telegram turn, queued follow-up Telegram messages can be preserved as prior-user history for the next turn. This keeps later Telegram input from being silently dropped after an interrupted run.
+When `/stop` runs from Telegram, it clears pending model-switch state, clears every waiting Telegram queue item, resets aborted-turn history preservation, and then aborts the active Telegram turn when an abort handler exists. This intentionally favors recovery over preservation: priority/default/control queue items are dropped so the next Telegram message can enter a clean queue and dispatch like a fresh TUI prompt after an interrupted run.
 
 ## Rendering Model
 
@@ -162,7 +162,7 @@ Current operator controls include:
 - Inline status buttons for model and thinking adjustments, applying idle selections immediately while still respecting busy-run restart rules; model-menu inputs are cached briefly and stored inline-menu states are pruned by TTL/LRU so old keyboards expire predictably
 - `/model` for interactive model selection, executed immediately from Telegram and supporting in-flight restart of the active Telegram-owned run on a newly selected model
 - `/compact` for Telegram-triggered pi session compaction when the bridge is idle
-- `/stop` for aborting the active Telegram-owned run
+- `/stop` for aborting the active Telegram-owned run and clearing waiting Telegram queue items
 - `/telegram-status` for pi-side diagnostics as grouped line-by-line sections separated by blank lines: connection, polling, execution, queue, and the recent redacted runtime/API event ring. These sections include polling state, last update id, active turn source ids, pending dispatch, compaction state, active tool count, pending model-switch state, total queue depth, and queue-lane counts. The event ring records transport/API, polling/update, prompt-dispatch, control-action, typing, compaction, setup, session-lifecycle, and attachment queue/delivery failures; benign unchanged edit responses and unsupported empty draft-clear attempts are filtered out so expected preview transport noise does not obscure real failures
 - Queue reactions using `👍` and `👎` apply to waiting text, voice, file, image, and media-group turns by matching the turn's source Telegram message ids; `👎` acts as the canonical queue-removal path because ordinary Telegram DM message deletions are not exposed through the Bot API polling path this bridge uses
 

package/lib/commands.ts

@@ -32,7 +32,10 @@ export const TELEGRAM_BOT_COMMANDS: readonly TelegramBotCommandDefinition[] = [
   },
   { command: "model", description: "Open the interactive model selector" },
   { command: "compact", description: "Compact the current pi session" },
-  { command: "stop", description: "Abort the current pi task" },
+  {
+    command: "stop",
+    description: "Abort the current pi task and clear queued turns",
+  },
 ];
 
 export interface TelegramBotCommandRegistrationDeps {
@@ -178,7 +181,7 @@ export interface TelegramCommandActionDeps<TMessage, TContext> {
 export interface TelegramStopCommandDeps {
   hasAbortHandler: () => boolean;
   clearPendingModelSwitch: () => void;
-  hasQueuedTelegramItems: () => boolean;
+  clearQueuedTelegramItems: () => number;
   setPreserveQueuedTurnsAsHistory: (preserve: boolean) => void;
   abortCurrentTurn: () => void;
   updateStatus: () => void;
@@ -408,6 +411,7 @@ export interface TelegramCommandRuntimeDeps<
   hasAbortHandler: () => boolean;
   clearPendingModelSwitch: () => void;
   hasQueuedTelegramItems: () => boolean;
+  clearQueuedTelegramItems: (ctx: TContext) => number;
   setPreserveQueuedTurnsAsHistory: (preserve: boolean) => void;
   abortCurrentTurn: () => void;
   isIdle: (ctx: TContext) => boolean;
@@ -439,7 +443,7 @@ export interface TelegramCommandRuntimeDeps<
 }
 
 export const TELEGRAM_HELP_TEXT =
-  "Send me a message and I will forward it to pi. Commands: /status, /model, /compact, /stop.";
+  "Send me a message and I will forward it to pi. Commands: /status, /model, /compact, /stop. /stop aborts the current run and clears queued Telegram turns.";
 
 function getTelegramCommandErrorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
@@ -482,20 +486,32 @@ export function getTelegramCommandExecutionMode(
   return action.executionMode;
 }
 
+function formatTelegramQueuedTurnCount(count: number): string {
+  return count === 1 ? "1 queued turn" : `${count} queued turns`;
+}
+
 export async function handleTelegramStopCommand(
   deps: TelegramStopCommandDeps,
 ): Promise<void> {
+  deps.clearPendingModelSwitch();
+  const clearedCount = deps.clearQueuedTelegramItems();
+  deps.setPreserveQueuedTurnsAsHistory(false);
   if (!deps.hasAbortHandler()) {
-    await deps.sendTextReply("No active turn.");
+    const clearedSuffix =
+      clearedCount > 0
+        ? ` Cleared ${formatTelegramQueuedTurnCount(clearedCount)}.`
+        : "";
+    if (clearedCount > 0) deps.updateStatus();
+    await deps.sendTextReply(`No active turn.${clearedSuffix}`);
     return;
   }
-  deps.clearPendingModelSwitch();
-  if (deps.hasQueuedTelegramItems()) {
-    deps.setPreserveQueuedTurnsAsHistory(true);
-  }
   deps.abortCurrentTurn();
   deps.updateStatus();
-  await deps.sendTextReply("Aborted current turn.");
+  const clearedSuffix =
+    clearedCount > 0
+      ? ` Cleared ${formatTelegramQueuedTurnCount(clearedCount)}.`
+      : "";
+  await deps.sendTextReply(`Aborted current turn.${clearedSuffix}`);
 }
 
 export async function handleTelegramCompactCommand(
@@ -656,6 +672,7 @@ export function createTelegramCommandHandlerTargetRuntime<
     hasAbortHandler: deps.hasAbortHandler,
     clearPendingModelSwitch: deps.clearPendingModelSwitch,
     hasQueuedTelegramItems: deps.hasQueuedTelegramItems,
+    clearQueuedTelegramItems: deps.clearQueuedTelegramItems,
     setPreserveQueuedTurnsAsHistory: deps.setPreserveQueuedTurnsAsHistory,
     abortCurrentTurn: deps.abortCurrentTurn,
     isIdle: deps.isIdle,
@@ -736,7 +753,8 @@ async function handleTelegramCommandRuntime<
         await handleTelegramStopCommand({
           hasAbortHandler: deps.hasAbortHandler,
           clearPendingModelSwitch: deps.clearPendingModelSwitch,
-          hasQueuedTelegramItems: deps.hasQueuedTelegramItems,
+          clearQueuedTelegramItems: () =>
+            deps.clearQueuedTelegramItems(commandCtx),
           setPreserveQueuedTurnsAsHistory: deps.setPreserveQueuedTurnsAsHistory,
           abortCurrentTurn: deps.abortCurrentTurn,
           updateStatus: updateStatusFor(commandCtx),

package/lib/queue.ts

@@ -1061,6 +1061,7 @@ export interface TelegramQueueMutationControllerDeps<
 export interface TelegramQueueMutationController<TContext> {
   append: (item: TelegramQueueItem<TContext>, ctx: TContext) => void;
   reorder: (ctx: TContext) => void;
+  clear: (ctx: TContext) => number;
   removeByMessageIds: (messageIds: number[], ctx: TContext) => number;
   clearPriorityByMessageId: (messageId: number, ctx: TContext) => boolean;
   prioritizeByMessageId: (messageId: number, ctx: TContext) => boolean;
@@ -1262,6 +1263,7 @@ export function createTelegramQueueMutationController<TContext>(
     append: (item, ctx) =>
       appendTelegramQueueItemRuntime(item, buildRuntimeDeps(ctx)),
     reorder: (ctx) => reorderTelegramQueueItemsRuntime(buildRuntimeDeps(ctx)),
+    clear: (ctx) => clearTelegramQueueItemsRuntime(buildRuntimeDeps(ctx)),
     removeByMessageIds: (messageIds, ctx) =>
       removeTelegramQueueItemsByMessageIdsRuntime(
         messageIds,
@@ -1291,6 +1293,16 @@ export function reorderTelegramQueueItemsRuntime<TContext>(
   deps.updateStatus(deps.ctx);
 }
 
+export function clearTelegramQueueItemsRuntime<TContext>(
+  deps: TelegramQueueMutationRuntimeDeps<TContext>,
+): number {
+  const removedCount = deps.getQueuedItems().length;
+  if (removedCount === 0) return 0;
+  deps.setQueuedItems([]);
+  deps.updateStatus(deps.ctx);
+  return removedCount;
+}
+
 export function removeTelegramQueueItemsByMessageIdsRuntime<TContext>(
   messageIds: number[],
   deps: TelegramQueueMutationRuntimeDeps<TContext>,

package/lib/routing.ts

@@ -131,6 +131,7 @@ export function createTelegramInboundRouteRuntime<
     hasAbortHandler: deps.bridgeRuntime.abort.hasHandler,
     clearPendingModelSwitch: deps.modelSwitchController.clearPendingSwitch,
     hasQueuedTelegramItems: deps.telegramQueueStore.hasQueuedItems,
+    clearQueuedTelegramItems: deps.queueMutationRuntime.clear,
     setPreserveQueuedTurnsAsHistory:
       deps.bridgeRuntime.lifecycle.setPreserveQueuedTurnsAsHistory,
     abortCurrentTurn: deps.bridgeRuntime.abort.abortTurn,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llblab/pi-telegram",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "private": false,
   "description": "Better Telegram DM bridge extension for pi",
   "type": "module",