ocuclaw 1.3.3 → 1.3.4

package/dist/runtime/session-service.js

@@ -8,27 +8,12 @@ import { createDistillerBudget } from "./session-title-distiller-budget.js";
 const SESSION_FIRST_USER_CACHE_FILE = "session-first-user-cache.json";
 const SESSION_TITLE_CACHE_FILE = "session-title-cache.json";
 const SESSION_PIN_CACHE_FILE = "ocuclaw-session-pins.json";
+const SESSION_AGENT_CACHE_FILE = "ocuclaw-session-agents.json";
 const PIN_CAP_PER_KIND = 20;
 
-/**
- * Greeting-eliciting content appended to /new and /reset so OpenClaw runs an
- * agent turn (the new-session "welcome"). OpenClaw 2026.6.x ("make bare reset
- * commands fast", gateway commit 2c6a3f6b04) made a BARE /new or /reset return
- * a synchronous ack and run NO agent turn — so a bare reset no longer produces
- * a welcome and leaves the glasses stuck on the "starting new session"
- * placeholder. Sending "/new <prompt>" / "/reset <prompt>" routes through the
- * gateway's normal agent path (content = the prompt) and elicits the welcome.
- * The wording matches the prompt OpenClaw used to inject itself, so the
- * existing synthetic-session-starter filters (conversation-state display hide +
- * isSyntheticSessionStarter title/preview filter) keep it hidden from the
- * transcript and session titles. NOTE: newSession() does NOT call
- * conversationState.addMessage("user", ...), so this content never renders as a
- * user bubble on the glasses.
- */
 export const NEW_SESSION_GREETING_PROMPT =
   "A new session was started via /new or /reset. Execute your Session Startup sequence now - read the required files before responding to the user. If BOOTSTRAP.md exists in the provided Project Context, read it and follow its instructions first. Then greet the user in your configured persona, if one is provided. Be yourself - use your defined voice, mannerisms, and mood. Keep it to 1-3 sentences and ask what they want to do. If the runtime model differs from default_model in the system prompt, mention the default model. Do not mention internal steps, files, tools, or reasoning.";
 
-
 function normalizeLogger(logger) {
   if (!logger || typeof logger !== "object") {
     return console;
@@ -66,6 +51,18 @@ function resolveSessionPinCachePath(stateDir) {
   return path.join(resolvedStateDir, SESSION_PIN_CACHE_FILE);
 }
 
+function resolveSessionAgentCachePath(stateDir) {
+  const resolvedStateDir = normalizeStateDir(stateDir);
+  if (!resolvedStateDir) return null;
+  return path.join(resolvedStateDir, SESSION_AGENT_CACHE_FILE);
+}
+
+function deriveAgentIdFromFullKey(fullKey) {
+  if (typeof fullKey !== "string") return "";
+  const match = /^agent:([a-z0-9][a-z0-9_-]*):/i.exec(fullKey.trim());
+  return match ? match[1] : "";
+}
+
 function sanitizeAssistantContentBlocks(content) {
   if (typeof content === "string") {
     return stripAllTaggedSpans(content);
@@ -85,6 +82,14 @@ export function createSessionService(opts = {}) {
   const emitDebug = typeof opts.emitDebug === "function" ? opts.emitDebug : () => {};
   const getAgentName =
     typeof opts.getAgentName === "function" ? opts.getAgentName : () => null;
+  const getAgentDisplayName =
+    typeof opts.getAgentDisplayName === "function"
+      ? opts.getAgentDisplayName
+      : () => null;
+  const getDefaultAgentId =
+    typeof opts.getDefaultAgentId === "function"
+      ? opts.getDefaultAgentId
+      : () => "";
   const isUpstreamConnected =
     typeof opts.isUpstreamConnected === "function"
       ? opts.isUpstreamConnected
@@ -108,9 +113,8 @@ export function createSessionService(opts = {}) {
       ? opts.isPinnedFirstUserMessageKey
       : null;
 
-  /** Current session key. Generated on first use. */
   let currentSessionKey = null;
-  /** Locally-created session key pending visibility in upstream sessions.list. */
+
   let pendingSessionListKey = null;
   let lastGeneratedSessionTimestamp = 0;
   const DEFAULT_SESSION_KEY_PREFIX =
@@ -127,68 +131,54 @@ export function createSessionService(opts = {}) {
     (prefix) => String(prefix || "").toLowerCase(),
   );
 
-  /** Maximum number of sessions to fetch. */
-  // Default raised to 100 so the WebUI Sessions panel can show a full
-  // scrollable history without being chopped to 10 most-recent.
   const sessionLimit = opts.sessionLimit || 100;
-  /** Whether to persist first real user message cache to disk. */
+
   const persistFirstUserMessages = opts.persistFirstUserMessages !== false;
-  /**
-   * Strict mode by default: only use first real downstream sends for session preview labels.
-   * Set to false to re-enable legacy chat.history/fallback extraction.
-   */
+
   const strictFirstUserMessage = opts.strictFirstUserMessage !== false;
-  /** Path for first real user message cache file. */
+
   const firstUserMessageCachePath = resolveSessionFirstUserMessageCachePath(
     opts.stateDir,
   );
 
-  /** TTL for cached sessions.list payloads. */
   const sessionCacheTtlMs =
     Number.isFinite(opts.sessionCacheTtlMs) && opts.sessionCacheTtlMs > 0
       ? Math.floor(opts.sessionCacheTtlMs)
       : 5000;
-  /** @type {Array<{key: string, updatedAt: number, preview: string, firstUserMessage: string, title: string|null, pinned: boolean, pinnedAtMs: number|null}>|null} */
+
   let cachedSessions = null;
-  /** Epoch ms when cachedSessions was last refreshed. */
+
   let cachedSessionsFetchedAt = 0;
-  /** @type {Promise<Array<{key: string, updatedAt: number, preview: string, firstUserMessage: string, title: string|null, pinned: boolean, pinnedAtMs: number|null}>>|null} */
+
   let inFlightSessionsFetch = null;
 
-  /** Last-known session model config per session key. */
   const sessionModelConfigCache = new Map();
-  /** New OcuClaw sessions awaiting one-time default model/thinking seeding. */
+
   const pendingInitialConfigSessionKeys = new Set();
-  /** @type {Map<string, {updatedAt: number, firstUserMessage: string}>} */
+
   const firstUserMessageCache = new Map();
   const firstUserMessageCacheLimit = Math.max(64, sessionLimit * 8);
-  /** @type {Map<string, string>} First real user text observed from downstream send events. */
+
   const firstSentUserMessageBySession = loadFirstSentUserMessageCache();
 
-  /** Path for session title cache file. */
   const sessionTitleCachePath = resolveSessionTitleCachePath(opts.stateDir);
-  /** @type {Map<string, {title: string, setAtMs: number, userSet: boolean}>} Per-session agent- or user-set title. */
+
   const sessionTitleByKey = loadSessionTitleCache();
-  /** @type {Map<string, boolean>} Per-session Neural Session Names toggle state. */
+
   const neuralSessionNamesEnabledByKey = new Map();
-  /** Per-session display-feature (emoji/pace) toggle states: frozen start + latest.
-   * The frozen start-state persists to stateDir so a relay restart can't lose it
-   * (the Channel-1 snapshot persists too — see stable-prompt-snapshot). */
+
   const displayToggleTracker = createDisplayToggleTracker({ stateDir: opts.stateDir });
-  /** Per-session SKIP-exempt budget for the background title distiller. Owned
-   * here (alongside the title record + toggle tracker) so a logical session
-   * reset clears all per-session distiller state in one place. */
+
   const distillerBudget = createDistillerBudget({});
 
-  /** Path for session pin metadata cache file. */
   const sessionPinCachePath = resolveSessionPinCachePath(opts.stateDir);
-  /** @type {Map<string, {pinned: boolean, pinnedAtMs: number}>} Per-session pin metadata. */
+
   const sessionPinByKey = loadSessionPinCache();
 
-  /**
-   * Generate a new OcuClaw session key.
-   * @returns {string} e.g. "ocuclaw:1739500000000"
-   */
+  const sessionAgentCachePath = resolveSessionAgentCachePath(opts.stateDir);
+
+  const sessionAgentByKey = loadSessionAgentCache();
+
   function generateSessionKey(rawPrefix = DEFAULT_SESSION_KEY_PREFIX) {
     const effectivePrefix =
       typeof rawPrefix === "string" && rawPrefix.trim()
@@ -203,10 +193,6 @@ export function createSessionService(opts = {}) {
     return `${effectivePrefix}${nextTimestamp}`;
   }
 
-  /**
-   * Get or create the current session key.
-   * @returns {string}
-   */
   function ensureSessionKey() {
     if (!currentSessionKey) {
       currentSessionKey = generateSessionKey();
@@ -267,8 +253,6 @@ export function createSessionService(opts = {}) {
     return "off";
   }
 
-  // Preserves all four gateway values — "ask" is the alias of "on" and must
-  // not be collapsed, or snapshot read-back would lie about /elevated ask.
   function normalizeElevatedLevel(raw) {
     if (typeof raw !== "string") return "off";
     const normalized = raw.trim().toLowerCase();
@@ -312,6 +296,8 @@ export function createSessionService(opts = {}) {
       verboseLevel: normalizeVerboseLevel(row && row.verboseLevel),
       fastMode: !!(row && row.fastMode === true),
       elevatedLevel: normalizeElevatedLevel(row && row.elevatedLevel),
+
+      agentId: sessionAgentOverrideId(sessionKey),
     };
   }
 
@@ -320,7 +306,7 @@ export function createSessionService(opts = {}) {
       search,
       includeGlobal: false,
       includeUnknown: false,
-      limit: 10,
+      limit: sessionLimit,
     });
   }
 
@@ -339,7 +325,7 @@ export function createSessionService(opts = {}) {
         return resolved.key.trim();
       }
     } catch {
-      // keep raw key fallback
+
     }
     return sessionKey;
   }
@@ -433,6 +419,8 @@ export function createSessionService(opts = {}) {
         patch && Object.prototype.hasOwnProperty.call(patch, "elevatedLevel")
           ? normalizeElevatedLevel(patch.elevatedLevel)
           : base.elevatedLevel,
+
+      agentId: sessionAgentOverrideId(sessionKey),
     };
     sessionModelConfigCache.set(sessionKey, config);
     return config;
@@ -548,11 +536,6 @@ export function createSessionService(opts = {}) {
     return setSessionModelConfig(ensureSessionKey(), patch);
   }
 
-  /**
-   * Fetch the list of OcuClaw sessions from OpenClaw.
-   * Filters to OcuClaw session key prefix, sorted by updatedAt descending.
-   * @returns {Promise<Array<{key: string, updatedAt: number, preview: string, firstUserMessage: string, title: string|null, pinned: boolean, pinnedAtMs: number|null}>>}
-   */
   async function getSessions() {
     if (cachedSessions && Date.now() - cachedSessionsFetchedAt < sessionCacheTtlMs) {
       return cachedSessions;
@@ -588,6 +571,7 @@ export function createSessionService(opts = {}) {
             row.messages,
           );
           const pinMeta = getSessionPin(key);
+          const agentFields = resolveSessionAgentFields(key, row.key);
           return {
             key,
             updatedAt,
@@ -600,6 +584,8 @@ export function createSessionService(opts = {}) {
             title: resolveRowTitle(key, row),
             pinned: pinMeta.pinned,
             pinnedAtMs: pinMeta.pinnedAtMs,
+            agentId: agentFields.agentId,
+            agentName: agentFields.agentName,
           };
         }),
       );
@@ -623,6 +609,10 @@ export function createSessionService(opts = {}) {
             [],
           );
           const pinMeta = getSessionPin(pendingSessionListKey);
+          const agentFields = resolveSessionAgentFields(
+            pendingSessionListKey,
+            pendingSessionListKey,
+          );
           sessions.unshift({
             key: pendingSessionListKey,
             updatedAt,
@@ -631,6 +621,8 @@ export function createSessionService(opts = {}) {
             title: resolveRowTitle(pendingSessionListKey, null),
             pinned: pinMeta.pinned,
             pinnedAtMs: pinMeta.pinnedAtMs,
+            agentId: agentFields.agentId,
+            agentName: agentFields.agentName,
           });
         }
       }
@@ -696,6 +688,7 @@ export function createSessionService(opts = {}) {
         fallbackMessages,
       );
       const pinMeta = getSessionPin(key);
+      const agentFields = resolveSessionAgentFields(key, row.key || sessionKey);
       sessions.push({
         key,
         updatedAt,
@@ -708,18 +701,22 @@ export function createSessionService(opts = {}) {
         title: resolveRowTitle(key, row),
         pinned: pinMeta.pinned,
         pinnedAtMs: pinMeta.pinnedAtMs,
+        agentId: agentFields.agentId,
+        agentName: agentFields.agentName,
       });
     }
 
     return sessions;
   }
 
-  /**
-   * Extract the short session key from a fully-qualified gateway key.
-   * "agent:main:ocuclaw:1234567890" -> "ocuclaw:1234567890"
-   * @param {string} fullKey
-   * @returns {string}
-   */
+  function resolveSessionAgentFields(shortKey, fullKey) {
+    const agentId = getSessionAgentId(shortKey, fullKey);
+    if (!agentId) {
+      return { agentId: null, agentName: null };
+    }
+    return { agentId, agentName: getAgentDisplayName(agentId) || agentId };
+  }
+
   function extractShortKey(fullKey) {
     if (typeof fullKey !== "string") return "";
     const fullKeyLower = fullKey.toLowerCase();
@@ -733,12 +730,6 @@ export function createSessionService(opts = {}) {
     return prefixIndex >= 0 ? fullKey.slice(prefixIndex) : fullKey;
   }
 
-  /**
-   * Check whether a full/canonical session key belongs to a supported
-   * OcuClaw session namespace.
-   * @param {string} key
-   * @returns {boolean}
-   */
   function hasSupportedSessionKeyPrefix(key) {
     if (typeof key !== "string" || key.length === 0) return false;
     const keyLower = key.toLowerCase();
@@ -759,12 +750,6 @@ export function createSessionService(opts = {}) {
     return left.toLowerCase() === right.toLowerCase();
   }
 
-  /**
-   * Best-effort timestamp extraction from session key suffix.
-   * "ocuclaw:1739500000000" -> 1739500000000
-   * @param {string} sessionKey
-   * @returns {number}
-   */
   function extractSessionTimestampFromKey(sessionKey) {
     if (typeof sessionKey !== "string") return 0;
     const idx = sessionKey.lastIndexOf(":");
@@ -773,11 +758,6 @@ export function createSessionService(opts = {}) {
     return Number.isFinite(maybeTs) && maybeTs > 0 ? maybeTs : 0;
   }
 
-  /**
-   * Extract a preview string from a session's messages array.
-   * @param {Array} messages - Last N messages from sessions.list
-   * @returns {string}
-   */
   function extractPreview(messages) {
     if (!Array.isArray(messages) || messages.length === 0) return "";
     for (const msg of messages) {
@@ -791,9 +771,7 @@ export function createSessionService(opts = {}) {
   function resolveRowTitle(sessionKey, row) {
     const cached = getSessionTitle(sessionKey);
     if (cached !== null) return cached;
-    // Upstream session-row label: `label` on 2026.6.x rows; older hosts
-    // (≤5.27-era docs, session-management-compaction.md §169) used
-    // `displayName` — accept both.
+
     const rawLabel =
       row && typeof row.label === "string"
         ? row.label
@@ -953,13 +931,85 @@ export function createSessionService(opts = {}) {
     return v ?? { pinned: false, pinnedAtMs: null };
   }
 
-  /**
-   * Set or clear the pin on a session.
-   * @param {string} kind "ocuclaw" | "evenai"
-   * @param {string} sessionKey
-   * @param {boolean} pinned
-   * @returns {{ ok: true } | { ok: false, reason: "cap" | "invalid" }}
-   */
+  function loadSessionAgentCache() {
+    if (!sessionAgentCachePath) return new Map();
+    try {
+      if (!fs.existsSync(sessionAgentCachePath)) return new Map();
+      const raw = fs.readFileSync(sessionAgentCachePath, "utf8");
+      const parsed = JSON.parse(raw);
+      const out = new Map();
+      for (const [key, value] of Object.entries(parsed ?? {})) {
+        if (typeof value === "string" && value.trim()) {
+          out.set(key, value.trim());
+        }
+      }
+      return out;
+    } catch {
+      return new Map();
+    }
+  }
+
+  function persistSessionAgentCache() {
+    if (!sessionAgentCachePath) return;
+    try {
+      fs.mkdirSync(path.dirname(sessionAgentCachePath), { recursive: true });
+      const obj = {};
+      for (const [key, value] of sessionAgentByKey.entries()) {
+        obj[key] = value;
+      }
+      fs.writeFileSync(sessionAgentCachePath, JSON.stringify(obj), "utf8");
+    } catch (err) {
+      logger.error(
+        `[relay] Failed to persist session agent cache: ${err.message}`,
+      );
+    }
+  }
+
+  function explicitSessionAgentId(sessionKey, fullKey) {
+    const override = sessionAgentByKey.get(sessionKey);
+    if (typeof override === "string" && override.trim()) {
+      return override.trim();
+    }
+    return deriveAgentIdFromFullKey(fullKey || sessionKey) || "";
+  }
+
+  function sessionAgentOverrideId(sessionKey) {
+    const override = sessionAgentByKey.get(sessionKey);
+    return typeof override === "string" && override.trim()
+      ? override.trim()
+      : "";
+  }
+
+  function getSessionAgentId(sessionKey, fullKey) {
+    const explicit = explicitSessionAgentId(sessionKey, fullKey);
+    if (explicit) {
+      return explicit;
+    }
+    const fallback = getDefaultAgentId();
+    return typeof fallback === "string" && fallback.trim()
+      ? fallback.trim()
+      : "";
+  }
+
+  function hasExplicitSessionAgent(sessionKey, fullKey) {
+    return explicitSessionAgentId(sessionKey, fullKey) !== "";
+  }
+
+  function setSessionAgentId(sessionKey, agentId) {
+    if (typeof sessionKey !== "string" || !sessionKey.trim()) {
+      return { ok: false, reason: "invalid" };
+    }
+    const normalized = typeof agentId === "string" ? agentId.trim() : "";
+    if (normalized) {
+      sessionAgentByKey.set(sessionKey, normalized);
+    } else {
+      sessionAgentByKey.delete(sessionKey);
+    }
+    persistSessionAgentCache();
+    invalidateSessionsCache();
+    return { ok: true };
+  }
+
   function setSessionPinned(kind, sessionKey, pinned) {
     if (!sessionKey || (kind !== "ocuclaw" && kind !== "evenai")) {
       return { ok: false, reason: "invalid" };
@@ -979,13 +1029,6 @@ export function createSessionService(opts = {}) {
     return { ok: true };
   }
 
-  /**
-   * Delete one or more sessions, sequentially.
-   * Partial failures do not abort the batch.
-   * @param {"ocuclaw"|"evenai"} kind
-   * @param {string[]} sessionKeys
-   * @returns {Promise<{ deleted: string[], failed: Array<{ key: string, reason: string }> }>}
-   */
   async function deleteSessions(kind, sessionKeys) {
     const deleted = [];
     const failed = [];
@@ -1007,14 +1050,6 @@ export function createSessionService(opts = {}) {
     return { deleted, failed };
   }
 
-  /**
-   * Deep transcript search across all OcuClaw sessions returned by getSessions().
-   * Returns at most `maxSnippets` snippets matching the query (case-insensitive),
-   * each with `before`/`match`/`after` slices so the UI can highlight the hit.
-   * @param {string} kind "ocuclaw" | "evenai"
-   * @param {string} query
-   * @returns {Promise<{snippets: Array<{sessionKey: string, role: string, updatedAtMs: number, before: string, match: string, after: string}>, truncated: boolean}>}
-   */
   async function searchTranscripts(kind, query) {
     const needle = (typeof query === "string" ? query.trim() : "").toLowerCase();
     if (!needle) return { snippets: [], truncated: false };
@@ -1083,9 +1118,7 @@ export function createSessionService(opts = {}) {
   }
 
   async function deleteSingleSession(kind, key) {
-    // OpenClaw gateway exposes `sessions.delete({key, deleteTranscript, emitLifecycleHooks})`.
-    // Resolve to a canonical key first so prefixes like "agent:main:" are applied
-    // when the gateway expects them.
+
     const canonicalKey = await resolveSessionCanonicalKey(key);
     await gatewayBridge.request("sessions.delete", {
       key: canonicalKey,
@@ -1094,12 +1127,6 @@ export function createSessionService(opts = {}) {
     });
   }
 
-  /**
-   * Switch first if the active session is in the batch; then delete.
-   * Used when the UI sets `switchBeforeDelete=true`.
-   * @param {"ocuclaw"|"evenai"} kind
-   * @param {string[]} sessionKeys
-   */
   async function switchAndDeleteSessions(kind, sessionKeys) {
     if (
       kind === "ocuclaw" &&
@@ -1111,11 +1138,6 @@ export function createSessionService(opts = {}) {
     return deleteSessions(kind, sessionKeys);
   }
 
-  /**
-   * Re-fetch + broadcast the sessions snapshot for a given kind.
-   * Used by handlers after pin/delete writes.
-   * @param {"ocuclaw"|"evenai"} kind
-   */
   async function broadcastSessionsForKind(kind) {
     invalidateSessionsCache();
     if (kind === "ocuclaw" && typeof opts.broadcastSessions === "function") {
@@ -1185,17 +1207,6 @@ export function createSessionService(opts = {}) {
     }
   }
 
-  // Coalesced async persistence for the first-user-message cache. Mirrors the
-  // ocuclaw-settings-store writeInFlight/pendingWrite shape (commit 6285bc24)
-  // so the SYNC fs.mkdirSync + fs.writeFileSync no longer block the hot send
-  // path on every first user message per session.
-  //
-  // The write serializes the WHOLE in-memory map, so it is a full-snapshot
-  // replace (not a disk read-modify-write). Concurrent fire-and-forget writes
-  // could therefore lose updates (an older snapshot landing after a newer one).
-  // We coalesce: at most one write in flight; any schedule while a write is in
-  // flight marks the cache dirty, and the in-flight write re-runs once it
-  // settles — so the final on-disk file always reflects the latest map.
   let firstUserCacheWriteInFlight = false;
   let firstUserCacheDirty = false;
   let firstUserCacheFlushPromise = null;
@@ -1235,7 +1246,7 @@ export function createSessionService(opts = {}) {
       return;
     }
     if (!firstUserCacheDirty) {
-      // Nothing more to write — settle any awaiters and clear the flush gate.
+
       if (firstUserCacheFlushResolve) {
         const resolve = firstUserCacheFlushResolve;
         firstUserCacheFlushResolve = null;
@@ -1248,8 +1259,7 @@ export function createSessionService(opts = {}) {
     firstUserCacheWriteInFlight = true;
     writeFirstSentUserMessageCacheToDisk().finally(() => {
       firstUserCacheWriteInFlight = false;
-      // Re-run drains any dirty mark accumulated during this write, then
-      // settles the flush gate once the map and disk agree.
+
       runFirstSentUserMessageCacheWrite();
     });
   }
@@ -1260,9 +1270,6 @@ export function createSessionService(opts = {}) {
     runFirstSentUserMessageCacheWrite();
   }
 
-  // Awaitable flush: resolves once no write is in flight AND no dirty mark is
-  // pending (the on-disk file reflects the latest in-memory map). Used by tests
-  // after rapid sends and available for graceful shutdown.
   function flushFirstSentUserMessageCache() {
     if (!persistFirstUserMessages || !firstUserMessageCachePath) {
       return Promise.resolve();
@@ -1316,7 +1323,7 @@ export function createSessionService(opts = {}) {
       return { ok: false, code: "invalid_title" };
     }
     const trimmed = title.trim();
-    // Back-compat: callers passing { userSet:true } map to the user_tool origin.
+
     const origin =
       opts && typeof opts.origin === "string" && opts.origin
         ? opts.origin
@@ -1347,7 +1354,7 @@ export function createSessionService(opts = {}) {
       { sessionKey },
       () => ({ sessionKey, title: trimmed, replaced, userSet: !!nextUserSet, origin }),
     );
-    // Fire-and-forget upstream mirror.
+
     if (!isUpstreamConnected()) {
       emitDebug(
         "relay.session",
@@ -1360,8 +1367,7 @@ export function createSessionService(opts = {}) {
     if (isUpstreamConnected()) {
       resolveSessionCanonicalKey(sessionKey)
         .then((canonicalKey) =>
-          // 2026.6.x strict schema: the session title field is `label`
-          // (5.27-era `displayName` is rejected as an unexpected property).
+
           gatewayBridge.request("sessions.patch", {
             key: canonicalKey,
             label: trimmed,
@@ -1428,12 +1434,7 @@ export function createSessionService(opts = {}) {
       distillerBudget.clear(sessionKey);
     }
   }
-  // Drop the stored title record for a session AND clear the upstream display
-  // name. setSessionTitle mirrors the title to the upstream session displayName,
-  // and session-list rendering falls back to that displayName when the local
-  // record is gone — so a local-only delete would let the old title reappear on
-  // the next sessions refresh. deleteSessions removes it for genuine deletes;
-  // this is for a reused-key logical reset (/new, /reset).
+
   function clearSessionTitle(sessionKey) {
     if (typeof sessionKey !== "string" || !sessionKey.trim()) return;
     const hadTitle = sessionTitleByKey.delete(sessionKey);
@@ -1457,21 +1458,12 @@ export function createSessionService(opts = {}) {
     }
   }
 
-  // Clear ALL per-session state keyed to a conversation that must not bleed into
-  // a fresh conversation reusing the same session key (/new, /reset). Centralized
-  // so reset paths can't miss a piece (title + upstream name, toggle states,
-  // distiller budget, the first-user-message marker the distiller gate reads, and
-  // the per-session feature toggle).
   function clearLogicalSessionState(sessionKey) {
     if (typeof sessionKey !== "string" || !sessionKey.trim()) return;
     clearSessionTitle(sessionKey);
     displayToggleTracker.clear(sessionKey);
     distillerBudget.clear(sessionKey);
-    // Clear BOTH the first-user marker AND the derived preview cache, and persist
-    // the deletion — recordFirstSentUserMessage writes the marker to disk, so a
-    // local-only delete would let a relay/plugin restart reload a stale
-    // "user already spoke" marker for the reused key (the distiller gate reads
-    // this, and the session-list preview reads the derived cache).
+
     const hadMarker = firstSentUserMessageBySession.delete(sessionKey);
     firstUserMessageCache.delete(sessionKey);
     if (hadMarker) persistFirstSentUserMessageCache();
@@ -1613,11 +1605,6 @@ export function createSessionService(opts = {}) {
     }
   }
 
-  /**
-   * Switch to a different session: load its history and return pages.
-   * @param {string} sessionKey
-   * @returns {Promise<Array>} Pages array
-   */
   async function switchToSession(sessionKey, opts = {}) {
     const markPendingSessionList =
       opts.markPendingSessionList === true &&
@@ -1673,10 +1660,6 @@ export function createSessionService(opts = {}) {
     return pages;
   }
 
-  /**
-   * Create a new session with a fresh key.
-   * @returns {Promise<{sessionKey: string, pages: Array}>}
-   */
   async function newSession(opts = {}) {
     const sendResetCommand = opts.sendResetCommand !== false;
     const sessionKey = generateSessionKey();
@@ -1723,10 +1706,6 @@ export function createSessionService(opts = {}) {
     return extractShortKey(trimmed).toLowerCase();
   }
 
-  /**
-   * Check if an event's session key matches the current glasses session.
-   * Events without a sessionKey default to "main".
-   */
   function isCurrentSession(eventSessionKey) {
     const eventKey = normalizeSessionKeyForCompare(eventSessionKey || "main");
     const currentKey = normalizeSessionKeyForCompare(ensureSessionKey());
@@ -1780,6 +1759,9 @@ export function createSessionService(opts = {}) {
     isCurrentSession,
     setSessionPinned,
     getSessionPin,
+    getSessionAgentId,
+    setSessionAgentId,
+    hasExplicitSessionAgent,
     deleteSessions,
     switchAndDeleteSessions,
     broadcastSessionsForKind,

package/dist/runtime/session-title-distiller-budget.js

@@ -1,11 +1,7 @@
-/**
- * Per-session distiller budget. SKIPs are free; only consecutive errors and a
- * total untitled-turn ceiling bound attempts; an applied title ends attempts.
- */
 export function createDistillerBudget(opts = {}) {
   const maxErr = Number.isFinite(opts.maxConsecutiveErrors) ? opts.maxConsecutiveErrors : 3;
   const ceiling = Number.isFinite(opts.untitledTurnCeiling) ? opts.untitledTurnCeiling : 25;
-  /** @type {Map<string,{consecErr:number, turns:number, done:boolean}>} */
+
   const byKey = new Map();
 
   function get(k) {