@llblab/pi-kit 0.6.0 → 0.7.1

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

@@ -42,6 +42,10 @@ export interface TelegramSetupDeps {
     result?: TelegramSetupUser;
     description?: string;
   }>;
+  /** Resolve a submitted literal token or `$NAME`/`${NAME}` reference. */
+  resolveBotToken?: (value: string) => string | undefined;
+  /** Redacted diagnostic for an unresolved or malformed token reference. */
+  describeBotToken?: (value: string) => string | undefined;
   persistConfig: (config: TelegramSetupConfig) => Promise<void>;
   notify: (message: string, level: "info" | "error") => void;
   startPolling: () => unknown | Promise<unknown>;
@@ -70,6 +74,8 @@ export interface TelegramSetupPromptRuntimeDeps<
   setConfig: (config: TelegramSetupConfig) => void;
   setupGuard: TelegramSetupGuard;
   getMe: TelegramSetupDeps["getMe"];
+  resolveBotToken?: TelegramSetupDeps["resolveBotToken"];
+  describeBotToken?: TelegramSetupDeps["describeBotToken"];
   persistConfig: (config: TelegramSetupConfig) => Promise<void>;
   startPolling: (ctx: TContext) => unknown | Promise<unknown>;
   updateStatus: (ctx: TContext) => void;
@@ -88,6 +94,25 @@ const TELEGRAM_BOT_TOKEN_ENV_VARS = [
   "TELEGRAM_KEY",
 ] as const;
 
+/**
+ * Default submitted-token handling for structural callers that inject no
+ * reference port: plain literals pass through, while `$`-prefixed values fail
+ * closed instead of being sent to the Bot API as a literal token.
+ */
+function resolveSubmittedTelegramBotToken(value: string): string | undefined {
+  const trimmed = value.trim();
+  if (!trimmed || trimmed.startsWith("$")) return undefined;
+  return trimmed;
+}
+
+function describeSubmittedTelegramBotToken(
+  value: string,
+): string | undefined {
+  return value.trim().startsWith("$")
+    ? "Telegram bot token environment reference is unavailable in this setup environment."
+    : undefined;
+}
+
 function isTelegramPollingStartResult(
   value: unknown,
 ): value is TelegramPollingStartResult {
@@ -105,8 +130,8 @@ export function getTelegramBotTokenInputDefault(
   const trimmedConfigToken = configToken?.trim();
   if (trimmedConfigToken) return trimmedConfigToken;
   for (const key of TELEGRAM_BOT_TOKEN_ENV_VARS) {
-    const value = env[key]?.trim();
-    if (value) return value;
+    // Persist the originating alias rather than copying the resolved secret.
+    if (env[key]?.trim()) return `$${key}`;
   }
   return TELEGRAM_BOT_TOKEN_INPUT_PLACEHOLDER;
 }
@@ -135,13 +160,26 @@ export async function runTelegramSetup(
       ? await deps.promptEditor("Telegram bot token", tokenPrompt.value)
       : await deps.promptInput("Telegram bot token", tokenPrompt.value);
   if (!token) return { status: "cancelled" };
+  const submittedToken = token.trim();
+  const resolveBotToken =
+    deps.resolveBotToken ?? resolveSubmittedTelegramBotToken;
+  const describeBotToken =
+    deps.describeBotToken ?? describeSubmittedTelegramBotToken;
+  const resolvedToken = resolveBotToken(submittedToken);
   const nextConfig: TelegramSetupConfig = {
     ...deps.config,
-    botToken: token.trim(),
+    botToken: submittedToken,
   };
+  if (!resolvedToken) {
+    deps.notify(
+      describeBotToken(submittedToken) ?? "Invalid Telegram bot token",
+      "error",
+    );
+    return { status: "validation-failed" };
+  }
   let data: Awaited<ReturnType<TelegramSetupDeps["getMe"]>>;
   try {
-    data = await deps.getMe(nextConfig.botToken ?? "");
+    data = await deps.getMe(resolvedToken);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     deps.notify(`Telegram API check failed: ${message}`, "error");
@@ -195,6 +233,8 @@ export function createTelegramSetupPromptRuntime<
         promptInput: (label, value) => ctx.ui.input(label, value),
         promptEditor: (label, value) => ctx.ui.editor(label, value),
         getMe: deps.getMe,
+        resolveBotToken: deps.resolveBotToken,
+        describeBotToken: deps.describeBotToken,
         persistConfig: async (config) => {
           const previousConfig = deps.getConfig();
           deps.setConfig(config);

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

@@ -207,6 +207,7 @@ export interface TelegramBridgeInboundWorkerState {
   phaseStartedAtMs?: number;
   currentUpdateId?: number;
   blockedReason?: string;
+  blockedInputCustody?: { updateId: number; kind: string };
   journalEntryCount: number;
   journalSerializedBytes: number;
   oldestAdmittedAtMs?: number;
@@ -244,6 +245,8 @@ export interface TelegramBridgeInboundWorkerState {
 export interface TelegramBridgeStatusLineState {
   hasBotToken?: boolean;
   botUsername?: string;
+  /** Redacted named-variable diagnostic when the stored token reference cannot resolve. */
+  botTokenDiagnostic?: string;
   activeProfileName?: string;
   diagnosticPaths?: { state: string; logs: string };
   allowedUserId?: number;
@@ -294,6 +297,7 @@ export interface TelegramStatusBarState {
   pollingStopReason?: string;
   paired: boolean;
   busRole?: TelegramBridgeBusRole;
+  followerRegistered?: boolean;
   busLifecyclePhase?: TelegramBridgeBusLifecyclePhase;
   instanceSlot?: string;
   instanceThreadName?: string;
@@ -321,10 +325,40 @@ export interface TelegramStatusRuntimeDeps<
 
 export interface TelegramBridgeStatusConfig {
   botToken?: string;
+  /** Caller-resolved token availability; falls back to raw presence. */
+  botHasToken?: boolean;
+  /** Caller-supplied redacted diagnostic for an unresolved token reference. */
+  botTokenDiagnostic?: string;
   botUsername?: string;
   allowedUserId?: number;
 }
 
+/** Narrow config-store view used to project resolved bot-token availability. */
+export interface TelegramBridgeStatusConfigSource {
+  get: () => TelegramBridgeStatusConfig;
+  hasBotToken?: () => boolean;
+  getBotTokenDiagnostic?: () => string | undefined;
+}
+
+/**
+ * Project a config store into the status view without moving token-reference
+ * resolution into this structural leaf domain.
+ */
+export function createTelegramBridgeStatusConfigGetter(
+  source: TelegramBridgeStatusConfigSource,
+): () => TelegramBridgeStatusConfig {
+  return () => {
+    const config = source.get();
+    return {
+      ...config,
+      ...(source.hasBotToken ? { botHasToken: source.hasBotToken() } : {}),
+      ...(source.getBotTokenDiagnostic
+        ? { botTokenDiagnostic: source.getBotTokenDiagnostic() }
+        : {}),
+    };
+  };
+}
+
 export interface TelegramBridgeStatusRuntimeDeps<
   TQueueItem extends { queueLane: TelegramStatusQueueLane },
 > {
@@ -677,11 +711,13 @@ export function createTelegramBridgeStatusRuntime<
       const hasPendingModelSwitch = deps.hasPendingModelSwitch();
       const activeToolExecutions = deps.getActiveToolExecutions();
       const compactionInProgress = deps.isCompactionInProgress();
+      const localBus = deps.getLocalBus?.();
       return {
-        hasBotToken: !!config.botToken,
+        hasBotToken: config.botHasToken ?? Boolean(config.botToken),
         pollingActive: deps.isPollingActive(),
         paired: !!config.allowedUserId,
         busRole: deps.getBusRole?.(),
+        followerRegistered: localBus?.followerRegistered,
         busLifecyclePhase: deps.getBusLifecyclePhase?.(),
         instanceSlot: deps.getInstanceSlot?.(),
         instanceThreadName: deps.getInstanceThreadName?.(),
@@ -711,8 +747,9 @@ export function createTelegramBridgeStatusRuntime<
         ? (deps.getActiveProfileName() ?? TELEGRAM_STATUS_DEFAULT_PROFILE_NAME)
         : undefined;
       return {
-        hasBotToken: Boolean(config.botToken),
+        hasBotToken: config.botHasToken ?? Boolean(config.botToken),
         botUsername: config.botUsername,
+        botTokenDiagnostic: config.botTokenDiagnostic,
         activeProfileName,
         diagnosticPaths: deps.getDiagnosticPaths?.(activeProfileName),
         allowedUserId: config.allowedUserId,
@@ -902,6 +939,9 @@ export function buildTelegramStatusBarText(
   if (state.error) {
     return `${label} ${theme.fg("error", "error")}`;
   }
+  if (state.busRole === "follower" && state.followerRegistered === false) {
+    return `${label} ${theme.fg("warning", "reconnecting")}${queued}`;
+  }
   if (state.processing) {
     const processingStatus = state.queuedStatus
       ? "active"
@@ -918,10 +958,14 @@ export function buildTelegramStatusBarText(
 }
 
 function formatTelegramBridgeBotStatus(
-  state: Pick<TelegramBridgeStatusLineState, "hasBotToken" | "botUsername">,
+  state: Pick<
+    TelegramBridgeStatusLineState,
+    "hasBotToken" | "botUsername" | "botTokenDiagnostic"
+  >,
 ): string {
   if (state.botUsername) return `@${state.botUsername}`;
-  return state.hasBotToken ? "unknown" : "not configured";
+  if (state.hasBotToken) return "unknown";
+  return state.botTokenDiagnostic ?? "not configured";
 }
 
 function formatTelegramStatusTarget(
@@ -1277,6 +1321,9 @@ function buildTelegramInboundWorkerDiagnosticLines(
     ...(worker.blockedReason
       ? [`- blocked reason: ${worker.blockedReason}`]
       : []),
+    ...(worker.blockedInputCustody
+      ? [`- blocked input custody: update=${worker.blockedInputCustody.updateId}, kind=${worker.blockedInputCustody.kind}`]
+      : []),
     ...(worker.lastCompletedUpdateId !== undefined
       ? [
           `- last completed: ${worker.lastCompletedUpdateId}${worker.lastCompletedAtMs !== undefined ? ` at ${new Date(worker.lastCompletedAtMs).toISOString()}` : ""}`,