grok-telegram-bot 2.3.1 → 2.4.0

package/src/bot/handlers/usage.ts

@@ -1,7 +1,10 @@
 /**
- * /usage — show account info and the current session's context usage.
+ * /usage — Grok CLI live monthly quota + session context + bot-tracked
+ * per-account turn stats.
  */
 import type { Bot, Context } from "grammy";
+import type { StoredAccount } from "../../app/accounts.js";
+import { formatCliBillingLines } from "../../app/usage.js";
 import type { BotDeps } from "../deps.js";
 
 export async function showUsage(ctx: Context, deps: BotDeps): Promise<void> {
@@ -10,29 +13,128 @@ export async function showUsage(ctx: Context, deps: BotDeps): Promise<void> {
   const acct = await deps.usage.account();
   const meta = rt.contextInfo();
   const ctx100 = meta?.contextUsagePercentage;
-  const savedCount = deps.accounts.list().length;
+  const list = deps.accounts.list();
+  const activeId = deps.accounts.activeAccountId();
+  const activeMeta = activeId ? deps.accounts.get(activeId) : undefined;
+  const { billing, error: billingError } = await deps.usage.cliBilling();
 
-  const lines = [
-    "\u{1F4CA} Usage & account",
-    acct?.email ? `\u{1F464} ${acct.email}` : "",
-    acct?.accountType ? `\u{1F511} ${acct.accountType}${acct.region ? ` \u00B7 ${acct.region}` : ""}` : "",
+  const lines: string[] = [
+    "\u{1F4CA} Usage & accounts",
     "",
-    `\u{1F9F5} Session: ${rt.sessionId ? rt.sessionId.slice(0, 8) : "none"}`,
-    `\u{1F9E9} Model: ${rt.model || "default"}`,
-    `\u{1F4CA} Context used: ${ctx100 !== undefined ? `${ctx100.toFixed(0)}%` : "\u2014"}`,
-    `\u{1F501} Turns this session: ${rt.turns}`,
-    meta?.credits !== undefined ? `\u{1FA99} Credits used: ${meta.credits.toLocaleString("en-US")}` : "",
-    meta?.effort ? `\u{1F9E0} Effort: ${meta.effort}` : "",
-    savedCount > 0 ? `\u{1F465} Saved accounts: ${savedCount} \u00B7 /accounts to switch` : "",
+    "\u{1F464} Current login",
+    acct?.email ? `  ${acct.email}` : "  (identity unknown)",
+  ];
+  if (acct?.accountType) {
+    lines.push(`  \u{1F511} ${acct.accountType}${acct.region ? ` \u00B7 ${acct.region}` : ""}`);
+  }
+  if (acct?.teamId) lines.push(`  Team: ${acct.teamId.slice(0, 8)}\u2026`);
+  if (activeMeta) {
+    const uLine = deps.accounts.formatUsageLine(activeMeta);
+    lines.push(`  Saved as: ${activeMeta.label}`);
+    if (uLine) lines.push(`  Bot-tracked: ${uLine}`);
+  }
+
+  lines.push("");
+  if (billing) {
+    lines.push(...formatCliBillingLines(billing));
+  } else {
+    lines.push(
+      "\u{1F4B3} Grok CLI monthly quota",
+      `  \u26A0\uFE0F ${billingError || "unavailable"}`,
+      "  (Requires `grok login` OIDC token — not XAI_API_KEY alone.)",
+    );
+  }
+
+  lines.push(
     "",
-    "\u2139\uFE0F Full billing/quota lives in the Grok app; grok doesn't expose limits headlessly.",
-  ].filter(Boolean);
+    "\u{1F9F5} This session (ACP)",
+    `  Id: ${rt.sessionId ? rt.sessionId.slice(0, 8) : "none"}`,
+    `  Model: ${rt.model || "default"}`,
+    `  Context used: ${ctx100 !== undefined ? `${ctx100.toFixed(0)}%` : "\u2014"}`,
+    `  Turns this session: ${rt.turns}`,
+  );
+  if (meta?.credits !== undefined) {
+    lines.push(`  Credits (session report): ${fmtNum(meta.credits)}`);
+  }
+  if (meta?.effort) lines.push(`  Effort: ${meta.effort}`);
+  if (meta?.totalTokens !== undefined) {
+    lines.push(`  Tokens (session report): ${meta.totalTokens.toLocaleString("en-US")}`);
+  }
+
+  if (list.length > 0) {
+    lines.push("", "\u{1F465} Saved accounts (bot-tracked turns on this machine)");
+    for (const a of list) {
+      lines.push(accountUsageBlock(deps, a, a.id === activeId));
+    }
+    const totals = aggregate(list);
+    lines.push(
+      "",
+      `\u{1F4CA} Bot totals: ${totals.turns} turn${totals.turns === 1 ? "" : "s"}` +
+        (totals.credits > 0 ? ` \u00B7 ${fmtNum(totals.credits)} session credits` : "") +
+        ` \u00B7 ${totals.withUsage}/${list.length} accounts used`,
+    );
+  } else {
+    lines.push("", "\u{1F465} No saved accounts yet \u2014 /accounts to save & switch.");
+  }
+
+  lines.push(
+    "",
+    "\u2139\uFE0F Monthly quota is live from Grok CLI (`cli-chat-proxy` billing). Bot-tracked turns are local to this bot.",
+  );
+
+  if (!acct) lines.splice(3, 0, "  (account info unavailable \u2014 is grok logged in?)");
 
-  if (!acct) lines.splice(1, 0, "(account info unavailable \u2014 is grok logged in?)");
   await deps.ephemeral.open(ctx);
   await deps.ephemeral.reply(ctx, lines.join("\n"));
 }
 
+function accountUsageBlock(deps: BotDeps, a: StoredAccount, active: boolean): string {
+  const mark = a.warning ? "\u26A0\uFE0F" : active ? "\u2705" : "\u{1F464}";
+  const u = a.usage;
+  const head = `${mark} ${a.label}${active ? " (active)" : ""}`;
+  if (!u || (u.turns <= 0 && u.credits <= 0 && !u.lastUsedAt)) {
+    return `${head}\n  no bot-tracked usage yet`;
+  }
+  const bits: string[] = [];
+  bits.push(`${u.turns || 0} turn${(u.turns || 0) === 1 ? "" : "s"}`);
+  if (u.credits > 0) bits.push(`${fmtNum(u.credits)} session credits`);
+  if (u.lastTurnCredits !== undefined) bits.push(`last turn ${fmtNum(u.lastTurnCredits)}`);
+  if (u.lastContextPct !== undefined) bits.push(`last ctx ${u.lastContextPct.toFixed(0)}%`);
+  if (u.lastUsedAt) bits.push(`last ${shortWhen(u.lastUsedAt)}`);
+  return `${head}\n  ${bits.join(" \u00B7 ")}`;
+}
+
+function aggregate(list: StoredAccount[]): { turns: number; credits: number; withUsage: number } {
+  let turns = 0;
+  let credits = 0;
+  let withUsage = 0;
+  for (const a of list) {
+    const u = a.usage;
+    if (!u) continue;
+    turns += u.turns || 0;
+    credits += u.credits || 0;
+    if (u.turns > 0 || u.credits > 0 || u.lastUsedAt) withUsage++;
+  }
+  return { turns, credits, withUsage };
+}
+
+function fmtNum(n: number): string {
+  if (!Number.isFinite(n)) return String(n);
+  if (Number.isInteger(n)) return n.toLocaleString("en-US");
+  return n.toFixed(2);
+}
+
+function shortWhen(iso: string): string {
+  const t = Date.parse(iso);
+  if (!Number.isFinite(t)) return iso.slice(0, 10);
+  const sec = Math.max(0, Math.round((Date.now() - t) / 1000));
+  if (sec < 60) return "just now";
+  if (sec < 3600) return `${Math.floor(sec / 60)}m ago`;
+  if (sec < 86_400) return `${Math.floor(sec / 3600)}h ago`;
+  if (sec < 86_400 * 14) return `${Math.floor(sec / 86_400)}d ago`;
+  return new Date(t).toISOString().slice(0, 10);
+}
+
 export function registerUsage(bot: Bot, deps: BotDeps): void {
   bot.command("usage", (ctx) => showUsage(ctx, deps));
 }

package/src/bot/menu/keyboard.ts

@@ -2,8 +2,9 @@
  * Menu surfaces:
  *  - a tiny PERSISTENT bar (☰ Menu · 🧭 Running · ⏹ Stop) — minimal footprint;
  *  - a full, organized INLINE menu opened on demand (and hideable).
- * Live state (project/agent/model/reasoning/context) lives in the pinned panel,
- * so the bar stays clean.
+ * Live state (project/model/reasoning/context) lives in the pinned panel,
+ * so the bar stays clean. (Agent picker removed — Grok has no useful headless
+ * agent switch; plan mode is entered automatically when the agent judges the task complex.)
  */
 import { InlineKeyboard, Keyboard } from "grammy";
 
@@ -18,7 +19,7 @@ export function compactKeyboard(): Keyboard {
 }
 
 /** The full, grouped inline menu (opened via ☰ Menu or /menu). */
-export function mainMenuInline(state: { agent: string; model: string; reasoning: string }): InlineKeyboard {
+export function mainMenuInline(state: { model: string; reasoning: string }): InlineKeyboard {
   const t = (s: string, n: number): string => (s.length > n ? s.slice(0, n - 1) + "\u2026" : s);
   return new InlineKeyboard()
     .text("\u{1F4C1} Project", "m:project")
@@ -27,7 +28,7 @@ export function mainMenuInline(state: { agent: string; model: string; reasoning:
     .text("\u{1F9ED} Running", "m:running")
     .text("\u{1F5C2} Sessions", "m:sessions")
     .row()
-    .text(`\u{1F916} Agent \u00B7 ${t(state.agent, 24)}`, "m:agent")
+    .text("\u{1F4E5} Import session", "m:import")
     .row()
     .text(`\u{1F9E9} Model \u00B7 ${t(state.model, 24)}`, "m:model")
     .row()

package/src/bot/menu/status-panel.ts

@@ -49,11 +49,15 @@ export class StatusPanel {
     const SEP = " | "; // pipe delimiter between inline fields
     const lines: string[] = [];
 
-    // 1) Progress first — only while a turn is live (cleared when it ends), so
-    //    the collapsed pin preview shows how far along the current task is.
+    // 1) Active plan board first (always above the progress bar) so the user
+    //    always sees done / in-progress / pending steps while a plan is live.
+    const plan = rt.planBoard;
+    if (plan) lines.push(plan);
+
+    // 2) Progress — only while a turn is live (cleared when it ends).
     if (progress !== undefined) lines.push(`\u{1F4C8} ${progressBar(progress)}`);
 
-    // 2) Activity: state + only the counters that currently apply.
+    // 3) Activity: state + only the counters that currently apply.
     const activity: string[] = [rt.isBusy ? "\u23F3 Working" : "\u2705 Idle"];
     if (rt.queueLength > 0) activity.push(`\u{1F4E5} ${rt.queueLength} queued`);
     if (running > 1) activity.push(`\u{1F9ED} ${running} sessions`);
@@ -61,13 +65,22 @@ export class StatusPanel {
     if (subagents) activity.push(`\u{1F465} ${subagents}`);
     lines.push(activity.join(SEP));
 
-    // 3) Where: project | session | context usage.
+    // 3b) What is happening now / last summary (same source as Running cards).
+    // Prefer plan one-liner over a redundant tool-step when a plan is active.
+    const comment = rt.planSummary && rt.isBusy ? undefined : rt.cardComment;
+    if (comment) {
+      const icon = rt.isBusy ? "\u23F3" : "\u{1F4AC}";
+      const shown = comment.length > 120 ? `${comment.slice(0, 119)}\u2026` : comment;
+      lines.push(`${icon} ${shown}`);
+    }
+
+    // 4) Where: project | session | context usage.
     const loc = [`\u{1F4C1} ${project}`, `\u{1F9F5} ${session}`];
     if (ctxPct !== undefined) loc.push(`\u{1F4CA} ${ctxPct.toFixed(0)}% context`);
     lines.push(loc.join(SEP));
 
-    // 4) How: agent | reasoning | model.
-    lines.push([`\u{1F916} ${s.agent || "default"}`, `\u{1F9E0} ${reasoningLabel(s.reasoning)}`, `\u{1F9E9} ${s.model || "default"}`].join(SEP));
+    // 5) How: reasoning | model (agent picker removed — plan mode is automatic).
+    lines.push([`\u{1F9E0} ${reasoningLabel(s.reasoning)}`, `\u{1F9E9} ${s.model || "default"}`].join(SEP));
 
     return lines.join("\n");
   }

package/src/bot/prompt-content.ts

@@ -66,6 +66,9 @@ export function mergeInputs(inputs: PromptInput[]): PromptInput {
   const quotes = inputs
     .map((i) => i.quotedText?.trim())
     .filter((q): q is string => !!q);
+  // Preserve meta flags: auto-suggestion batches / self-recheck must not re-arm
+  // another recheck after merge (dropping this caused infinite recheck loops).
+  const skipSelfRecheck = inputs.some((i) => i.skipSelfRecheck);
   return {
     text: inputs
       .map((i) => i.text)
@@ -75,6 +78,7 @@ export function mergeInputs(inputs: PromptInput[]): PromptInput {
     resourceLinks: inputs.flatMap((i) => i.resourceLinks ?? []),
     replyTo: inputs.find((i) => i.replyTo !== undefined)?.replyTo,
     quotedText: quotes.length > 0 ? [...new Set(quotes)].join("\n\n---\n\n") : undefined,
+    skipSelfRecheck: skipSelfRecheck || undefined,
   };
 }
 

package/src/bot/session-fork.ts

@@ -33,3 +33,14 @@ export function buildPriming(transcript: string): string {
     "=== END TRANSCRIPT ===",
   ].join("\n");
 }
+
+/**
+ * First-turn prompt body used after a foreign-session import. The heavy
+ * transcript lives in {@link SessionRuntime}'s primingContext; this is the
+ * short user message that flushes priming into the live Grok session.
+ */
+export const IMPORT_CONFIRM_PROMPT =
+  "Session import complete. Confirm you have the full imported context " +
+  "(read the transcript file if anything was truncated inline). " +
+  "Reply with a one-line ready confirmation: project path + one-sentence " +
+  "summary of the task so far. Do not continue work until I send the next message.";