feat(session): per-channel "current session" so Telegram and WhatsApp don't stomp each other

Until now `settings.json` had a single `currentSession` field that both
channels read and wrote. Switching sessions in Telegram silently moved
the WhatsApp cursor too (and vice versa), which made the two channels
fight over context whenever they were used in parallel.

This commit splits the cursor by channel:

- `Settings.currentSessionByChannel: { telegram?, whatsapp? }`
  is the new persisted shape. Each channel keeps its own active
  session; the OpenCode sessions themselves remain global, so
  `/sessions` in either channel still lists every session.
- `Settings.currentSession` is kept as a deprecated, read-only field
  for migration. On the first `loadSettings()` after upgrade, any
  legacy value is moved to `currentSessionByChannel.telegram`
  (Telegram has been the only channel until V1.x, so the assumption
  is safe). The legacy field is dropped from disk on the next write.
- `setCurrentSession(channel, info)` now takes the channel as a
  required first arg — TypeScript forces every call site to declare
  who owns the session, so no future call accidentally reads/writes
  the wrong slot.
- `getCurrentSession(channel?)` defaults to "telegram" so the dozens
  of read-only call sites in `src/bot/`, `src/attach/`,
  `src/pinned/`, `src/cron/` keep working unchanged.
- `clearSession(channel?)` clears only that channel; with no argument
  it clears both, used by global resets like `switchToProject`,
  `/start`, and the session/project mismatch recovery path.

Call sites updated:
- src/whatsapp/commands/{new,sessions,abort,status}.ts and
  src/whatsapp/handlers/prompt.ts now pass "whatsapp"
- src/bot/commands/{new,sessions,rename,commands}.ts and
  src/bot/handlers/prompt.ts now pass "telegram"

Tests: tests/session/per-channel-session.test.ts covers the new
read/write semantics, the migration from legacy single-slot config,
and the clearSession variants. 8 new tests; full suite green.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: JohanYP

src/bot/commands/commands.ts

@@ -401,7 +401,7 @@ async function ensureSessionForProject(
     directory: projectDirectory,
   };
 
-  setCurrentSession(sessionInfo);
+  setCurrentSession("telegram", sessionInfo);
   await ingestSessionInfoForCache(session);
   await ctx.reply(t("bot.session_created", { title: session.title }));
 

src/bot/commands/new.ts

@@ -53,7 +53,7 @@ export async function newCommand(ctx: CommandContext<Context>, deps: NewCommandD
       title: session.title,
       directory: currentProject.worktree,
     };
-    setCurrentSession(sessionInfo);
+    setCurrentSession("telegram", sessionInfo);
     clearAllInteractionState("session_created");
     await ingestSessionInfoForCache(session);
 

src/bot/commands/rename.ts

@@ -140,7 +140,7 @@ export async function handleRenameTextAnswer(ctx: Context): Promise<boolean> {
       throw error || new Error("Failed to update session");
     }
 
-    setCurrentSession({
+    setCurrentSession("telegram", {
       id: sessionInfo.sessionId,
       title: newTitle,
       directory: sessionInfo.directory,

src/bot/commands/sessions.ts

@@ -257,7 +257,7 @@ export async function handleSessionSelect(ctx: Context, deps: SessionSelectDeps)
       title: session.title,
       directory: currentProject.worktree,
     };
-    setCurrentSession(sessionInfo);
+    setCurrentSession("telegram", sessionInfo);
     clearAllInteractionState("session_switched");
 
     await ctx.answerCallbackQuery();

src/bot/handlers/prompt.ts

@@ -173,7 +173,7 @@ export async function processUserPrompt(
       directory: currentProject.worktree,
     };
 
-    setCurrentSession(currentSession);
+    setCurrentSession("telegram", currentSession);
     await ingestSessionInfoForCache(session);
     createdNewSession = true;
   } else {

src/session/manager.ts

@@ -4,17 +4,33 @@ import {
   clearSession as clearSettingsSession,
   SessionInfo,
 } from "../settings/manager.js";
+import type { Channel } from "../messenger/channel.js";
 
 export type { SessionInfo };
 
-export function setCurrentSession(sessionInfo: SessionInfo): void {
-  setSettingsSession(sessionInfo);
+/**
+ * Set the active session for a specific channel. Both arguments are
+ * required so call sites are forced to declare which surface owns the
+ * session — that's what keeps Telegram and WhatsApp from accidentally
+ * stomping on each other.
+ */
+export function setCurrentSession(channel: Channel, sessionInfo: SessionInfo): void {
+  setSettingsSession(channel, sessionInfo);
 }
 
-export function getCurrentSession(): SessionInfo | null {
-  return getSettingsSession() ?? null;
+/**
+ * Get the active session for a channel. Defaults to "telegram" when no
+ * channel is provided so legacy call sites in src/bot/* keep their
+ * historical semantics. WhatsApp call sites must pass `"whatsapp"`.
+ */
+export function getCurrentSession(channel: Channel = "telegram"): SessionInfo | null {
+  return getSettingsSession(channel) ?? null;
 }
 
-export function clearSession(): void {
-  clearSettingsSession();
+/**
+ * Clear the active session for a channel. Pass no argument to clear ALL
+ * channels (used by global resets like project switch).
+ */
+export function clearSession(channel?: Channel): void {
+  clearSettingsSession(channel);
 }

src/settings/manager.ts

@@ -3,8 +3,11 @@ import { cloneScheduledTask, type ScheduledTask } from "../scheduled-task/types.
 import type { TtsProvider } from "../config.js";
 import path from "node:path";
 import { getRuntimePaths } from "../runtime/paths.js";
+import type { Channel } from "../messenger/channel.js";
 import { logger } from "../utils/logger.js";
 
+const DEFAULT_CHANNEL: Channel = "telegram";
+
 export interface ProjectInfo {
   id: string;
   worktree: string;
@@ -65,7 +68,24 @@ export interface UiPreferences {
 
 export interface Settings {
   currentProject?: ProjectInfo;
+  /**
+   * @deprecated Single-slot session field kept ONLY for backwards
+   * compatibility with installs that pre-date per-channel sessions.
+   * On load it is migrated into `currentSessionByChannel.telegram` and
+   * deleted from disk on the next write. New code must read/write
+   * sessions through `currentSessionByChannel`.
+   */
   currentSession?: SessionInfo;
+  /**
+   * Per-channel "currently active" sessions. Each channel keeps its own
+   * cursor so opening a session in WhatsApp doesn't pull Telegram into
+   * it (and vice versa). The OpenCode sessions themselves are global —
+   * this map only tracks which one is active where.
+   */
+  currentSessionByChannel?: {
+    telegram?: SessionInfo;
+    whatsapp?: SessionInfo;
+  };
   currentAgent?: string;
   currentModel?: ModelInfo;
   pinnedMessageId?: number;
@@ -133,17 +153,42 @@ export function clearProject(): void {
   void writeSettingsFile(currentSettings);
 }
 
-export function getCurrentSession(): SessionInfo | undefined {
-  return currentSettings.currentSession;
-}
-
-export function setCurrentSession(sessionInfo: SessionInfo): void {
-  currentSettings.currentSession = sessionInfo;
+/**
+ * Read the active session for a channel. Defaults to "telegram" so older
+ * call sites that never specified a channel keep behaving like before
+ * (Telegram has been the only channel until V1.x). New WhatsApp code
+ * MUST pass `"whatsapp"` explicitly — `grep "getCurrentSession()" src/whatsapp/`
+ * should be zero after migration.
+ */
+export function getCurrentSession(channel: Channel = DEFAULT_CHANNEL): SessionInfo | undefined {
+  return currentSettings.currentSessionByChannel?.[channel];
+}
+
+/**
+ * Write the active session for a channel. The channel is REQUIRED to
+ * force every call site to declare which surface owns this session,
+ * preventing the easy bug of accidentally cross-pollinating channels.
+ */
+export function setCurrentSession(channel: Channel, sessionInfo: SessionInfo): void {
+  if (!currentSettings.currentSessionByChannel) {
+    currentSettings.currentSessionByChannel = {};
+  }
+  currentSettings.currentSessionByChannel[channel] = sessionInfo;
   void writeSettingsFile(currentSettings);
 }
 
-export function clearSession(): void {
-  currentSettings.currentSession = undefined;
+/**
+ * Clear the active session.
+ *   - With a channel: clears only that channel's cursor.
+ *   - Without arguments: clears ALL channels (used by reset / project switch).
+ */
+export function clearSession(channel?: Channel): void {
+  if (!currentSettings.currentSessionByChannel) return;
+  if (channel) {
+    delete currentSettings.currentSessionByChannel[channel];
+  } else {
+    currentSettings.currentSessionByChannel = {};
+  }
   void writeSettingsFile(currentSettings);
 }
 
@@ -270,6 +315,28 @@ export async function loadSettings(): Promise<void> {
   currentSettings = loadedSettings;
   currentSettings.scheduledTasks = cloneScheduledTasks(loadedSettings.scheduledTasks) ?? [];
 
+  // Migration: pre-V1.x installs only had a single `currentSession` field,
+  // shared across whichever channel ran the bot. With per-channel sessions
+  // we move that value into `currentSessionByChannel.telegram` (Telegram
+  // was the only channel until V1.x, so the assumption is safe). The old
+  // field is dropped from the on-disk file on the next write.
+  if (currentSettings.currentSession && !currentSettings.currentSessionByChannel) {
+    currentSettings.currentSessionByChannel = {
+      telegram: currentSettings.currentSession,
+    };
+    delete currentSettings.currentSession;
+    requiresRewrite = true;
+    logger.info(
+      "[SettingsManager] Migrated single-slot currentSession into " +
+        "currentSessionByChannel.telegram",
+    );
+  } else if (currentSettings.currentSession) {
+    // Both fields exist — the new one wins. Drop the legacy field so it
+    // doesn't pollute future writes.
+    delete currentSettings.currentSession;
+    requiresRewrite = true;
+  }
+
   if (requiresRewrite) {
     void writeSettingsFile(currentSettings);
   }

src/whatsapp/commands/abort.ts

@@ -15,7 +15,7 @@ export const abortCommand: WhatsAppCommandHandler = async (ctx) => {
   await cancelPendingMenu(ctx.jid);
   clearAllInteractionState("whatsapp_abort_command");
 
-  const session = getCurrentSession();
+  const session = getCurrentSession("whatsapp");
   if (!session) {
     await ctx.reply("No active session.");
     return;

src/whatsapp/commands/new.ts

@@ -34,7 +34,7 @@ export const newCommand: WhatsAppCommandHandler = async (ctx) => {
       title: session.title,
       directory: project.worktree,
     };
-    setCurrentSession(info);
+    setCurrentSession("whatsapp", info);
     clearAllInteractionState("whatsapp_session_created");
     await ingestSessionInfoForCache(session);
 

src/whatsapp/commands/sessions.ts

@@ -74,7 +74,7 @@ export const sessionsCommand: WhatsAppCommandHandler = async (ctx) => {
           title: session.title,
           directory: project.worktree,
         };
-        setCurrentSession(info);
+        setCurrentSession("whatsapp", info);
         clearAllInteractionState("whatsapp_session_switched");
 
         logger.info(