paseo-smart-session 3.2.0 → 3.4.0

package/README.md

@@ -35,7 +35,7 @@ Each session has one pill above its message box: a ring of its context, with a t
 
 ![Pressing the context ring above the message box, then following it to the Smart Session screen and sweeping the window chart: recorded usage up to now, the projection at this pace, and the stretch after it runs out](docs/media/smart-session-flow.gif)
 
-![Two popovers of the one pill. Left: 34% of a 1M context, past its compact line, task state and last compaction, then the Smart Compact and Pause at the limit switches for this session. Right: the same pill while paused, reading Resumes 6:27 AM, with Cancel continuation and a link to all paused sessions](docs/media/smart-session-pill.png)
+![Two popovers of the one pill. Left: 13% of a 1M context, task state and last compaction, the subscription the session runs on (CLI login, 5h 76%, week 46%: runs out around 2:14 AM, then ZeroSub moves it to Account 3), then the Smart Compact and Pause at the limit (Session Guard) switches for this session. Right: the same pill while paused, reading Resumes 6:27 AM, with Resume now, Dismiss pause and a link to all paused sessions](docs/media/smart-session-pill.png)
 
 Agents get these tools:
 
@@ -59,7 +59,23 @@ After compaction, the agent chooses to stop (`continue_after_compaction: false`)
 
 The forecast uses the last half hour for the session window and the window's own average for a week, so a burst of work doesn't read as "the week runs out tonight".
 
-## Pause at the limit
+## Every ZeroSub subscription
+
+With [ZeroSub](https://github.com/kapybara-org/zerosub) running several Claude or Codex subscriptions, the question becomes how long all of them last, which one is next, and whether the work makes it to a reset. ZeroSub manages the accounts; Smart Session adds the time.
+
+- **The pool, as a time.** The overview leads with "Claude · 3 subscriptions last until about 9:40 PM", or "Both Claude subscriptions are at the limit · first one back at 5:58 PM". The forecast runs each account's own pace forward and moves work the way ZeroSub does, to the account with the most room, through each account's resets.
+- **A runway.** One lane per account across the next 12 hours: in use, room, at the limit. Reading down a column says who carries the work then.
+- **One row per account.** The name you gave it in ZeroSub (else "CLI login" or "Account 2", never the email), the 5-hour and weekly windows with their resets, the sessions on it, when it runs out, and how old its reading is. Codex credits show when ZeroSub reports them.
+- **Everywhere else.** The sidebar row summarises the pool, amber or red only when the pool is in trouble. The pill's popover says which subscription the session runs on and what happens at its limit. `budget_status` tells agents the pooled runway and which account is next.
+
+Smart Session keeps each account's readings in its own history (by ZeroSub's account id, never the email), so every account has a pace. ZeroSub's files are only read. A reading older than half an hour says so and adds no pace. Without ZeroSub, nothing changes.
+
+<picture>
+  <source media="(prefers-color-scheme: light)" srcset="docs/media/smart-session-subscriptions-light.png">
+  <img alt="The Smart Session overview with ZeroSub: the headline Claude · 3 subscriptions last past Sat 1:05 AM, Account 3 takes over at 2:12 AM, then Personal at 10:03 AM. A runway with one lane per Claude account showing when each is in use, has room or is at the limit, a row per account with its 5-hour and weekly windows, reset times and when it runs out, and a Codex card with credits" src="docs/media/smart-session-subscriptions.png">
+</picture>
+
+## Pause at the limit (Session Guard)
 
 When the provider's session window is spent, Smart Session pauses running sessions instead of letting them fail, and continues the same conversations once the window resets, even with the app closed. It is **off by default**: turn it on from the overview or in settings. It was the standalone [Session Guard](https://github.com/tomgrin10/paseo-session-guard) plugin, and its per-session choices and waiting pauses carry over.
 
@@ -71,7 +87,7 @@ If the standalone Session Guard plugin is still enabled, it keeps doing the paus
 
 On a phone, the pill opens as a sheet and every screen fits one column.
 
-![Smart Session at phone width: the overview leading with paused sessions, the pill's sheet while paused, and the settings screen](docs/media/smart-session-mobile.png)
+![Smart Session at phone width: the overview with every subscription and its runway, the pill's sheet while paused, and the settings screen with Pause at the limit (Session Guard)](docs/media/smart-session-mobile.png)
 
 ## Settings
 
@@ -83,7 +99,7 @@ Everything is on one screen, **Settings → Plugins → Smart Session**, in the
 | | Enrol sessions automatically | On | Enrol a session once it writes task state |
 | When to ask | Windows of 400k or more | 30% | Where large windows are asked to compact |
 | | Smaller windows | 85% | Where smaller windows are asked to compact |
-| Pause at the limit | Pause at the limit | Off | Pause sessions at the session limit |
+| Pause at the limit (Session Guard) | Pause at the limit (Session Guard) | Off | Pause sessions at the session limit |
 | | Sessions | Every session | Or only the ones you turn on from their pill |
 | | Continue after the reset | On | Off, you continue each one by hand |
 | | Include native subagents | On | Freeze nested workers too (Linux) |
@@ -95,13 +111,13 @@ Everything is on one screen, **Settings → Plugins → Smart Session**, in the
 
 Hiding the row or the pill never turns a feature off.
 
-![The Smart Session settings screen: Smart Compact, When to ask, Pause at the limit, Display, Claude Code and Limit timing](docs/media/smart-session-settings.png)
+![The Smart Session settings screen: Smart Compact, When to ask, Pause at the limit (Session Guard), Display, Claude Code and Limit timing](docs/media/smart-session-settings.png)
 
 ## Data and access
 
-Everything lives in `$PASEO_HOME/plugin-data/smart-session/`: monthly usage and context logs, compaction records, an hourly spend index by model, workspace and agent type, and one `state/<agentId>.md` per agent. Logs are append-only, and a damaged line is skipped rather than risking the rest.
+Everything lives in `$PASEO_HOME/plugin-data/smart-session/`: monthly usage and context logs (and, with ZeroSub, a monthly log of each subscription's readings, keyed by account id), compaction records, an hourly spend index by model, workspace and agent type, and one `state/<agentId>.md` per agent. Logs are append-only, and a damaged line is skipped rather than risking the rest.
 
-Paseo plugins run trusted, unsandboxed code on the daemon host. Smart Session reads local Claude Code usage data and talks only to the local daemon. For password-protected daemons it reads `PASEO_PASSWORD`, then `PASEO_PASSWORD_FILE`, then `~/paseo-hub/secrets/daemon-password`, and never writes or logs it.
+Paseo plugins run trusted, unsandboxed code on the daemon host. Smart Session reads local Claude Code usage data, reads ZeroSub's account registry and usage readings when ZeroSub is enabled (never its account homes or credentials), and talks only to the local daemon. For password-protected daemons it reads `PASEO_PASSWORD`, then `PASEO_PASSWORD_FILE`, then `~/paseo-hub/secrets/daemon-password`, and never writes or logs it.
 
 ## Development
 

package/client/display.tsx

@@ -30,8 +30,8 @@ export function contributeDisplay(client: PluginClientContext, live: Live) {
         active={currentScreen?.screenId === OVERVIEW_SCREEN || currentScreen?.screenId === "paused-sessions"}
         onPress={() => openScreen({ screenId: OVERVIEW_SCREEN })}
         trailing={trailing === null ? undefined : trailing.tone === "muted"
-          ? <Text accessibilityLabel={`Session window ${trailing.label} used`} numberOfLines={1} style={{ color: c.foregroundMuted, fontSize: 12, lineHeight: 16, ...tabular }}>{trailing.label}</Text>
-          : <Chip theme={theme} icon={trailing.label.endsWith("paused") ? "Pause" : undefined} label={trailing.label} color={toneColor(c, trailing.tone)} />}
+          ? <Text accessibilityLabel={trailing.a11y} numberOfLines={1} style={{ color: c.foregroundMuted, fontSize: 12, lineHeight: 16, ...tabular }}>{trailing.label}</Text>
+          : <Chip theme={theme} icon={trailing.label.endsWith("paused") ? "Pause" : undefined} label={trailing.label} color={toneColor(c, trailing.tone)} accessibilityLabel={trailing.a11y} />}
       />
     );
   }

package/client/kit.tsx

@@ -85,10 +85,10 @@ export function CardRow({ theme, onPress, accessibilityLabel, children, style, f
 }
 
 /** A count or status tag in its own hue at 12–16%. */
-export function Chip({ theme, label, color, icon }: { theme: Theme; label: string; color?: string; icon?: string }) {
+export function Chip({ theme, label, color, icon, accessibilityLabel }: { theme: Theme; label: string; color?: string; icon?: string; accessibilityLabel?: string }) {
   const c = theme.colors;
   const hue = color ?? c.foregroundMuted;
-  return <View style={{ flexDirection: "row", alignItems: "center", gap: 4, paddingHorizontal: 7, paddingVertical: 1, borderRadius: 999, backgroundColor: tint(hue, c), alignSelf: "center" }}>
+  return <View accessible={accessibilityLabel !== undefined} accessibilityLabel={accessibilityLabel} style={{ flexDirection: "row", alignItems: "center", gap: 4, paddingHorizontal: 7, paddingVertical: 1, borderRadius: 999, backgroundColor: tint(hue, c), alignSelf: "center" }}>
     {icon ? <Icon name={icon} size={11} color={hue} /> : null}
     <Text numberOfLines={1} style={{ color: hue, fontSize: 11, lineHeight: 16, fontWeight: "600", ...tabular }}>{label}</Text>
   </View>;

package/client/live.ts

@@ -1,9 +1,10 @@
 import { useSyncExternalStore } from "react";
 import type { z } from "zod";
 
-import type { budgetStatus } from "../shared/smart-session";
+import type { budgetStatus, subscriptionsStatus } from "../shared/smart-session";
 
 type Budget = z.infer<(typeof budgetStatus)["output"]>;
+type Subscriptions = z.infer<(typeof subscriptionsStatus)["output"]>;
 
 /**
  * What the sidebar row shows, fed by the polls that already run: the budget from
@@ -15,13 +16,17 @@ export interface Live {
   version(): number;
   budget(): Budget | null;
   paused(): { waiting: number; attention: number };
+  /** ZeroSub's accounts, when it runs here; the row then speaks for the pool. */
+  subscriptions(): Subscriptions | null;
   setBudget(budget: Budget): void;
+  setSubscriptions(next: Subscriptions): void;
   setPaused(counts: { waiting: number; attention: number }): void;
 }
 
 export function createLive(): Live {
   let budget: Budget | null = null;
   let paused = { waiting: 0, attention: 0 };
+  let subscriptions: Subscriptions | null = null;
   let version = 0;
   const listeners = new Set<() => void>();
   const notify = () => {
@@ -36,7 +41,9 @@ export function createLive(): Live {
     version: () => version,
     budget: () => budget,
     paused: () => paused,
+    subscriptions: () => subscriptions,
     setBudget(next) { budget = next; notify(); },
+    setSubscriptions(next) { subscriptions = next; notify(); },
     setPaused(next) {
       if (next.waiting === paused.waiting && next.attention === paused.attention) return;
       paused = next; notify();

package/client/overview.tsx

@@ -16,6 +16,9 @@ import { budgetStatus, contextStatus, getSettings, installStatus, setSettings, s
 import { DailyBars, HourHeatmap, Meter, PastWindows, RankedTotals, Ring, WindowChart, ink, toneFill } from "./charts";
 import { Exceptions, PausedSection } from "./guard/paused";
 import { guardSnapshot, refreshGuard, subscribeGuard } from "./guard/status";
+import { hasSubscriptions, pools, subscribeSubscriptions, subscriptionsSnapshot } from "./subscriptions";
+import { familyName, leadPool, poolHeadline, poolTrailing, subscriptionState } from "../shared/subscriptions";
+import { SubscriptionsSection } from "./subscriptions-view";
 import { Card, CardRow, Chip, IconButton, SectionHead, StatusGlyph, Switch, TextLink, errorText, text, useNow } from "./kit";
 import type { Live } from "./live";
 import { Reveal, Skeleton } from "./motion";
@@ -36,11 +39,12 @@ function toneIcon(tone: Tone, state: WindowForecast["state"] | null): string {
 }
 
 /** A meter row for one plan window: label and percentage, meter, reset and pace. */
-function WindowRow({ theme, f, now, first, children }: { theme: Theme; f: WindowForecast; now: number; first: boolean; children?: ReactNode }) {
+function WindowRow({ theme, f, now, first, children, quiet = false, note = null }: { theme: Theme; f: WindowForecast; now: number; first: boolean; children?: ReactNode; quiet?: boolean; note?: string | null }) {
   const c = theme.colors;
   const t = text(c);
-  const pace = paceLine(f, now);
-  const budget = f.id === "five_hour" ? budgetLine(f) : null;
+  // Quiet: the Subscriptions section already says when this window runs out.
+  const pace = quiet ? "" : paceLine(f, now);
+  const budget = f.id === "five_hour" && !quiet ? budgetLine(f) : null;
   return <CardRow theme={theme} first={first} style={{ gap: 6 }}>
     <View style={{ flexDirection: "row", alignItems: "baseline", gap: 8 }}>
       <Text style={{ ...t.label, flex: 1 }}>{f.label}</Text>
@@ -53,6 +57,7 @@ function WindowRow({ theme, f, now, first, children }: { theme: Theme; f: Window
       {pace ? <Text style={{ ...t.meta, color: f.state === "short" || f.state === "full" ? toneColor(c, f.tone) : c.foregroundMuted, fontWeight: f.state === "short" ? "600" : "400" }}>{pace}</Text> : null}
       {budget ? <Text style={t.meta}>{budget}</Text> : null}
     </View>
+    {note ? <Text style={{ ...t.meta, color: c.statusDanger }}>{note}</Text> : null}
     {children}
   </CardRow>;
 }
@@ -136,6 +141,16 @@ export function makeOverview(client: PluginClientContext, live: Live) {
     const installQuery = useQuery({ queryKey: ["smart-session", "install"], queryFn: () => readInstall({}), refetchInterval: 5 * 60_000 });
     // The pill's own status poll; this screen only reads it.
     const guard = useSyncExternalStore(subscribeGuard, guardSnapshot, guardSnapshot) ?? undefined;
+    // ZeroSub's subscriptions, from the bundle's own poll; null or empty without ZeroSub.
+    const subs = useSyncExternalStore(subscribeSubscriptions, subscriptionsSnapshot, subscriptionsSnapshot);
+    const multi = hasSubscriptions(subs);
+    const subPools = multi ? pools(subs, now) : [];
+    const poolLead = leadPool(subPools.filter((p) => p.total > 1), now);
+    // The CLI's newer limit notice outranks the recorder's last reading; the history row says so.
+    const cliOut = multi ? subs.accounts.find((a) => a.id === "claude-main") : undefined;
+    const cliState = cliOut ? subscriptionState(cliOut, now) : null;
+    const cliOutNote = cliState?.kind === "limit" ? `ZeroSub reports this login ${cliState.label.charAt(0).toLowerCase()}${cliState.label.slice(1)}` : null;
+    const poolHead = poolLead === null || !multi ? null : poolHeadline(poolLead, subs.accounts.filter((a) => a.family === poolLead.family), now);
     const focus = params?.focus === "paused" ? "paused" : null;
     const scroller = useRef<ScrollViewType>(null);
     const pausedY = useRef<number | null>(null);
@@ -151,7 +166,10 @@ export function makeOverview(client: PluginClientContext, live: Live) {
     useEffect(() => { if (guardValues !== undefined) refreshGuard(); }, [guardValues]);
 
     const settings = settingsQuery.data?.settings;
-    const forecasts = (budgetQuery.data?.windows ?? []).filter(isInteresting).map((w) => forecastWindow(w, now)).sort((a, b) => ORDER(a.id) - ORDER(b.id) || b.pct - a.pct);
+    // A limit ZeroSub recorded on the CLI login is newer than the recorder's last reading: the session window is full until then.
+    const forecasts = (budgetQuery.data?.windows ?? []).filter(isInteresting)
+      .map((w) => w.id === "five_hour" && cliState?.kind === "limit" && cliState.until !== null ? { ...w, pct: 100, resetsAt: new Date(cliState.until).toISOString(), burnPctPerHour: null } : w)
+      .map((w) => forecastWindow(w, now)).sort((a, b) => ORDER(a.id) - ORDER(b.id) || b.pct - a.pct);
     const lead = leadWindow(forecasts);
     const head = budgetQuery.data === undefined ? null : headline(lead, now);
     const session = budgetQuery.data?.windows.find((w) => w.id === "five_hour");
@@ -209,6 +227,13 @@ export function makeOverview(client: PluginClientContext, live: Live) {
       const auto = guard?.policy.autoResume !== false;
       // Paused sessions have their own section and the lead; this line keeps to the rule.
       if (paused.length > 0) return { line: `${paused.length} paused · listed above`, tone: "default" };
+      // Under ZeroSub the pause comes only once no subscription has room: say when that is.
+      const claudePool = subPools.find((p) => p.family === "claude" && p.total > 1);
+      if (claudePool && subs?.autoSwitch) {
+        if (claudePool.runsOutAt !== null && claudePool.runsOutAt <= now) return { line: `No Claude subscription has room · a running session pauses${claudePool.backAt !== null ? ` until ${formatMoment(new Date(claudePool.backAt).toISOString(), now)}` : ""}`, tone: "warning" };
+        if (claudePool.runsOutAt !== null) return { line: `ZeroSub switches first · pauses sessions at ~${formatMoment(new Date(claudePool.runsOutAt).toISOString(), now)}, when no subscription has room`, tone: "default" };
+        return { line: "ZeroSub switches first · pauses only when no subscription has room", tone: "default" };
+      }
       const threshold = guard?.policy.thresholdPct ?? 100;
       const s5 = lead?.id === "five_hour" ? lead : null;
       if (s5 && s5.pct >= threshold) {
@@ -224,11 +249,14 @@ export function makeOverview(client: PluginClientContext, live: Live) {
     })();
 
     // While something is paused here, that is the news; the plan forecast moves to the line below.
-    const title = pauseLead !== null ? pauseLead.title : head?.title ?? null;
+    // Under ZeroSub the pool is the plan: how long all the subscriptions last, not one login.
+    const planHead = poolHead ?? head;
+    const title = pauseLead !== null ? pauseLead.title : planHead?.title ?? null;
     const autoResume = guard?.policy.enabled === true && guard.policy.autoResume;
-    const detail = pauseLead !== null ? [head?.title, pauseLead.shared !== null ? `in ${formatDuration(pauseLead.shared - now)}` : null, autoResume ? "each continues in its own conversation" : "continue each by hand"].filter(Boolean).join(" · ") : head?.detail ?? null;
+    const detail = pauseLead !== null ? [planHead?.title, pauseLead.shared !== null ? `in ${formatDuration(pauseLead.shared - now)}` : null, autoResume ? "each continues in its own conversation" : "continue each by hand"].filter(Boolean).join(" · ") : planHead?.detail ?? null;
     const glyph = pauseLead !== null ? { icon: pauseLead.tone === "danger" ? "TriangleAlert" : "Pause", color: toneColor(c, pauseLead.tone) }
-      : head ? { icon: toneIcon(head.tone, lead?.state ?? null), color: head.tone === "default" ? c.foregroundMuted : toneColor(c, head.tone) } : null;
+      : poolHead ? { icon: poolHead.tone === "danger" ? "OctagonAlert" : poolHead.tone === "warning" ? "Hourglass" : "Layers", color: poolHead.tone === "default" ? c.foregroundMuted : toneColor(c, poolHead.tone) }
+        : head ? { icon: toneIcon(head.tone, lead?.state ?? null), color: head.tone === "default" ? c.foregroundMuted : toneColor(c, head.tone) } : null;
     const header = <View style={{ flexDirection: "row", alignItems: "flex-start", gap: 10 }}>
       {glyph ? <View style={{ paddingTop: compact ? 3 : 5 }}><Icon name={glyph.icon} size={compact ? 17 : 19} color={glyph.color} /></View> : null}
       <View style={{ flex: 1, gap: 4 }}>
@@ -252,13 +280,15 @@ export function makeOverview(client: PluginClientContext, live: Live) {
         {header}
         {error ? <Text accessibilityRole="alert" style={{ ...t.meta, color: c.statusDanger }}>{error}</Text> : null}
         {pausedSection}
+        {multi ? <SubscriptionsSection theme={theme} compact={compact} accounts={subs.accounts} pools={subPools} now={now} autoSwitch={subs.autoSwitch} leadFamily={pauseLead === null && poolHead !== null ? poolLead?.family ?? null : null} /> : null}
 
         <View style={{ gap: 8 }}>
-          <SectionHead theme={theme} title="Plan limits" />
+          {/* Under ZeroSub these are the CLI login's windows, with the recorder's full history. */}
+          <SectionHead theme={theme} title={multi ? "CLI login · history" : "Plan limits"} />
           {budgetQuery.data === undefined ? <LoadingCard theme={theme} />
             : forecasts.length === 0 ? <Empty theme={theme} title="No reading yet" detail="Smart Session records Claude's plan usage every minute while Paseo runs. The first reading usually arrives within a few minutes of signing in to Claude on this host." />
               : <Reveal><Card theme={theme}>
-                {forecasts.map((f, i) => <WindowRow key={f.id} theme={theme} f={f} now={now} first={i === 0}>
+                {forecasts.map((f, i) => <WindowRow key={f.id} theme={theme} f={f} now={now} first={i === 0} quiet={multi && (f.id === "five_hour" || f.id === "seven_day")} note={f.id === "five_hour" ? cliOutNote : null}>
                   {f.id === "five_hour" && session?.history && session.history.length > 0 ? <View style={{ gap: 14, paddingTop: 10 }}>
                     <WindowChart theme={theme} forecast={f} history={session.history} now={now} compact={compact} guardPct={guardPct} />
                     {budgetQuery.data?.past && budgetQuery.data.past.length > 0 ? <View style={{ gap: 2 }}>
@@ -311,7 +341,7 @@ export function makeOverview(client: PluginClientContext, live: Live) {
               <Text style={{ ...t.meta, flex: 1, color: c.statusWarning }}>{hooksProblem}</Text>
             </View> : null}
           </FeatureRow>
-          <FeatureRow theme={theme} first={false} icon="CirclePause" title="Pause at the limit" line={guardState.line} tone={guardState.tone} on={guardOn} compact={compact} disabled={guardSettings.saving} onToggle={toggleGuard}
+          <FeatureRow theme={theme} first={false} icon="CirclePause" title="Pause at the limit (Session Guard)" line={guardState.line} tone={guardState.tone} on={guardOn} compact={compact} disabled={guardSettings.saving} onToggle={toggleGuard}
             links={<TextLink theme={theme} compact={compact} label="Settings" onPress={() => client.openSettings(SMART_COMPACT_SETTINGS)} />}>
             {guard !== undefined && guardOn ? <Exceptions theme={theme} layout={layout} status={guard} titleOf={titleOf} /> : null}
           </FeatureRow>
@@ -363,18 +393,29 @@ export function makeOverview(client: PluginClientContext, live: Live) {
   };
 }
 
-/** The sidebar row's right slot: what is paused, else the session window. */
-export function sidebarTrailing(live: Live, now: number): { label: string; tone: Tone | "muted" } | null {
+/** The sidebar row's right slot: what is paused, else the pool of subscriptions, else the session window. */
+export function sidebarTrailing(live: Live, now: number): { label: string; tone: Tone | "muted"; a11y: string } | null {
   const paused = live.paused();
-  if (paused.attention > 0) return { label: `${paused.attention + paused.waiting} paused`, tone: "danger" };
-  if (paused.waiting > 0) return { label: `${paused.waiting} paused`, tone: "warning" };
+  if (paused.attention > 0) return { label: `${paused.attention + paused.waiting} paused`, tone: "danger", a11y: `${paused.attention + paused.waiting} sessions paused` };
+  if (paused.waiting > 0) return { label: `${paused.waiting} paused`, tone: "warning", a11y: `${paused.waiting} sessions paused` };
+  // Under ZeroSub one login is not the story: the row speaks for the pool, and is
+  // amber or red only when the pool, not a single account, runs short.
+  const subs = live.subscriptions();
+  if (hasSubscriptions(subs)) {
+    const pool = leadPool(pools(subs, now), now);
+    if (pool !== null && pool.total > 1) {
+      const slot = poolTrailing(pool, now);
+      const fam = familyName(pool.family);
+      const a11y = slot.tone === "muted" ? `${fam}: ${pool.withRoom} of ${pool.total} subscriptions with room` : `${fam} subscriptions: ${slot.label}`;
+      return { ...slot, a11y };
+    }
+  }
   const windows = live.budget()?.windows ?? [];
   const session = windows.find((w) => w.id === "five_hour");
   if (session === undefined) return null;
   const f = forecastWindow(session, now);
   // Usage is a time: when the window runs out first, the row says when.
-  if (f.state === "short" && f.runsOutAt) return { label: `out ${formatMoment(f.runsOutAt, now)}`, tone: f.tone };
-  if (f.state === "full") return { label: "at limit", tone: "danger" };
-  return { label: `${Math.round(f.pct)}%`, tone: "muted" };
+  if (f.state === "short" && f.runsOutAt) return { label: `out ${formatMoment(f.runsOutAt, now)}`, tone: f.tone, a11y: `Session window runs out ${formatMoment(f.runsOutAt, now)}` };
+  if (f.state === "full") return { label: "at limit", tone: "danger", a11y: "Session window at the limit" };
+  return { label: `${Math.round(f.pct)}%`, tone: "muted", a11y: `Session window ${Math.round(f.pct)}% used` };
 }
-

package/client/popover.tsx

@@ -18,6 +18,8 @@ import { Button, Switch, TextLink, errorText, text, useNow } from "./kit";
 import { noteEnrolment, pillSnapshot, subscribePills } from "./pill-store";
 import { tabular, toneColor } from "./theme";
 import { SETTINGS_SCREEN } from "./screens";
+import { hasSubscriptions, subscribeSubscriptions, subscriptionsSnapshot } from "./subscriptions";
+import { atTheLimit, sessionWindow, subscriptionState, weeklyWindow } from "../shared/subscriptions";
 
 /** What the last compaction did, in one line. */
 function compactionLine(item: CompactionRequest | undefined, now: number): string {
@@ -38,6 +40,7 @@ export function makeContextPopover(client: PluginClientContext, agents: AgentDir
     const now = useNow(15_000);
     const pills = useSyncExternalStore(subscribePills, pillSnapshot, pillSnapshot);
     const guard = useSyncExternalStore(subscribeGuard, guardSnapshot, guardSnapshot);
+    const subs = useSyncExternalStore(subscribeSubscriptions, subscriptionsSnapshot, subscriptionsSnapshot);
     useSyncExternalStore(agents.subscribe, agents.version, agents.version);
     const readContext = useRpc(contextStatus);
     const readCompactions = useRpc(listCompactions);
@@ -112,6 +115,21 @@ export function makeContextPopover(client: PluginClientContext, agents: AgentDir
       ["Task state", state === null ? (row === undefined ? "…" : "Not written yet") : `Saved ${formatRelative(state, now)}`],
       ["Last compaction", compactions.data === undefined ? "…" : compactionLine(latest, now)],
     ];
+    // Under ZeroSub with several subscriptions: which one this session runs on, and what happens at its limit.
+    const account = (() => {
+      if (!hasSubscriptions(subs)) return null;
+      const own = subs.accounts.find((a) => a.id === subs.agents[agentId]);
+      if (!own || subs.accounts.filter((a) => a.family === own.family).length < 2) return null;
+      const pct = (w: { pct: number; resetsAt: string | null } | null) => w === null ? null : w.resetsAt !== null && Date.parse(w.resetsAt) <= now ? 0 : Math.round(w.pct);
+      const s5 = pct(sessionWindow(own));
+      const week = pct(weeklyWindow(own));
+      const state = subscriptionState(own, now);
+      const windows = [s5 === null ? null : `5h ${s5}%`, week === null ? null : `week ${week}%`].filter(Boolean).join(" · ");
+      const value = [own.name, state.kind === "room" ? windows : state.label].filter(Boolean).join(" · ");
+      const next = atTheLimit(subs.accounts, own.id, now, { autoSwitch: subs.autoSwitch, protectedHere: protection.kind === "on" && protection.protected });
+      return { value, next, tone: state.kind === "limit" ? "danger" as const : null };
+    })();
+    if (account) facts.push(["Subscription", account.value]);
     const ringColor = head === null ? c.foregroundMuted : head.outlook.tone !== "default" ? toneFill(c, head.outlook.tone) : enrolled ? c.foreground : c.foregroundMuted;
     const part = { gap: 6, paddingTop: 10, borderTopWidth: 1, borderTopColor: c.border } as const;
 
@@ -157,12 +175,12 @@ export function makeContextPopover(client: PluginClientContext, agents: AgentDir
       if (protection.kind === "unknown") return null;
       if (protection.kind === "on") {
         const meta = protection.protected
-          ? `Pauses at ${protection.thresholdPct}% of the session window, ${protection.autoResume ? "continues after the reset" : "you continue it after the reset"}`
+          ? `Pauses at ${protection.thresholdPct}%, ${protection.autoResume ? "continues after the reset" : "you continue after the reset"}`
           : "Off for this session · at the limit the provider refuses work and nothing continues it";
         const source = protection.override === null ? (protection.byDefault ? "Your default" : "Your default is off") : "Changed for this session";
         return <View style={{ flexDirection: "row", alignItems: "center", gap: 12 }}>
           <View style={{ flex: 1, gap: 2 }}>
-            <Text style={t.label}>Pause at the limit</Text>
+            <Text style={t.label}>Pause at the limit (Session Guard)</Text>
             <Text style={t.meta}>{meta}</Text>
             <View style={{ flexDirection: "row", alignItems: "center", gap: 10, flexWrap: "wrap" }}>
               <Text style={t.small}>{source}</Text>
@@ -173,9 +191,9 @@ export function makeContextPopover(client: PluginClientContext, agents: AgentDir
         </View>;
       }
       // Not running here: one calm line, and where to change it.
-      const line = protection.kind === "off" ? "Pause at the limit is off on this host"
-        : protection.kind === "elsewhere" ? (protection.standalone ? "The standalone Session Guard plugin handles pausing at the limit here" : "Another process handles pausing at the limit here")
-          : (governorNotice(guard!)?.title ?? "Pause at the limit isn't running");
+      const line = protection.kind === "off" ? "Pause at the limit (Session Guard) is off on this host"
+        : protection.kind === "elsewhere" ? (protection.standalone ? "The standalone Session Guard plugin handles pausing at the limit here" : "Another process runs Session Guard here")
+          : `${governorNotice(guard!)?.title ?? "Pause at the limit isn't running"} (Session Guard)`;
       return <View style={{ flexDirection: "row", alignItems: "center", gap: 8 }}>
         <Icon name="CirclePause" size={13} color={c.foregroundMuted} />
         <Text style={{ ...t.meta, flex: 1 }}>{line}</Text>
@@ -202,14 +220,15 @@ export function makeContextPopover(client: PluginClientContext, agents: AgentDir
       {pausePart !== null ? null : <View style={part}>
         {facts.map(([label, value]) => <View key={label} style={{ flexDirection: "row", gap: 12 }}>
           <Text style={{ ...t.meta, width: 112 }}>{label}</Text>
-          <Text style={{ ...t.meta, flex: 1, color: c.foreground, ...tabular }}>{value}</Text>
+          <Text style={{ ...t.meta, flex: 1, color: label === "Subscription" && account?.tone ? toneColor(c, account.tone) : c.foreground, ...tabular }}>{value}</Text>
         </View>)}
+        {account && account.next.text ? <Text style={{ ...t.meta, paddingLeft: 124, color: account.next.tone === "default" ? c.foregroundMuted : toneColor(c, account.next.tone) }}>{account.next.text}</Text> : null}
       </View>}
       <View style={{ ...part, gap: 12 }}>
         {compactOn ? <View style={{ flexDirection: "row", alignItems: "center", gap: 12 }}>
           <View style={{ flex: 1, gap: 2 }}>
             <Text style={t.label}>Smart Compact</Text>
-            <Text style={t.meta}>{enrolled ? `Asked to compact itself once past ${head?.compactAtPct ?? "its"}%${head === null ? " line" : ""}. Never forced.` : "Never asked to compact. The agent can still request it."}</Text>
+            <Text style={t.meta}>{enrolled ? `Asked once past ${head?.compactAtPct ?? "its"}%${head === null ? " line" : ""}. Never forced.` : "Never asked to compact. The agent can still request it."}</Text>
           </View>
           <Switch theme={theme} label="Smart Compact for this session" hideLabel value={enrolled} disabled={saving !== null} compact={compact} onChange={(next) => void toggleCompact(next)} />
         </View> : <View style={{ flexDirection: "row", alignItems: "center", gap: 8 }}>

package/client/settings.tsx

@@ -152,7 +152,7 @@ export function makeSettings(client: PluginClientContext) {
         </SettingsCard>
       </SettingsSection>
 
-      <SettingsSection title="Pause at the limit" info="When the provider's session window is spent, a running session is paused instead of failing, then continued in the same conversation once the window resets. Formerly the Session Guard plugin; its choices and waiting pauses carry over.">
+      <SettingsSection title="Pause at the limit (Session Guard)" info="When the provider's session window is spent, a running session is paused instead of failing, then continued in the same conversation once the window resets. Choices and waiting pauses from the standalone Session Guard plugin carry over.">
         {guard.status === "loading" ? <ActivityIndicator accessibilityLabel="Loading Pause at the limit settings" color={c.foregroundMuted} style={{ padding: 16 }} />
           : guard.status !== "ready" ? <View style={{ gap: 8 }}>
             <Text accessibilityRole="alert" style={{ color: c.statusDanger }}>{guard.error}</Text>
@@ -163,7 +163,7 @@ export function makeSettings(client: PluginClientContext) {
           </View>
             : <SettingsCard>
               {elsewhere ? <SettingsRow label={elsewhere.title} hint={elsewhere.hint} /> : null}
-              <SettingsSwitch label="Pause at the limit" hint={guard.values.enabled ? `On. Sessions pause at ${guard.values.thresholdPct}% of the session window. Works while the app is closed.` : "Off until you turn it on. Turning it off lets frozen workers go; waiting continuations hold until you turn it back on or cancel them."}
+              <SettingsSwitch label="Pause at the limit (Session Guard)" hint={guard.values.enabled ? `On. Sessions pause at ${guard.values.thresholdPct}% of the session window. Works while the app is closed.` : "Off until you turn it on. Turning it off lets frozen workers go; waiting continuations hold until you turn it back on or cancel them."}
                 value={guard.values.enabled} disabled={guardBusy} onValueChange={(enabled) => changeGuard({ enabled }, enabled ? "Sessions pause at the limit" : "Pause at the limit off")} />
               <SettingsSelect label="Sessions" hint="Change any one session from its pill."
                 value={guard.values.protectByDefault ? "all" : "opt-in"} options={[{ label: "Every session", value: "all" }, { label: "Only ones I turn on", value: "opt-in" }]}
@@ -188,7 +188,7 @@ export function makeSettings(client: PluginClientContext) {
             </SettingsCard>
           </View>
             : <SettingsCard>
-              <SettingsSwitch label="Sidebar row" hint="Smart Session in the sidebar, with the session window's use, or how many sessions are paused."
+              <SettingsSwitch label="Sidebar row" hint="Smart Session in the sidebar, with the session window's use (with ZeroSub, how your subscriptions last), or how many sessions are paused."
                 value={display.values.showSidebar} disabled={display.saving} onValueChange={(showSidebar) => void display.save({ ...display.values, showSidebar }, display.revision)} />
               <SettingsSwitch label="Pill on every session" hint="The context ring above each message box. A paused session keeps its pill either way."
                 value={pillOn} disabled={saving || display.saving} onValueChange={(next) => void setPill(next)} />