@llblab/pi-telegram 0.51.5 → 0.51.6

package/BACKLOG.md

@@ -2,6 +2,7 @@
 
 _This file owns unresolved project work only. Completed behavior belongs in `CHANGELOG.md`; durable contracts belong in `AGENTS.md` and `/docs`._
 
+- [ ] `Connect intent across resume` (`post-release acceptance`): The operator approved 0.51.6 release on the successful smoke and green Linux/macOS/Windows CI; this expanded live matrix is not a release blocker. Run live acceptance after rebuilding/reloading: start bare Pi, invoke `/telegram-connect` (default and named profile), immediately `/resume` a session with/without a binding. Check both leader and follower; confirm one connected destination, its correct retained/new slot, no source-target transplant, stale-context error or duplicate notice. Repeat a switch during startup and confirm disconnect cancels it. Native composition, destination-binding, cancellation, and late-completion regressions pass locally. The operator observed one immediate-resume connection complete after a short wait without error; the full profile/role/binding and cancellation matrix remains unverified live.
 - [ ] [`Workspace Thread recovery`](./docs/multi-instance-bus.md) (`environment-gated`): Complete native-Windows coverage for follower restore, inaccessible callbacks, stale targets, and Singleton↔Threaded transitions while preserving accepted work and current ownership.
   - [ ] Select an approved exact-absence observation before implementing ambiguous `deletion-issued` recovery. Never replay an unknown deletion or infer absence from cache, heartbeat silence, empty `editForumTopic`, or `sendChatAction` success.
 - [ ] [`Automatic pairing and follower input custody`](./docs/architecture.md#automatic-pairing-confirmation-design) (`activation-gated`): Keep production custody disabled until historical sources and physical references are reconciled, all legacy writers/consumers are retired or excluded under operator authority, migration is complete, and every participating peer supports the final protocol. Preserve outcome-unknown running work, exact receipt/group authority, authenticated handoff, and rollback/downgrade safety. Then compose the prepared v3 lifecycle/bus ports, add bounded operator disposition for retained legacy retry state, and run real-process plus native-Windows acceptance.

package/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ## Unreleased
 
+## 0.51.6: Connection resume and Workspace recovery hotfix
+
+- `Workspace slot recovery`: Confirmed pressure-retirement deletion invalidates the exact stale active-target record before binding removal. Same-process and successor retries finish a retained `commit-ready` fence without repeating Telegram deletion, preventing exhausted A–Z slots from deadlocking on `protection-changed`. Includes [#305](https://github.com/llblab/pi-telegram/pull/305).
+- `Connect lifecycle`: `/telegram-connect` checks plain session generation before reading Pi context getters after awaited work. Replaced commands cannot publish stale connection notices or retry startup against the old session; config, startup, recovery and takeover confirmation discard obsolete results.
+- `Resume connection`: In-flight `/telegram-connect` or an already connected bridge carries bounded same-process intent into the resumed session, retaining the selected profile but not the source Thread. Startup restores the destination's exact binding or provisions its own slot; cancellation, expiry and late completion cannot revive obsolete work.
+- `Thread binding isolation`: Session-aware startup no longer reuses another session's active target or legacy instance binding. Pending Thread creation records its Workspace binding key; unproven or foreign-session recovery is blocked without consuming evidence or repeating creation.
+- `Connection feedback`: Manual/resumed connection failures use compact cause-and-action notices rather than raw exception guidance. Detailed errors remain in redacted diagnostics; recovery success produces one short notice, and failed disconnect keeps Pi open without a duplicate exception banner. Delayed disconnect completion cannot touch a replaced Pi context.
+- `Model continuation`: In-flight model switching injects one compact line with the resume instruction, selected model and optional thinking level, preserving the control lane and exact reply target.
+- `Lifecycle ownership`: Connect intent and resume scheduling belong to the existing session lifecycle domain; compact failure formatting belongs to status. Transport authority, durable bindings and queue custody keep their existing owners, without introducing a separate connection domain.
+
 ## 0.51.5: Follower Thread new-session hotfix
 
 - `Follower Thread /new`: Telegram `/new` now starts a new session in a follower's Pi process and preserves its Thread binding. The leader publishes and later claims the durable replacement intent through capability-gated, generation-fenced bus requests, validating its own live registration and Workspace binding before accepting the follower's request. Incompatible or stale leaders fail closed rather than silently switching sessions.

package/README.md

@@ -57,7 +57,7 @@ Paste the bot token. If `~/.pi/agent/telegram.json` already contains a saved tok
 /telegram-connect
 ```
 
-The connected Pi instance owns Telegram polling. Use `/telegram-connect <profile>` to activate a named profile. Each profile is a parallel bot runtime with isolated polling, diagnostics, Threaded Mode state, and local bus transport; the `default` profile keeps unsuffixed runtime paths. In classic mode each profile uses a singleton lock. When Telegram private-chat Threaded Mode is available, one live instance becomes the profile's leader and later visible Pi instances register as followers. Reopening or resuming the same Pi session restores its remembered Thread at session startup; a distinct session in the same directory has its own binding and still requires explicit `/telegram-connect` when no remembered binding exists.
+The connected Pi instance owns Telegram polling. Use `/telegram-connect <profile>` to activate a named profile. Each profile is a parallel bot runtime with isolated polling, diagnostics, Threaded Mode state, and local bus transport; the `default` profile keeps unsuffixed runtime paths. In classic mode each profile uses a singleton lock. When Telegram private-chat Threaded Mode is available, one live instance becomes the profile's leader and later visible Pi instances register as followers. Reopening or resuming the same Pi session restores its remembered Thread at session startup. If `/resume` immediately follows `/telegram-connect`, or the bridge is already connected, connection intent follows the switch: the destination restores its own Thread/slot or receives a new binding, never the source session's Thread. Otherwise, a distinct unbound session still requires explicit `/telegram-connect`.
 
 After an unclean computer shutdown, `/telegram-connect` detects truncated or structurally invalid temporary ownership/routing files, quarantines only the damaged files under `tmp/telegram/recovery/`, and retries once. A journal snapshot removed by older broad temp cleanup is rebuilt when its complete segment history proves an empty result, while a revisionless snapshot is repaired from the first surviving segment's exact predecessor when the reconstructed tail validates. Otherwise the snapshot and segments are quarantined as recovery evidence, a fresh journal is published, and startup continues with an informational diagnostic instead of requiring manual JSON repair. Unsupported journal versions block recovery without rewriting or quarantining the retained files; use a compatible runtime rather than deleting journals. Saved `telegram.json` configuration and runtime diagnostics remain intact. Recovery never replaces a verifiable live owner; if safe automatic recovery cannot complete, the command gives one explicit Pi-restart instruction instead of requiring deletion of the whole `tmp/` directory.
 

package/dist/lib/bindings.d.ts

@@ -194,9 +194,12 @@ interface TelegramCommandsAndToolsBindingDeps {
     canSendDirect: () => boolean;
     setGenerativeAppLiveSurfaceRuntime?: (runtime: GenerativeApps.GenerativeAppLiveSurfaceRuntime<GenerativeApps.TelegramBindLiveHandle> | undefined) => void;
     updateStatus: TelegramBridgeStatusUpdater;
+    isContextCurrent: (ctx: Pi.ExtensionContext) => boolean;
+    getSessionGeneration: () => number;
+    connectionIntent: NonNullable<Commands.TelegramBridgeCommandRegistrationDeps["connectionIntent"]>;
     recordRuntimeEvent: TelegramRuntimeEventRecorder;
 }
-export declare function registerTelegramCommandsAndTools({ pi, agentDir, configStore, persistConfig, setup, activeTurnRuntime, lockedPollingRuntime, stopPolling, recoverPollingStart, getDisconnectThreadName, onTransportChanged, getStatusLines, buttonActionStore, sendMarkdownReply, sendChannelMarkdownMessage, sendChannelMediaMessage, listChannelPosts, mutateChannelPost, callMultipart, getDefaultChatId, getDefaultTarget, resolveAgentTarget, routeAgentMessage, canSendDirect, setGenerativeAppLiveSurfaceRuntime, recordRuntimeEvent, updateStatus, }: TelegramCommandsAndToolsBindingDeps): void;
+export declare function registerTelegramCommandsAndTools({ pi, agentDir, configStore, persistConfig, setup, activeTurnRuntime, lockedPollingRuntime, stopPolling, recoverPollingStart, getDisconnectThreadName, onTransportChanged, getStatusLines, buttonActionStore, sendMarkdownReply, sendChannelMarkdownMessage, sendChannelMediaMessage, listChannelPosts, mutateChannelPost, callMultipart, getDefaultChatId, getDefaultTarget, resolveAgentTarget, routeAgentMessage, canSendDirect, setGenerativeAppLiveSurfaceRuntime, recordRuntimeEvent, updateStatus, isContextCurrent, getSessionGeneration, connectionIntent, }: TelegramCommandsAndToolsBindingDeps): void;
 interface TelegramLifecycleBindingDeps {
     pi: Pi.ExtensionAPI;
     publicationRuntime: TelegramBridgePublicationRuntime;

package/dist/lib/bindings.js

@@ -323,7 +323,7 @@ export function createTelegramActivityBindingRuntime(deps) {
         },
     };
 }
-export function registerTelegramCommandsAndTools({ pi, agentDir, configStore, persistConfig, setup, activeTurnRuntime, lockedPollingRuntime, stopPolling, recoverPollingStart, getDisconnectThreadName, onTransportChanged, getStatusLines, buttonActionStore, sendMarkdownReply, sendChannelMarkdownMessage, sendChannelMediaMessage, listChannelPosts, mutateChannelPost, callMultipart, getDefaultChatId, getDefaultTarget, resolveAgentTarget, routeAgentMessage, canSendDirect, setGenerativeAppLiveSurfaceRuntime, recordRuntimeEvent, updateStatus, }) {
+export function registerTelegramCommandsAndTools({ pi, agentDir, configStore, persistConfig, setup, activeTurnRuntime, lockedPollingRuntime, stopPolling, recoverPollingStart, getDisconnectThreadName, onTransportChanged, getStatusLines, buttonActionStore, sendMarkdownReply, sendChannelMarkdownMessage, sendChannelMediaMessage, listChannelPosts, mutateChannelPost, callMultipart, getDefaultChatId, getDefaultTarget, resolveAgentTarget, routeAgentMessage, canSendDirect, setGenerativeAppLiveSurfaceRuntime, recordRuntimeEvent, updateStatus, isContextCurrent, getSessionGeneration, connectionIntent, }) {
     GenerativeApps.registerTelegramBindTool(pi, {
         agentDir,
         getActiveProfileName: configStore.getActiveProfileName,
@@ -452,33 +452,35 @@ export function registerTelegramCommandsAndTools({ pi, agentDir, configStore, pe
         reloadConfig: configStore.load,
         hasBotToken: configStore.hasBotToken,
         getBotTokenDiagnostic: configStore.getBotTokenDiagnostic,
-        startPolling: async (ctx, options) => {
-            try {
-                return await lockedPollingRuntime.start(ctx, options);
-            }
-            catch (error) {
-                recordRuntimeEvent("recovery", error, { phase: "polling-start" });
-                throw error;
-            }
-        },
+        startPolling: lockedPollingRuntime.start,
+        recordConnectionEvent: (error, phase) => recordRuntimeEvent("connection", error, { phase }),
         stopPolling: stopPolling ?? lockedPollingRuntime.stop,
         recoverPollingStart,
         getDisconnectThreadName,
         queueAgentConnectionContext,
         updateStatus,
+        isContextCurrent,
+        getSessionGeneration,
+        connectionIntent,
         getProfileNames: () => Config.getTelegramProfileNames(configStore.getStoredConfig()),
-        activateDefaultProfileConfig: async () => {
+        activateDefaultProfileConfig: async (_ctx, isCurrent) => {
             const previousProfileName = configStore.getActiveProfileName();
             await configStore.load();
+            if (!isCurrent())
+                return;
             if (previousProfileName) {
                 await (stopPolling ?? lockedPollingRuntime.stop)();
+                if (!isCurrent())
+                    return;
             }
             configStore.activateProfile(undefined);
             await onTransportChanged?.();
         },
-        activateProfileConfig: async (_ctx, profileName) => {
+        activateProfileConfig: async (_ctx, profileName, isCurrent) => {
             const previousProfileName = configStore.getActiveProfileName();
             await configStore.load();
+            if (!isCurrent())
+                return false;
             if (!Config.isValidTelegramProfileName(profileName))
                 return false;
             const storedConfig = configStore.getStoredConfig();
@@ -486,6 +488,8 @@ export function registerTelegramCommandsAndTools({ pi, agentDir, configStore, pe
                 return false;
             if (previousProfileName !== profileName) {
                 await (stopPolling ?? lockedPollingRuntime.stop)();
+                if (!isCurrent())
+                    return false;
             }
             if (!configStore.activateProfile(profileName))
                 return false;

package/dist/lib/bus-follower.d.ts

@@ -371,7 +371,7 @@ export declare function createTelegramBusAgentMessageClient(deps: TelegramBusFol
     routeMessage: (message: TelegramBusAgentMessage) => Promise<void>;
 };
 export declare function createTelegramBusFollowerApiCaller(deps: TelegramBusFollowerApiCallerDeps): (method: string, args: unknown[]) => Promise<unknown>;
-export declare function createTelegramBusFollowerSessionReplacementSuspender(deps: TelegramBusFollowerSessionReplacementSuspenderDeps): () => Promise<void>;
+export declare function createTelegramBusFollowerSessionReplacementSuspender(deps: TelegramBusFollowerSessionReplacementSuspenderDeps): (preserveTarget?: boolean) => Promise<void>;
 export declare function createTelegramBusFollowerSessionRefreshHook<TContext>(deps: TelegramBusFollowerSessionRefreshHookDeps<TContext>): (_event: unknown, ctx: TContext) => Promise<void>;
 export declare function createTelegramBusFollowerControlState(): TelegramBusFollowerControlState;
 export declare function createTelegramBusFollowerRegistrationState(options?: {

package/dist/lib/bus-follower.js

@@ -519,7 +519,13 @@ function isTelegramStaleContextError(error) {
 export function createTelegramBusFollowerSessionReplacementSuspender(deps) {
     const getNowMs = deps.getNowMs ?? Date.now;
     const getPid = deps.getPid ?? (() => process.pid);
-    return async () => {
+    return async (preserveTarget = true) => {
+        if (!preserveTarget) {
+            setTelegramFollowerSessionHandoff(undefined);
+            Threads.setTelegramLeaderSessionHandoff(undefined);
+            await deps.suspendPolling();
+            return;
+        }
         const target = deps.registrationState.getTarget();
         if (deps.registrationState.isRegistered() && target) {
             setTelegramFollowerSessionHandoff({

package/dist/lib/commands.d.ts

@@ -6,7 +6,7 @@
 import { type TelegramConfigStore } from "./config.ts";
 import type * as Pi from "./pi.ts";
 import type { ExtensionAPI, ExtensionCommandContext } from "./pi.ts";
-import type { TelegramBridgeStatusLineOptions } from "./status.ts";
+import { type TelegramBridgeStatusLineOptions } from "./status.ts";
 import type { TelegramSessionReplacementIntent } from "./threads.ts";
 import { type PendingTelegramControlItem, type TelegramQueueAdmissionReceipt } from "./queue.ts";
 export interface ParsedTelegramCommand {
@@ -112,12 +112,21 @@ export interface TelegramBridgeCommandRegistrationDeps {
     startPolling: (ctx: ExtensionCommandContext, options?: TelegramBridgeCommandStartPollingOptions) => void | Promise<void | TelegramBridgeCommandStartPollingResult> | TelegramBridgeCommandStartPollingResult;
     stopPolling: () => Promise<void | string>;
     recoverPollingStart?: (error: unknown) => Promise<TelegramPollingStartRecoveryResult>;
+    recordConnectionEvent?: (error: unknown, phase: string) => void;
     getDisconnectThreadName?: () => string | undefined;
     queueAgentConnectionContext?: (connected: boolean) => void;
     updateStatus: (ctx: ExtensionCommandContext) => void;
+    isContextCurrent?: (ctx: ExtensionCommandContext) => boolean;
+    getSessionGeneration?: () => number;
+    connectionIntent?: {
+        begin(cwd: string, profileName?: string): string;
+        finish(id: string): void;
+        isActive(id: string): boolean;
+        cancel(): void;
+    };
     getProfileNames?: () => string[];
-    activateDefaultProfileConfig?: (ctx: ExtensionCommandContext) => Promise<void>;
-    activateProfileConfig?: (ctx: ExtensionCommandContext, profileName: string) => Promise<boolean>;
+    activateDefaultProfileConfig?: (ctx: ExtensionCommandContext, isCurrent: () => boolean) => Promise<void>;
+    activateProfileConfig?: (ctx: ExtensionCommandContext, profileName: string, isCurrent: () => boolean) => Promise<boolean>;
 }
 export type TelegramThreadDisplayNameRenamePort = (target: {
     chatId: number;

package/dist/lib/commands.js

@@ -6,6 +6,7 @@
 import { randomUUID } from "node:crypto";
 import { pairTelegramUserIfNeeded, TELEGRAM_DEFAULT_PROFILE_NAME, } from "./config.js";
 import { escapeHtml } from "./rendering.js";
+import { formatTelegramConnectionFailure } from "./status.js";
 import { createTelegramControlItemBuilder, createTelegramControlQueueController, createTelegramQueueAdmissionReceipt, } from "./queue.js";
 const TELEGRAM_EXTENSION_COMMAND_REGISTRY_KEY = "__piTelegramCommandRegistry__";
 const TELEGRAM_BOT_COMMAND_NAME_PATTERN = /^[a-z0-9_]{1,32}$/;
@@ -270,121 +271,174 @@ export function registerTelegramBridgeCommands(pi, deps) {
     pi.registerCommand("telegram-connect", {
         description: "<profile> — Start Telegram bridge",
         handler: async (args, ctx) => {
+            const sessionGeneration = deps.getSessionGeneration?.();
+            let intentId;
+            // Pi context getters throw after replacement; check plain intent/generation first.
+            const isCurrent = () => (!intentId || deps.connectionIntent?.isActive(intentId) !== false) &&
+                (sessionGeneration === undefined || deps.getSessionGeneration?.() === sessionGeneration) &&
+                deps.isContextCurrent?.(ctx) !== false;
+            if (!isCurrent())
+                return;
             if (args.trim().split(/\s+/).some((word) => /^as=/i.test(word))) {
                 ctx.ui.notify("Thread names are configured from Telegram, not from Pi commands.", "warning");
                 deps.updateStatus(ctx);
                 return;
             }
             const profileName = parseTelegramProfileArg(args);
-            if (profileName && deps.activateProfileConfig) {
-                const ok = await deps.activateProfileConfig(ctx, profileName);
-                if (!ok) {
-                    ctx.ui.notify(`Profile "${profileName}" not found.`, "error");
-                    deps.updateStatus(ctx);
-                    return;
-                }
-                ctx.ui.notify(`Activated profile "${profileName}".`, "info");
-            }
-            else {
-                await (deps.activateDefaultProfileConfig?.(ctx) ?? deps.reloadConfig());
-            }
-            if (!deps.hasBotToken()) {
-                const botTokenDiagnostic = deps.getBotTokenDiagnostic?.();
-                if (botTokenDiagnostic)
-                    ctx.ui.notify(botTokenDiagnostic, "error");
-                const profileNames = deps.getProfileNames?.() ?? [];
-                if (!profileName && profileNames.length > 0) {
-                    ctx.ui.notify(`No default Telegram profile configured. Available profiles: ${profileNames.join(", ")}. Use /telegram-connect <profileName> or /telegram-setup to create a default profile.`, "info");
-                    deps.updateStatus(ctx);
-                    return;
+            intentId = deps.connectionIntent?.begin(ctx.cwd, profileName);
+            try {
+                if (profileName && deps.activateProfileConfig) {
+                    const ok = await deps.activateProfileConfig(ctx, profileName, isCurrent);
+                    if (!isCurrent())
+                        return;
+                    if (!ok) {
+                        ctx.ui.notify(`Profile "${profileName}" not found.`, "error");
+                        deps.updateStatus(ctx);
+                        return;
+                    }
+                    ctx.ui.notify(`Activated profile "${profileName}".`, "info");
                 }
-                await deps.promptForConfig(ctx, profileName);
-                return;
-            }
-            let recoveryUsed = false;
-            const startWithRecovery = async (options) => {
-                try {
-                    return await deps.startPolling(ctx, options);
+                else {
+                    await (deps.activateDefaultProfileConfig?.(ctx, isCurrent) ?? deps.reloadConfig());
+                    if (!isCurrent())
+                        return;
                 }
-                catch (error) {
-                    if (!deps.recoverPollingStart || recoveryUsed)
-                        throw error;
-                    const recovery = await deps.recoverPollingStart(error);
-                    if (recovery.kind === "unhandled")
-                        throw error;
-                    if (recovery.kind === "blocked") {
-                        return { ok: false, message: recovery.message };
+                if (!deps.hasBotToken()) {
+                    const botTokenDiagnostic = deps.getBotTokenDiagnostic?.();
+                    if (botTokenDiagnostic)
+                        ctx.ui.notify(botTokenDiagnostic, "error");
+                    const profileNames = deps.getProfileNames?.() ?? [];
+                    if (!profileName && profileNames.length > 0) {
+                        ctx.ui.notify(`No default Telegram profile configured. Available profiles: ${profileNames.join(", ")}. Use /telegram-connect <profileName> or /telegram-setup to create a default profile.`, "info");
+                        deps.updateStatus(ctx);
+                        return;
                     }
-                    recoveryUsed = true;
+                    await deps.promptForConfig(ctx, profileName);
+                    return;
+                }
+                let recoveryUsed = false;
+                const startWithRecovery = async (options) => {
                     try {
-                        const retry = await deps.startPolling(ctx, options);
-                        if (!retry) {
-                            return { ok: true, message: recovery.message };
+                        return await deps.startPolling(ctx, options);
+                    }
+                    catch (error) {
+                        if (!isCurrent())
+                            return;
+                        if (!deps.recoverPollingStart || recoveryUsed)
+                            throw error;
+                        deps.recordConnectionEvent?.(error, "polling-start");
+                        const recovery = await deps.recoverPollingStart(error);
+                        if (!isCurrent())
+                            return;
+                        if (recovery.kind === "unhandled")
+                            throw error;
+                        if (recovery.kind === "blocked") {
+                            return { ok: false, message: recovery.message,
+                                notice: "Telegram recovery blocked. Check /telegram-status --debug." };
+                        }
+                        recoveryUsed = true;
+                        deps.recordConnectionEvent?.(recovery.message, "recovery");
+                        try {
+                            const retry = await deps.startPolling(ctx, options);
+                            if (!isCurrent())
+                                return;
+                            if (!retry)
+                                return { ok: true, message: "Telegram bridge connected; temporary state recovered." };
+                            return {
+                                ...retry,
+                                message: retry.ok
+                                    ? "Telegram bridge connected; temporary state recovered."
+                                    : retry.message,
+                            };
+                        }
+                        catch (error) {
+                            if (!isCurrent())
+                                return;
+                            deps.recordConnectionEvent?.(error, "recovery-retry");
+                            return {
+                                ok: false,
+                                notice: "Telegram recovery failed. Restart this Pi instance.",
+                            };
                         }
-                        return {
-                            ...retry,
-                            message: retry.ok
-                                ? `${recovery.message} ${retry.message ?? "Telegram bridge connected."}`
-                                : retry.message,
-                        };
                     }
-                    catch {
-                        return {
-                            ok: false,
-                            message: "Telegram temporary state was recovered, but the bridge could not restart. Restart this Pi instance and run /telegram-connect again.",
-                        };
+                };
+                let result = await startWithRecovery({ forceFreshLeaderThread: true });
+                if (!isCurrent())
+                    return;
+                if (result && !result.ok && result.canTakeover) {
+                    const confirmed = await ctx.ui.confirm(formatTelegramTakeoverTitle(ctx), formatTelegramTakeoverPrompt(ctx, result.owner));
+                    if (!isCurrent())
+                        return;
+                    if (!confirmed) {
+                        ctx.ui.notify("Telegram bridge takeover cancelled.", "info");
+                        deps.updateStatus(ctx);
+                        return;
                     }
+                    result = await startWithRecovery({ force: true, forceFreshLeaderThread: true });
+                    if (!isCurrent())
+                        return;
                 }
-            };
-            let result = await startWithRecovery({
-                forceFreshLeaderThread: true,
-            });
-            if (result && !result.ok && result.canTakeover) {
-                const confirmed = await ctx.ui.confirm(formatTelegramTakeoverTitle(ctx), formatTelegramTakeoverPrompt(ctx, result.owner));
-                if (!confirmed) {
-                    ctx.ui.notify("Telegram bridge takeover cancelled.", "info");
-                    deps.updateStatus(ctx);
-                    return;
+                if (result && !result.ok) {
+                    if (result.message)
+                        deps.recordConnectionEvent?.(result.message, "connect-refused");
+                    ctx.ui.notify(result.notice ?? formatTelegramConnectionFailure(result.message), "warning");
                 }
-                result = await startWithRecovery({
-                    force: true,
-                    forceFreshLeaderThread: true,
-                });
+                else if (result?.message) {
+                    ctx.ui.notify(result.message, "info");
+                }
+                if (!result || result.ok)
+                    deps.queueAgentConnectionContext?.(true);
+                deps.updateStatus(ctx);
             }
-            if (result?.message) {
-                ctx.ui.notify(result.message, result.ok ? "info" : "warning");
+            catch (error) {
+                if (!isCurrent())
+                    return;
+                deps.recordConnectionEvent?.(error, "connect");
+                ctx.ui.notify(formatTelegramConnectionFailure(error), "warning");
+                deps.updateStatus(ctx);
             }
-            if (!result || result.ok) {
-                deps.queueAgentConnectionContext?.(true);
+            finally {
+                if (intentId)
+                    deps.connectionIntent?.finish(intentId);
             }
-            deps.updateStatus(ctx);
         },
     });
     pi.registerCommand("telegram-disconnect", {
         description: "Stop Telegram and delete current thread in Threaded Mode",
         handler: async (_args, ctx) => {
-            const threadName = deps.getDisconnectThreadName?.();
-            if (threadName) {
-                const confirmed = await ctx.ui.confirm(ctx.ui.theme.fg("accent", "pi-telegram"), `Delete Telegram thread ${ctx.ui.theme.fg("warning", threadName)} and disconnect this Pi session?`);
-                if (!confirmed) {
-                    ctx.ui.notify("Telegram disconnect cancelled.", "info");
-                    deps.updateStatus(ctx);
-                    return;
-                }
-            }
+            const generation = deps.getSessionGeneration?.();
+            const isCurrent = () => (generation === undefined || deps.getSessionGeneration?.() === generation) &&
+                deps.isContextCurrent?.(ctx) !== false;
+            if (!isCurrent())
+                return;
+            deps.connectionIntent?.cancel();
             try {
+                const threadName = deps.getDisconnectThreadName?.();
+                if (threadName) {
+                    const confirmed = await ctx.ui.confirm(ctx.ui.theme.fg("accent", "pi-telegram"), `Delete Telegram thread ${ctx.ui.theme.fg("warning", threadName)} and disconnect this Pi session?`);
+                    if (!isCurrent())
+                        return;
+                    if (!confirmed) {
+                        ctx.ui.notify("Telegram disconnect cancelled.", "info");
+                        return;
+                    }
+                }
                 const message = await deps.stopPolling();
+                if (!isCurrent())
+                    return;
                 if (message)
                     ctx.ui.notify(message, "info");
                 deps.queueAgentConnectionContext?.(false);
             }
             catch (error) {
-                const detail = error instanceof Error ? error.message : String(error);
-                ctx.ui.notify(`Telegram disconnect did not complete: ${detail} Keep this Pi session open, restore leader connectivity, inspect /telegram-status --debug, and retry /telegram-disconnect.`, "warning");
-                throw error;
+                deps.recordConnectionEvent?.(error, "disconnect");
+                if (!isCurrent())
+                    return;
+                ctx.ui.notify("Telegram disconnect incomplete; keep Pi open. Check /telegram-status --debug.", "warning");
             }
             finally {
-                deps.updateStatus(ctx);
+                if (isCurrent())
+                    deps.updateStatus(ctx);
             }
         },
     });

package/dist/lib/extension.js

@@ -1361,6 +1361,28 @@ export default function (pi) {
         resolveAutomaticThreadCleanupEnabled: configControls.resolveAutomaticThreadCleanupEnabled,
         runWorkspaceOperation: telegramWorkspaceOperationRuntime.run,
     });
+    const connectionIntent = Lifecycle.createTelegramConnectionIntentRuntime();
+    const connectionLifecycle = Lifecycle.createTelegramConnectionLifecycle({
+        intent: connectionIntent,
+        getGeneration: telegramSessionContextStore.getGeneration,
+        isCurrent: telegramSessionContextStore.isCurrent,
+        getProfileName: configStore.getActiveProfileName,
+        isConnected() {
+            return lockRuntime.owns() || telegramBusFollowerRegistrationState.isRegistered();
+        },
+        async activateProfile(profileName, isCurrent) {
+            await configStore.load();
+            if (!isCurrent())
+                return false;
+            return configStore.activateProfile(profileName) && configStore.hasBotToken();
+        },
+        start(ctx) {
+            return lockedPollingRuntime.start(ctx);
+        },
+        recordError(error) {
+            recordRuntimeEvent("connection", error, { phase: "resume-connect" });
+        },
+    });
     const telegramBridgeSessionLifecycleDeps = Lifecycle.createTelegramBridgeSessionLifecycleDeps({
         contextStore: telegramSessionContextStore,
         queue: {
@@ -1408,6 +1430,7 @@ export default function (pi) {
             },
             delivery: deliveryLifecycleRuntime,
             polling: lockedPollingRuntime,
+            connection: connectionLifecycle,
             inboundWorker: {
                 onSessionShutdown: updateAdmissionRuntimeBinding.onSessionShutdown,
             },
@@ -1536,6 +1559,9 @@ export default function (pi) {
             modelContextAvailabilityRuntime.reconcile();
         },
         getStatusLines,
+        isContextCurrent: telegramSessionContextStore.isCurrent,
+        getSessionGeneration: telegramSessionContextStore.getGeneration,
+        connectionIntent,
         buttonActionStore,
         sendMarkdownReply,
         async sendChannelMarkdownMessage(channel, markdown, options) {

package/dist/lib/lifecycle.d.ts

@@ -1,7 +1,8 @@
 /**
- * Telegram lifecycle hook registration helpers
+ * Telegram session lifecycle coordination and hook registration
  * Zones: pi agent lifecycle, telegram session
- * Binds prepared Telegram lifecycle runtimes to pi extension lifecycle events
+ * Owns context generations, bounded connect intent across resume, and session sequencing.
+ * Transport authority, durable bindings, and queue custody remain with their owners.
  */
 import * as BusFollower from "./bus-follower.ts";
 import * as Queue from "./queue.ts";
@@ -50,6 +51,58 @@ export interface TelegramSessionLifecycleHooks {
     onSessionStart: (event: SessionStartEvent, ctx: ExtensionContext) => Promise<void>;
     onSessionShutdown: (event: SessionShutdownEvent, ctx: ExtensionContext) => Promise<void>;
 }
+export interface TelegramConnectionIntent {
+    id: string;
+    cwd: string;
+    profileName?: string;
+}
+interface TelegramConnectionHandoff extends TelegramConnectionIntent {
+    pid: number;
+    targetSessionFile: string;
+    expiresAtMs: number;
+}
+export interface TelegramConnectionHandoffStore {
+    pending?: TelegramConnectionHandoff;
+}
+export interface TelegramConnectionLifecycle {
+    prepare(event: SessionStartEvent, ctx: ExtensionContext): (() => void) | undefined;
+    onSessionShutdown(event: SessionShutdownEvent, ctx: ExtensionContext): void;
+}
+export declare function createTelegramConnectionLifecycle(deps: {
+    intent: ReturnType<typeof createTelegramConnectionIntentRuntime>;
+    getGeneration(): number;
+    isCurrent(ctx: ExtensionContext): boolean;
+    getProfileName(): string | undefined;
+    isConnected(): boolean;
+    activateProfile(profileName: string | undefined, isCurrent: () => boolean): Promise<boolean>;
+    start(ctx: ExtensionContext): Promise<{
+        ok: boolean;
+        message?: string;
+    }>;
+    recordError(error: unknown): void;
+}): TelegramConnectionLifecycle;
+export declare function createTelegramConnectionIntentRuntime(options?: {
+    store?: TelegramConnectionHandoffStore;
+    now?: () => number;
+    pid?: number;
+}): {
+    begin(cwd: string, profileName?: string): string;
+    isActive(id: string): boolean;
+    finish(id: string): void;
+    cancel(): void;
+    suspend(input: {
+        reason: string;
+        cwd: string;
+        targetSessionFile?: string;
+        connected: boolean;
+        profileName?: string;
+    }): void;
+    resume(input: {
+        reason: string;
+        cwd: string;
+        sessionFile?: string;
+    }): TelegramConnectionIntent | undefined;
+};
 export interface TelegramSessionContextStore<TContext> {
     get: () => TContext | undefined;
     getGeneration: () => number;
@@ -62,6 +115,7 @@ export declare function createTelegramSessionContextStore<TContext>(options?: {
 }): TelegramSessionContextStore<TContext>;
 export declare function createTelegramSessionGenerationFence(store: TelegramSessionContextStore<ExtensionContext>, hooks: TelegramSessionLifecycleHooks): TelegramSessionLifecycleHooks;
 export interface TelegramBridgeSessionServiceRuntime {
+    connection?: TelegramConnectionLifecycle;
     resumeGroupedInput(ctx: ExtensionContext): void;
     suspendGroupedInput(): void;
     delivery: {
@@ -108,6 +162,7 @@ export interface TelegramBridgeSessionLifecyclePorts<TQueueItem, TModel = unknow
         };
         delivery: TelegramBridgeSessionServiceRuntime["delivery"];
         polling: TelegramBridgeSessionServiceRuntime["polling"];
+        connection?: TelegramBridgeSessionServiceRuntime["connection"];
         inboundWorker: TelegramBridgeSessionServiceRuntime["inboundWorker"];
         capabilityMonitor: TelegramBridgeSessionServiceRuntime["capabilityMonitor"];
         queueWatchdog: TelegramBridgeSessionServiceRuntime["queueWatchdog"];