@jmfederico/pi-web 1.202607.0 → 1.202607.2

package/dist/server/sessions/piSessionService.js

@@ -1,22 +1,31 @@
 import { statSync } from "node:fs";
+import { join } from "node:path";
 import { open, readFile, writeFile } from "node:fs/promises";
-import { AuthStorage, createAgentSessionFromServices, createAgentSessionRuntime, createAgentSessionServices, createEditToolDefinition, defineTool, getAgentDir, ModelRegistry, SessionManager, } from "@earendil-works/pi-coding-agent";
+import { createAgentSessionFromServices, createAgentSessionRuntime, createAgentSessionServices, createEditToolDefinition, defineTool, readStoredCredential, SessionManager, } from "@earendil-works/pi-coding-agent";
+import { projectBrowserMessage } from "../browserMessageProjection.js";
 import { pageMessagesAtSafeBoundary } from "./messagePaging.js";
 import { BUILTIN_COMMANDS } from "./builtinCommands.js";
 import { SessionCommandService } from "./sessionCommandService.js";
+import { projectSessionTree } from "./sessionTreeProjection.js";
 import { SessionArchiveStore } from "./sessionArchiveStore.js";
 import { findArchiveCandidateByIdOrPrefix, planSessionArchiveTree } from "./sessionArchiveTree.js";
 import { deterministicSessionName, fallbackSessionName, generateShortSessionName } from "./sessionNameGenerator.js";
 import { computeEditPreview } from "./editPreview.js";
-import { createPiSessionManagerGateway } from "./piSessionManagerGateway.js";
 import { attachmentsToInlineImages, saveAttachmentsToWorkspace } from "./attachmentService.js";
 import { parsePromptAttachments } from "../../shared/promptAttachments.js";
+import { SESSION_TREE_CUSTOM_INSTRUCTIONS_MAX_LENGTH, SESSION_UNREAD_LIMIT } from "../../shared/apiTypes.js";
 import { canonicalizeStoredCwd, cwdPathsEqual } from "../workingDirectory.js";
 import { createSpawnSessionToolDefinition } from "./spawnSessionTool.js";
 import { createSubsessionToolDefinitions } from "./spawnSubsessionTool.js";
 import { buildTranscriptView } from "./subsessionTranscript.js";
 import { planSessionCleanup, summarizeSessionCleanupExecution } from "./sessionCleanup.js";
+import { SessionNotificationStore, } from "./sessionNotificationStore.js";
+import { plainTextTheme } from "./plainTextTheme.js";
+import { SessionUnreadStore } from "./sessionUnreadStore.js";
 const noopLogger = { info() { } };
+const DEFAULT_UNREAD_PUBLICATION_RETRY_MS = 1_000;
+const MAX_UNREAD_PUBLICATION_RETRY_MS = 30_000;
+const MAX_PENDING_UNREAD_MUTATIONS = SESSION_UNREAD_LIMIT + 1;
 function noop() {
     // Intentionally empty default unsubscribe callback.
 }
@@ -37,6 +46,37 @@ function isPiSessionRef(ref) {
 function lookupMatchesActiveSession(ref, active) {
     return !isPiSessionRef(ref) || cwdPathsEqual(active.runtime.cwd, ref.cwd);
 }
+function sessionTreeNavigationOptions(request) {
+    switch (request.summary.mode) {
+        case "none":
+            return { summarize: false };
+        case "default":
+            return { summarize: true };
+        case "custom": {
+            const customInstructions = request.summary.instructions.trim();
+            if (customInstructions === "")
+                throw new Error("Custom branch-summary instructions are required");
+            if (customInstructions.length > SESSION_TREE_CUSTOM_INSTRUCTIONS_MAX_LENGTH) {
+                throw new Error(`Custom branch-summary instructions must be at most ${String(SESSION_TREE_CUSTOM_INSTRUCTIONS_MAX_LENGTH)} characters`);
+            }
+            return { summarize: true, customInstructions };
+        }
+    }
+}
+function decrementWeakCount(counts, key) {
+    const remaining = (counts.get(key) ?? 1) - 1;
+    if (remaining <= 0)
+        counts.delete(key);
+    else
+        counts.set(key, remaining);
+}
+function decrementMapCount(counts, key) {
+    const remaining = (counts.get(key) ?? 1) - 1;
+    if (remaining <= 0)
+        counts.delete(key);
+    else
+        counts.set(key, remaining);
+}
 function requirePromptText(value) {
     if (typeof value !== "string")
         throw new Error("Prompt text is required");
@@ -49,6 +89,109 @@ function parsePromptStreamingBehavior(value) {
         return value;
     throw new Error('Prompt streamingBehavior must be "steer" or "followUp"');
 }
+const CLEAR_RUNTIME_NOTIFICATIONS = { kind: "clear", reason: "runtime-close" };
+const DEFER_RUNTIME_NOTIFICATIONS = { kind: "defer" };
+function resourceDiagnosticToWarning(diagnostic, source) {
+    return {
+        severity: diagnostic.type === "error" ? "error" : "warning",
+        message: diagnostic.message,
+        source,
+        ...(diagnostic.path === undefined ? {} : { path: diagnostic.path }),
+    };
+}
+function runtimeDiagnosticToWarning(diagnostic) {
+    return { severity: diagnostic.type, message: diagnostic.message, source: "runtime" };
+}
+/**
+ * Compute the live warnings for a runtime by re-reading its current resource
+ * loader diagnostics, extension load errors, and runtime setup diagnostics.
+ *
+ * This mimics the TUI recomputing warnings on every (re)bind: it reads the
+ * runtime's current state rather than a cached snapshot, so a rebuilt runtime
+ * yields fresh warnings. Runtimes without SDK services (e.g. test fakes)
+ * contribute no warnings.
+ */
+export function collectRuntimeWarnings(runtime) {
+    const warnings = [];
+    for (const diagnostic of runtime.diagnostics ?? [])
+        warnings.push(runtimeDiagnosticToWarning(diagnostic));
+    const resourceLoader = runtime.services?.resourceLoader;
+    if (resourceLoader !== undefined) {
+        for (const diagnostic of resourceLoader.getSkills().diagnostics)
+            warnings.push(resourceDiagnosticToWarning(diagnostic, "skill"));
+        for (const diagnostic of resourceLoader.getPrompts().diagnostics)
+            warnings.push(resourceDiagnosticToWarning(diagnostic, "prompt"));
+        for (const diagnostic of resourceLoader.getThemes().diagnostics)
+            warnings.push(resourceDiagnosticToWarning(diagnostic, "theme"));
+        for (const error of resourceLoader.getExtensions().errors) {
+            warnings.push({ severity: "error", message: `${error.path}: ${error.error}`, source: "extension", path: error.path });
+        }
+    }
+    return warnings;
+}
+/**
+ * Verbatim TUI wording for the Anthropic subscription-auth billing notice. Kept
+ * character-for-character in sync with `ANTHROPIC_SUBSCRIPTION_AUTH_WARNING` in
+ * the SDK's interactive mode so the browser shows the same message the TUI does.
+ */
+const ANTHROPIC_SUBSCRIPTION_AUTH_WARNING = "Anthropic subscription auth is active. Third-party harness usage draws from extra usage and is billed per token, not your Claude plan limits. Manage extra usage at https://claude.ai/settings/usage.";
+/** Mirror of the SDK TUI `isAnthropicSubscriptionAuthKey` (subscription API keys start with `sk-ant-oat`). */
+function isAnthropicSubscriptionAuthKey(apiKey) {
+    return typeof apiKey === "string" && apiKey.startsWith("sk-ant-oat");
+}
+/**
+ * Dismiss id for the Anthropic subscription-auth billing notice. This is `pi`'s
+ * own `WarningSettings` key verbatim (`anthropicExtraUsage`): we carry the
+ * coupling `pi` already defines rather than inventing a parallel vocabulary, and
+ * {@link dismissSessionWarning} maps it back to `setWarnings`.
+ */
+const ANTHROPIC_EXTRA_USAGE_DISMISS_ID = "anthropicExtraUsage";
+/**
+ * Port of the TUI `maybeWarnAboutAnthropicSubscriptionAuth` gate/trigger, computed
+ * live from the session's current model, stored Anthropic credential, and warning
+ * settings. Returns the billing warning when the active provider is `anthropic`
+ * and auth is a subscription credential (stored `oauth`, or an `sk-ant-oat` API
+ * key), unless suppressed via `getWarnings().anthropicExtraUsage === false`.
+ *
+ * The stored credential is read synchronously (matching the TUI's `oauth` branch
+ * and the documented `sk-ant-oat` key trigger) so warnings stay part of the
+ * synchronous live status computation.
+ */
+export function anthropicSubscriptionWarning(session, authPath) {
+    if (session.settingsManager.getWarnings().anthropicExtraUsage === false)
+        return undefined;
+    if (session.model?.provider !== "anthropic")
+        return undefined;
+    const credential = readStoredCredential("anthropic", authPath);
+    if (credential === undefined)
+        return undefined;
+    const isSubscriptionAuth = credential.type === "oauth"
+        ? true
+        : isAnthropicSubscriptionAuthKey(credential.key);
+    if (!isSubscriptionAuth)
+        return undefined;
+    return {
+        severity: "warning",
+        message: ANTHROPIC_SUBSCRIPTION_AUTH_WARNING,
+        source: "anthropic",
+        dismiss: { id: ANTHROPIC_EXTRA_USAGE_DISMISS_ID },
+    };
+}
+/**
+ * Durably suppress a dismissable session warning by mapping its opaque dismiss
+ * id back to the concrete `pi` suppression it represents. Only known ids are
+ * honored; unknown ids throw so a stale/forged client cannot silently no-op.
+ *
+ * This is the single place provider-specific suppression lives: the wire type,
+ * parser, and UI stay agnostic. Adding a future dismissable warning is a
+ * server-only change here plus a `dismiss` id on its producer.
+ */
+export function dismissSessionWarning(session, dismissId) {
+    if (dismissId !== ANTHROPIC_EXTRA_USAGE_DISMISS_ID) {
+        throw new Error(`Unknown session warning dismiss id: ${dismissId}`);
+    }
+    session.settingsManager.setWarnings({ ...session.settingsManager.getWarnings(), anthropicExtraUsage: false });
+}
 function defaultCreateAgentRuntime(createRuntime, options) {
     if (!(options.sessionManager instanceof SessionManager))
         throw new Error("Default runtime creation requires an SDK SessionManager");
@@ -83,9 +226,9 @@ export function createPiWebCustomToolDefinitions(cwd, delegationEnabled, spawn,
         ...(delegationEnabled && subsessions !== undefined ? createSubsessionToolDefinitions(cwd, subsessions) : []),
     ];
 }
-function createDefaultRuntimeFactory(authStorage, modelRegistry, sessionManagers, spawn, subsessions) {
+function createDefaultRuntimeFactory(modelRuntime, sessionManagers, spawn, subsessions) {
     return async ({ cwd, agentDir, sessionManager, sessionStartEvent, initialModel, delegationToolsEnabled }) => {
-        const services = await createAgentSessionServices({ cwd, agentDir, authStorage, modelRegistry });
+        const services = await createAgentSessionServices({ cwd, agentDir, modelRuntime });
         const resolvedDelegationToolsEnabled = delegationToolsEnabled
             ?? await sessionAllowsDelegationTools(sessionManager, sessionManagers);
         const customTools = createPiWebCustomToolDefinitions(cwd, resolvedDelegationToolsEnabled, spawn, subsessions);
@@ -121,11 +264,20 @@ function createPiWebEditToolDefinition(cwd) {
     });
 }
 export class PiSessionService {
-    constructor(events, deps = {}) {
+    constructor(events, deps) {
         this.events = events;
         this.active = new Map();
         this.pendingSessionOpens = new Map();
         this.activities = new Map();
+        /** Runtime-identity gate held while Pi may await abandoned-branch summarization. */
+        this.treeNavigations = new WeakSet();
+        /** Counts async operations that may append an entry before they settle. */
+        this.sessionEntryMutationCounts = new WeakMap();
+        /** Runtime/session-identity reservations for operations that must not overlap tree navigation. */
+        this.treeExclusiveRuntimeOperationCounts = new WeakMap();
+        this.treeExclusiveSessionOperationCounts = new Map();
+        this.deferredSubsessionNotifications = new WeakMap();
+        this.deferredGeneratedSessionNames = new WeakMap();
         this.compactionPromptQueues = new Map();
         this.compactionDrainTimers = new Map();
         this.authLossWarnings = new Set();
@@ -143,17 +295,25 @@ export class PiSessionService {
          * child that works again (and stops again) notifies the parent each time.
          */
         this.subsessionNotifyArmed = new Map();
+        this.notificationGenerationBySession = new WeakMap();
+        this.pendingUnreadMutations = [];
+        this.unreadPublicationFlushRequested = false;
+        this.unreadPublicationStopped = false;
         this.archiveStore = deps.archiveStore ?? new SessionArchiveStore();
-        this.agentDir = deps.agentDir ?? getAgentDir();
-        this.sessionManager = deps.sessionManager ?? createPiSessionManagerGateway({ agentDir: this.agentDir });
-        this.modelRegistry = deps.modelRegistry ?? ModelRegistry.create(AuthStorage.create());
+        this.agentDir = deps.agentDir;
+        this.sessionManager = deps.sessionManager;
+        this.modelRuntime = deps.modelRuntime;
         this.spawnTargets = deps.spawnTargets;
         this.logger = deps.logger ?? noopLogger;
         this.now = deps.now ?? (() => new Date());
+        this.notificationStore = deps.notificationStore ?? new SessionNotificationStore();
+        this.unreadStore = deps.unreadStore ?? new SessionUnreadStore();
+        this.unreadPublicationRetryInitialMs = Math.max(0, deps.unreadPublicationRetryDelayMs ?? DEFAULT_UNREAD_PUBLICATION_RETRY_MS);
+        this.unreadPublicationRetryDelayMs = this.unreadPublicationRetryInitialMs;
         // Subsessions are a beta capability gated behind their own flag, and they
         // also require the spawn capability (they share its project-scope resolver).
         const subsessionsActive = this.spawnTargets !== undefined && deps.subsessionsEnabled === true;
-        this.createRuntime = deps.createRuntime ?? createDefaultRuntimeFactory(this.modelRegistry.authStorage, this.modelRegistry, this.sessionManager, this.spawnTargets === undefined ? undefined : (input) => this.spawnSession(input), !subsessionsActive ? undefined : {
+        this.createRuntime = deps.createRuntime ?? createDefaultRuntimeFactory(this.modelRuntime, this.sessionManager, this.spawnTargets === undefined ? undefined : (input) => this.spawnSession(input), !subsessionsActive ? undefined : {
             spawn: (input) => this.spawnSubsession(input),
             list: (parentSessionId, parentSessionFile) => this.listSubsessions(parentSessionId, parentSessionFile),
             check: (parentSessionId, sessionId, parentSessionFile) => this.checkSubsession(parentSessionId, sessionId, parentSessionFile),
@@ -164,19 +324,57 @@ export class PiSessionService {
         this.heartbeat = setInterval(() => { this.publishHeartbeats(); }, deps.heartbeatIntervalMs ?? 2000);
         this.commandService = new SessionCommandService((sessionId) => this.getActive(sessionId), (sessionId, text) => this.prompt(sessionId, text, undefined, undefined, { echoUserMessage: false }), events, {
             onCompactionStart: (session) => {
+                this.beginSessionEntryMutation(session, "compact the session");
                 this.publishActivity(session, "compacting", "active");
                 this.publishStatus(session);
             },
             onCompactionEnd: (session, result, detail) => {
+                this.endSessionEntryMutation(session);
                 this.publishActivity(session, result === "success" ? "compaction complete" : "compaction failed", result === "success" ? "idle" : "error", detail);
                 this.publishStatus(session);
             },
             reloadSession: (session) => this.reloadSessionRuntime(session),
+            getSessionTree: (session) => {
+                if (typeof session.sessionManager.getTree !== "function" || typeof session.navigateTree !== "function")
+                    return undefined;
+                return projectSessionTree(session.sessionManager.getTree(), session.sessionManager.getLeafId());
+            },
+            hasActiveWork: (session) => this.hasActiveWork(session),
+            isTreeNavigationActive: (session) => this.treeNavigations.has(session),
+            runSessionReplacement: (session, operation) => this.runTreeExclusiveOperation([{ sessionId: session.sessionId, session }], "Stop current session activity before replacing the session", operation),
         }, { listSessionNames: (cwd) => this.listSessionNames(cwd) });
     }
     activeCount() {
         return this.active.size;
     }
+    notificationCatalog() {
+        return this.notificationStore.catalogSnapshot();
+    }
+    async unreadCatalog() {
+        await this.publishUnreadMutations([]);
+        return this.unreadStore.durableCatalogSnapshot();
+    }
+    async acknowledgeUnread(sessionId, request) {
+        const result = this.unreadStore.acknowledge(sessionId, {
+            ...request,
+            cwd: canonicalizeStoredCwd(request.cwd),
+        });
+        await this.publishUnreadMutations(result.mutations);
+        return this.unreadStore.durableCatalogSnapshot();
+    }
+    notificationInbox(ref) {
+        return this.notificationStore.inboxSnapshot(ref.id, canonicalizeStoredCwd(ref.cwd));
+    }
+    dismissNotification(ref, request) {
+        const result = this.notificationStore.dismissNotification(ref.id, canonicalizeStoredCwd(ref.cwd), request.daemonInstanceId, request.notificationId);
+        this.publishNotificationMutations(result.mutations);
+        return result.snapshot;
+    }
+    dismissAllNotifications(ref, request) {
+        const result = this.notificationStore.dismissAll(ref.id, canonicalizeStoredCwd(ref.cwd), request.daemonInstanceId, request.throughOrder, request.throughOverflowWatermark);
+        this.publishNotificationMutations(result.mutations);
+        return result.snapshot;
+    }
     async cleanupPreview(request) {
         return previewResponseFromPlan(await this.cleanupPlan(request));
     }
@@ -194,22 +392,24 @@ export class PiSessionService {
                 skippedBusySessionIds.add(input.sessionId);
                 continue;
             }
-            await this.closeActive(input.sessionId);
+            await this.closeActive(input.sessionId, { kind: "clear", reason: "archive" });
             readyArchiveInputs.push(input);
         }
         await this.archiveStoreArchiveMany(readyArchiveInputs);
         archiveInputs.push(...readyArchiveInputs);
+        await this.forgetUnreadSessions(readyArchiveInputs);
         for (const record of plan.deleteRecords) {
             if (this.activeSessionHasWork(record.sessionId)) {
                 skippedBusySessionIds.add(record.sessionId);
                 continue;
             }
-            await this.closeActive(record.sessionId);
+            await this.closeActive(record.sessionId, { kind: "clear", reason: "delete" });
             readyDeleteRecords.push(record);
         }
         await this.ensureArchivedRecordsMoved(readyDeleteRecords);
         const deletedSessionIds = new Set(await this.archiveStoreDeleteArchivedMany(readyDeleteRecords.map((record) => record.sessionId)));
         deleteRecords.push(...readyDeleteRecords.filter((record) => deletedSessionIds.has(record.sessionId)));
+        await this.forgetUnreadSessions(deleteRecords);
         return summarizeSessionCleanupExecution({
             archiveInputs,
             deleteRecords,
@@ -219,12 +419,16 @@ export class PiSessionService {
         });
     }
     async dispose() {
+        this.unreadPublicationStopped = true;
+        this.clearUnreadPublicationRetry();
         clearInterval(this.heartbeat);
         this.clearCompactionDrainTimers();
         const pendingOpens = this.pendingSessionOpenPromises();
         if (pendingOpens.length > 0)
             await Promise.allSettled(pendingOpens);
         const activeSessions = Array.from(new Set(this.active.values()));
+        for (const active of activeSessions)
+            this.forgetUnreadActivity(active.runtime.session);
         this.active.clear();
         this.pendingSessionOpens.clear();
         this.activities.clear();
@@ -235,16 +439,19 @@ export class PiSessionService {
         this.subsessionLinks.clear();
         this.subsessionHydratedParents.clear();
         this.subsessionNotifyArmed.clear();
+        this.notificationStore.clearAll("service-dispose");
         await Promise.all(activeSessions.map(async (active) => {
             active.unsubscribe();
+            active.runtime.setRebindSession(undefined);
             this.workspaceActivity?.removeSession(active.runtime.session.sessionId, active.runtime.session.sessionManager.getCwd());
             try {
-                await active.runtime.session.abort();
+                await this.abortSessionOperations(active.runtime.session);
             }
             finally {
                 await active.runtime.dispose();
             }
         }));
+        await this.publishUnreadMutations([]);
     }
     async list(cwd) {
         const [sessions, archivedRecords] = await Promise.all([this.sessionManager.list(cwd), this.archiveStore.list()]);
@@ -253,8 +460,13 @@ export class PiSessionService {
             .filter((record) => record.cwd === cwd)
             .map((record) => this.ensureArchivedSessionMoved(record, sessionsById.get(record.sessionId))));
         const archivedById = new Map(archivedForCwd.map((record) => [record.sessionId, record]));
+        for (const record of archivedForCwd) {
+            this.publishNotificationMutations(this.notificationStore.clearSession(record.sessionId, "archive-reconcile"));
+        }
         const unarchivedSessions = sessions.filter((session) => !archivedById.has(session.id)).map(clientSessionFromListEntry);
-        this.workspaceActivity?.reconcileSessionActivity(cwd, this.reconcilableSessionIds(cwd, unarchivedSessions.map((session) => session.id), archivedById));
+        const reconcilableSessionIds = this.reconcilableSessionIds(cwd, unarchivedSessions.map((session) => session.id), archivedById);
+        this.workspaceActivity?.reconcileSessionActivity(cwd, reconcilableSessionIds);
+        await this.publishUnreadMutations(this.unreadStore.reconcileCwd(canonicalizeStoredCwd(cwd), reconcilableSessionIds));
         const archivedSessions = archivedForCwd
             .sort(compareArchivedRecords)
             .map((record) => clientSessionFromArchivedRecord(record, sessionsById.get(record.sessionId)))
@@ -329,7 +541,7 @@ export class PiSessionService {
             ...(parentSessionFile === undefined ? {} : { parentSessionFile }),
             cwd: decision.cwd,
         };
-        this.registerVerifiedSubsession(link);
+        await this.registerVerifiedSubsession(link);
         this.persistSubsessionLink(link);
         this.persistSubsessionChildMarker(input.parentSessionId, created.id);
         await this.prompt(created.id, input.prompt);
@@ -404,7 +616,7 @@ export class PiSessionService {
             return undefined;
         return sessionFileMatches(session, link.childSessionFile) ? link : undefined;
     }
-    registerVerifiedSubsession(link) {
+    async registerVerifiedSubsession(link) {
         const { childSessionId, parentSessionId } = link;
         const previousParentId = this.subsessionParents.get(childSessionId);
         if (previousParentId !== undefined && previousParentId !== parentSessionId) {
@@ -420,6 +632,24 @@ export class PiSessionService {
         this.subsessionLinks.set(childSessionId, link);
         if (!this.subsessionNotifyArmed.has(childSessionId))
             this.subsessionNotifyArmed.set(childSessionId, false);
+        const cwd = this.cwdForVerifiedSubsession(link);
+        await this.publishUnreadMutations(this.unreadStore.excludeSession(childSessionId, cwd));
+    }
+    cwdForVerifiedSubsession(link) {
+        const activeCwd = this.activeChildForSubsessionLink(link)?.runtime.session.sessionManager.getCwd();
+        const linkedCwd = nonEmptyString(activeCwd) ?? nonEmptyString(link.cwd);
+        if (linkedCwd !== undefined)
+            return canonicalizeStoredCwd(linkedCwd);
+        const childSessionFile = link.childSessionFile;
+        if (childSessionFile !== undefined) {
+            try {
+                return canonicalizeStoredCwd(this.sessionManager.open(childSessionFile).getCwd());
+            }
+            catch (error) {
+                throw new Error("Could not resolve cwd for verified tracked sub-session", { cause: error });
+            }
+        }
+        throw new Error("Could not resolve cwd for verified tracked sub-session");
     }
     unregisterSubsession(childSessionId) {
         const parentSessionId = this.subsessionParents.get(childSessionId);
@@ -466,40 +696,44 @@ export class PiSessionService {
         const activeParent = this.active.get(parentSessionId);
         if (activeParent !== undefined && (parentSessionFile === undefined || activeSessionFileMatches(activeParent, parentSessionFile))) {
             const activeParentFile = nonEmptyString(activeParent.runtime.session.sessionFile);
-            await this.registerPersistedSubsessionLinks(parentSessionId, activeParent.runtime.session.sessionManager, activeParentFile);
-            this.subsessionHydratedParents.add(hydrationKey);
+            const complete = await this.registerPersistedSubsessionLinks(parentSessionId, activeParent.runtime.session.sessionManager, activeParentFile);
+            if (complete)
+                this.subsessionHydratedParents.add(hydrationKey);
             return;
         }
         if (parentSessionFile === undefined)
             return;
-        if ((await readSessionHeaderSummary(parentSessionFile))?.id !== parentSessionId) {
-            this.subsessionHydratedParents.add(hydrationKey);
+        if ((await readSessionHeaderSummary(parentSessionFile))?.id !== parentSessionId)
             return;
-        }
         let parentManager;
         try {
             parentManager = this.sessionManager.open(parentSessionFile);
         }
         catch {
-            this.subsessionHydratedParents.add(hydrationKey);
             return;
         }
-        await this.registerPersistedSubsessionLinks(parentSessionId, parentManager, parentSessionFile);
-        this.subsessionHydratedParents.add(hydrationKey);
+        const complete = await this.registerPersistedSubsessionLinks(parentSessionId, parentManager, parentSessionFile);
+        if (complete)
+            this.subsessionHydratedParents.add(hydrationKey);
     }
     async registerPersistedSubsessionLinks(parentSessionId, parentManager, parentSessionFile) {
         // Parent custom links are the authoritative recovery record: verify the
-        // exact live child file/header before tracking.
+        // exact live child file/header before tracking. Do not negatively cache a
+        // scan while a candidate child is temporarily unavailable.
         const entries = parentManager.getEntries?.() ?? parentManager.getBranch();
+        let complete = true;
         for (const entry of entries) {
             const link = parsePersistedParentSubsessionLink(entry);
-            if (link === undefined)
+            if (link?.spawnedBySessionId !== parentSessionId)
                 continue;
             const verified = await this.verifiedSubsessionLinkFromParentLink(parentSessionId, parentSessionFile, link);
-            if (verified === undefined)
+            if (verified === undefined) {
+                complete = false;
                 continue;
-            this.registerVerifiedSubsession(verified);
+            }
+            await this.registerVerifiedSubsession(verified);
         }
+        return complete;
     }
     async verifiedSubsessionLinkFromParentLink(parentSessionId, parentSessionFile, link) {
         if (parentSessionFile === undefined)
@@ -518,7 +752,7 @@ export class PiSessionService {
         const link = await this.verifiedSubsessionLinkFromOpenedChild(session);
         if (link === undefined)
             return;
-        this.registerVerifiedSubsession(link);
+        await this.registerVerifiedSubsession(link);
     }
     verifiedSubsessionLinkFromOpenedChild(session) {
         return verifiedTrackedSubsessionLink(this.sessionManager, {
@@ -563,6 +797,16 @@ export class PiSessionService {
             return "error";
         return "idle";
     }
+    workingSubsessionIds(parentSessionId) {
+        const childIds = this.subsessionChildren.get(parentSessionId);
+        if (childIds === undefined)
+            return [];
+        return [...childIds].filter((childId) => {
+            const link = this.subsessionLinks.get(childId);
+            const active = link === undefined ? undefined : this.activeChildForSubsessionLink(link);
+            return active !== undefined && this.hasActiveWork(active.runtime.session);
+        });
+    }
     /**
      * Drive parent notifications from a tracked child's status. Arms a pending
      * notification while the child is working, and when it stops fires a single
@@ -583,8 +827,12 @@ export class PiSessionService {
         this.subsessionNotifyArmed.set(childId, false);
         const status = this.activities.get(childId)?.phase === "error" ? "error" : "idle";
         const finalText = finalAssistantText(historyMessages(session));
-        const preview = finalText === "" ? "(no output)" : truncateForNotification(finalText);
-        const text = `Subsession ${childId} stopped working (status: ${status}). Latest output:\n\n${preview}\n\nStatus and latest output are available through check_subsession with sessionId "${childId}"; its full transcript is available through read_subsession.`;
+        const outputSection = formatSubsessionNotificationOutput(childId, finalText);
+        const workingIds = this.workingSubsessionIds(link.parentSessionId);
+        const next = workingIds.length === 0
+            ? "No other tracked subsessions are working."
+            : `Still working: ${workingIds.join(", ")}. Continue working, or call yield_to_subsessions alone and last at the next join point. Further completion notices arrive automatically; do not poll.`;
+        const text = `Subsession ${childId} stopped working (${status}).\n${next}\n\n${outputSection}`;
         void this.notifyParentOfSubsession(link.parentSessionId, childId, text);
     }
     async getOrOpenParentForSubsession(parentSessionId, childSessionId) {
@@ -613,13 +861,25 @@ export class PiSessionService {
     async notifyParentOfSubsession(parentId, childId, text) {
         try {
             const session = await this.getOrOpenParentForSubsession(parentId, childId);
-            await session.sendCustomMessage({ customType: SUBSESSION_NOTIFICATION_CUSTOM_TYPE, content: text, display: true, details: { sessionId: childId } }, { triggerTurn: true, deliverAs: "followUp" });
-            this.publishStatus(session);
+            if (this.treeNavigations.has(session)) {
+                const pending = this.deferredSubsessionNotifications.get(session) ?? [];
+                pending.push({ parentId, childId, text });
+                this.deferredSubsessionNotifications.set(session, pending);
+                return;
+            }
+            await this.deliverSubsessionNotification(session, { parentId, childId, text });
         }
         catch (error) {
-            this.logger.info({ parentSessionId: parentId, sessionId: childId, error: error instanceof Error ? error.message : String(error) }, "failed to notify parent of subsession completion");
+            this.logSubsessionNotificationFailure(parentId, childId, error);
         }
     }
+    async deliverSubsessionNotification(session, notification) {
+        await this.runSessionEntryMutation(session, "deliver a subsession notification", () => session.sendCustomMessage({ customType: SUBSESSION_NOTIFICATION_CUSTOM_TYPE, content: notification.text, display: true, details: { sessionId: notification.childId } }, { triggerTurn: true, deliverAs: "followUp" }));
+        this.publishStatus(session);
+    }
+    logSubsessionNotificationFailure(parentId, childId, error) {
+        this.logger.info({ parentSessionId: parentId, sessionId: childId, error: error instanceof Error ? error.message : String(error) }, "failed to notify parent of subsession completion");
+    }
     async messages(ref, page) {
         const session = await this.getOrOpen(ref);
         return pageMessagesAtSafeBoundary(historyMessages(session), page);
@@ -627,26 +887,47 @@ export class PiSessionService {
     async status(ref) {
         return this.statusFromSession(await this.getOrOpen(ref));
     }
+    /**
+     * Join-time snapshot of the in-flight assistant stream. The `seq` watermark and
+     * the partial are read together in one synchronous tick (no await between the
+     * `currentSeq` read and the `state.streamingMessage` read) so a joining client
+     * can seed the partial and then apply only buffered live events with
+     * `seq > snapshot.seq`. The partial is browser-projected to strip thinking
+     * signatures; it is `null` when no assistant message is mid-stream.
+     */
+    async streamSnapshot(ref) {
+        const session = await this.getOrOpen(ref);
+        // Single consistent tick: capture the watermark and the partial together so
+        // the seq matches the partial the client seeds against.
+        const seq = this.events.currentSeq(session.sessionId);
+        const streamingMessage = session.state.streamingMessage;
+        const partial = streamingMessage === undefined || streamingMessage === null
+            ? null
+            : projectBrowserMessage(streamingMessage);
+        return { seq, partial };
+    }
     async availableModels(ref) {
         const session = await this.getOrOpen(ref);
-        session.modelRegistry.refresh();
+        await session.modelRuntime.refresh();
         const models = session.scopedModels.length > 0
             ? session.scopedModels.map((scoped) => scoped.model)
-            : session.modelRegistry.getAvailable();
+            : session.modelRuntime.getAvailableSnapshot();
         return models.map(modelToClientModel);
     }
     async setModel(ref, provider, modelId) {
         await this.assertWritable(ref);
         const session = await this.getOrOpen(ref);
-        session.modelRegistry.refresh();
+        this.assertTreeNavigationInactive(session, "change models");
+        await session.modelRuntime.refresh();
+        this.assertTreeNavigationInactive(session, "change models");
         const candidates = session.scopedModels.length > 0
             ? session.scopedModels.map((scoped) => scoped.model)
-            : session.modelRegistry.getAvailable();
+            : session.modelRuntime.getAvailableSnapshot();
         const model = candidates.find((candidate) => candidate.provider === provider && candidate.id === modelId)
-            ?? session.modelRegistry.find(provider, modelId);
+            ?? session.modelRuntime.getModel(provider, modelId);
         if (model === undefined)
             throw new Error(`Model not found: ${provider}/${modelId}`);
-        await session.setModel(model);
+        await this.runSessionEntryMutation(session, "change models", () => session.setModel(model));
         this.publishActivity(session, `model: ${model.id}`, "idle", model.provider);
         this.publishStatus(session);
         return this.statusFromSession(session);
@@ -654,7 +935,7 @@ export class PiSessionService {
     async cycleModel(ref, direction) {
         await this.assertWritable(ref);
         const session = await this.getOrOpen(ref);
-        const result = await session.cycleModel(direction);
+        const result = await this.runSessionEntryMutation(session, "change models", () => session.cycleModel(direction));
         if (result === undefined)
             throw new Error(session.scopedModels.length > 0 ? "Only one model in scope" : "Only one model available");
         this.publishActivity(session, `model: ${result.model.id}`, "idle", result.model.provider);
@@ -668,6 +949,7 @@ export class PiSessionService {
     async setThinkingLevel(ref, level) {
         await this.assertWritable(ref);
         const session = await this.getOrOpen(ref);
+        this.assertTreeNavigationInactive(session, "change the thinking level");
         // pi owns the valid set; validate against the session's live levels rather
         // than a hardcoded union so this stays correct if pi changes the set.
         const available = session.getAvailableThinkingLevels();
@@ -682,6 +964,7 @@ export class PiSessionService {
     async cycleThinkingLevel(ref) {
         await this.assertWritable(ref);
         const session = await this.getOrOpen(ref);
+        this.assertTreeNavigationInactive(session, "change the thinking level");
         const level = session.cycleThinkingLevel();
         if (level === undefined)
             throw new Error("Current model does not support thinking");
@@ -715,6 +998,7 @@ export class PiSessionService {
         const images = (await attachmentsToInlineImages(parsedAttachments)).map((entry) => entry.image);
         await this.assertWritable(ref);
         const session = await this.getOrOpen(ref);
+        this.assertTreeNavigationInactive(session, "send a prompt");
         this.maybeGenerateSessionName(session, promptText);
         const isQueued = session.isStreaming || session.isCompacting;
         const behavior = isQueued ? requestedBehavior ?? "followUp" : undefined;
@@ -734,7 +1018,7 @@ export class PiSessionService {
         if (behavior === undefined && echoUserMessage)
             this.events.publish(session.sessionId, { type: "message.append", message: userMessage(text, images) });
         const promptOptions = buildPromptOptions(behavior, images);
-        const promptPromise = session.prompt(text, promptOptions).catch((error) => {
+        const promptPromise = this.runSessionEntryMutation(session, "send a prompt", () => session.prompt(text, promptOptions)).catch((error) => {
             const message = error instanceof Error ? error.message : String(error);
             this.publishActivity(session, "error", "error", message);
             this.events.publish(session.sessionId, { type: "session.error", message });
@@ -761,6 +1045,7 @@ export class PiSessionService {
         await this.assertWritable(ref);
         const active = await this.getActive(ref);
         const { session } = active.runtime;
+        this.assertTreeNavigationInactive(session, "run a shell command");
         const isExcluded = text.startsWith("!!");
         const command = (isExcluded ? text.slice(2) : text.slice(1)).trim();
         if (!command)
@@ -769,11 +1054,11 @@ export class PiSessionService {
             throw new Error("A bash command is already running");
         this.publishActivity(session, "running bash", "active", command);
         this.events.publish(session.sessionId, { type: "shell.start", command, excludeFromContext: isExcluded });
-        void session.executeBash(command, (chunk) => {
+        void this.runSessionEntryMutation(session, "run a shell command", () => session.executeBash(command, (chunk) => {
             this.events.publish(session.sessionId, { type: "shell.chunk", chunk });
             this.publishActivity(session, "running bash", "active", command);
             this.publishStatus(session);
-        }, { excludeFromContext: isExcluded }).then((result) => {
+        }, { excludeFromContext: isExcluded })).then((result) => {
             this.events.publish(session.sessionId, {
                 type: "shell.end",
                 output: result.output,
@@ -802,30 +1087,103 @@ export class PiSessionService {
         const active = await this.getActive(ref);
         return this.commandService.respond(active.runtime.session.sessionId, requestId, value);
     }
-    async reloadSessionRuntime(session) {
+    async navigateTree(ref, request) {
+        if (request.targetId.trim() === "")
+            throw new Error("Session tree target is required");
+        if (this.isTreeExclusiveSessionIdentityActive(sessionIdFromLookup(ref))) {
+            throw new Error("Stop current session activity before navigating the session tree");
+        }
+        await this.assertWritable(ref);
+        const options = sessionTreeNavigationOptions(request);
+        const session = await this.getOrOpen(ref);
+        if (typeof session.navigateTree !== "function")
+            throw new Error("Session tree navigation is not supported by this Pi runtime");
         if (this.hasActiveWork(session))
-            throw new Error("Stop current session activity before reloading");
-        this.publishActivity(session, "reloading resources", "active");
+            throw new Error("Stop current session activity before navigating the session tree");
+        // Acquire synchronously after the active-work check. No leaf-producing work
+        // may enter this runtime until Pi's potentially asynchronous summary settles.
+        this.treeNavigations.add(session);
         try {
-            await session.reload();
-            this.publishActivity(session, "resources reloaded", "idle");
+            if (session.sessionManager.getLeafId() !== request.expectedLeafId) {
+                throw new Error("The session changed since /tree was opened. Reopen /tree and try again.");
+            }
+            this.publishActivity(session, options.summarize ? "summarizing branch" : "navigating session tree", "active");
             this.publishStatus(session);
+            const result = await session.navigateTree(request.targetId, options);
+            if (result.cancelled) {
+                if (this.isCurrentActiveSession(session)) {
+                    this.publishActivity(session, result.aborted === true ? "branch summary aborted" : "tree navigation cancelled", "idle");
+                }
+                return { cancelled: true, ...(result.aborted === undefined ? {} : { aborted: result.aborted }) };
+            }
+            if (this.isCurrentActiveSession(session))
+                this.publishActivity(session, "session tree navigated", "idle");
+            return { cancelled: false, ...(result.editorText === undefined ? {} : { editorText: result.editorText }) };
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            this.publishActivity(session, "reload failed", "error", message);
-            this.events.publish(session.sessionId, { type: "session.error", message });
-            this.publishStatus(session);
+            if (this.isCurrentActiveSession(session)) {
+                this.publishActivity(session, "tree navigation failed", "error", message);
+                this.events.publish(session.sessionId, { type: "session.error", message });
+            }
             throw error;
         }
+        finally {
+            this.treeNavigations.delete(session);
+            if (this.isCurrentActiveSession(session)) {
+                this.flushDeferredTreeNavigationWork(session);
+                this.publishStatus(session);
+            }
+            else {
+                this.deferredGeneratedSessionNames.delete(session);
+                this.deferredSubsessionNotifications.delete(session);
+            }
+        }
+    }
+    async reloadSessionRuntime(session) {
+        if (this.hasActiveWork(session))
+            throw new Error("Stop current session activity before reloading");
+        await this.runTreeExclusiveOperation([{ sessionId: session.sessionId, session }], "Stop current session activity before reloading", async () => {
+            this.publishActivity(session, "reloading resources", "active");
+            const priorGeneration = this.notificationGenerationBySession.get(session);
+            let candidateGeneration;
+            try {
+                await session.reload(priorGeneration === undefined ? undefined : {
+                    beforeSessionStart: () => {
+                        candidateGeneration = this.notificationStore.beginReplacement(priorGeneration, notificationIdentityForSession(session));
+                        this.notificationGenerationBySession.set(session, candidateGeneration);
+                        this.replaceSessionNotificationContext(session, candidateGeneration);
+                    },
+                });
+                if (candidateGeneration !== undefined) {
+                    this.publishNotificationMutations(this.notificationStore.commitReplacement(candidateGeneration));
+                }
+                this.publishActivity(session, "resources reloaded", "idle");
+                this.publishStatus(session);
+            }
+            catch (error) {
+                if (candidateGeneration !== undefined) {
+                    this.publishNotificationMutations(this.notificationStore.abortReplacement(candidateGeneration, "candidate"));
+                    this.notificationGenerationBySession.set(session, candidateGeneration);
+                }
+                const message = error instanceof Error ? error.message : String(error);
+                this.publishActivity(session, "reload failed", "error", message);
+                this.events.publish(session.sessionId, { type: "session.error", message });
+                this.publishStatus(session);
+                throw error;
+            }
+        });
     }
     async archive(ref) {
         const session = await this.getOrOpen(ref);
         if (this.hasActiveWork(session))
             throw new Error("Stop current session activity before archiving");
-        const archiveInput = await this.archiveInputForSession(session);
-        await this.closeActive(session.sessionId);
-        await this.archiveStore.archive(archiveInput);
+        await this.runTreeExclusiveOperation([{ sessionId: session.sessionId, session }], "Stop current session activity before archiving", async () => {
+            const archiveInput = await this.archiveInputForSession(session);
+            await this.closeActive(session.sessionId, { kind: "clear", reason: "archive" });
+            await this.archiveStore.archive(archiveInput);
+            await this.forgetUnreadSessions([archiveInput]);
+        });
     }
     async archiveMany(refs) {
         const uniqueRefs = uniqueBulkSessionRefs(refs);
@@ -835,11 +1193,14 @@ export class PiSessionService {
         ]);
         const failures = [];
         const alreadyArchivedSessionIds = [];
+        const unreadArchivedIdentities = [];
         const planItems = [];
         for (const ref of uniqueRefs) {
             const archived = findArchivedRecordForBulkRef(archivedRecords, ref);
             if (archived !== undefined) {
+                this.publishNotificationMutations(this.notificationStore.clearSession(archived.sessionId, "archive"));
                 alreadyArchivedSessionIds.push(archived.sessionId);
+                unreadArchivedIdentities.push(archived);
                 continue;
             }
             const active = this.activeForLookup(bulkRefToLookup(ref));
@@ -864,25 +1225,41 @@ export class PiSessionService {
                 failures.push({ sessionId: resolvedSessionId, error: errorMessage(error) });
             }
         }
-        const readyInputs = [];
+        const readyPlanItems = [];
         for (const item of planItems) {
+            const active = this.activeForLookup({ id: item.input.sessionId, cwd: item.input.cwd });
+            if (active !== undefined && this.hasActiveWork(active.runtime.session)) {
+                failures.push({ sessionId: item.input.sessionId, error: "Stop current session activity before archiving" });
+                continue;
+            }
+            readyPlanItems.push(active === undefined ? item : { ...item, active });
+        }
+        const readyInputs = [];
+        const archivedSessionIds = [...alreadyArchivedSessionIds];
+        await this.runTreeExclusiveOperation(readyPlanItems.map(({ input, active }) => ({
+            sessionId: input.sessionId,
+            ...(active === undefined ? {} : { session: active.runtime.session, runtime: active.runtime }),
+        })), "Stop current session activity before archiving", async () => {
+            for (const item of readyPlanItems) {
+                try {
+                    await this.closeActive(item.input.sessionId, { kind: "clear", reason: "archive" });
+                    readyInputs.push(item.input);
+                }
+                catch (error) {
+                    failures.push({ sessionId: item.input.sessionId, error: errorMessage(error) });
+                }
+            }
             try {
-                await this.closeActive(item.input.sessionId);
-                readyInputs.push(item.input);
+                const archived = await this.archiveStoreArchiveMany(readyInputs);
+                archivedSessionIds.push(...archived.map((record) => record.sessionId));
+                unreadArchivedIdentities.push(...archived);
             }
             catch (error) {
-                failures.push({ sessionId: item.input.sessionId, error: errorMessage(error) });
+                for (const input of readyInputs)
+                    failures.push({ sessionId: input.sessionId, error: errorMessage(error) });
             }
-        }
-        const archivedSessionIds = [...alreadyArchivedSessionIds];
-        try {
-            const archived = await this.archiveStoreArchiveMany(readyInputs);
-            archivedSessionIds.push(...archived.map((record) => record.sessionId));
-        }
-        catch (error) {
-            for (const input of readyInputs)
-                failures.push({ sessionId: input.sessionId, error: errorMessage(error) });
-        }
+        });
+        await this.forgetUnreadSessions(unreadArchivedIdentities);
         return {
             archived: true,
             archivedSessionIds: uniqueStrings(archivedSessionIds),
@@ -899,9 +1276,19 @@ export class PiSessionService {
         if (busy !== undefined)
             throw new Error(`Stop current session activity before archiving ${sessionDisplayName(busy)}`);
         const archiveInputs = plan.unarchivedTargets.map((target) => archiveInputFromCandidate(target));
-        for (const input of archiveInputs)
-            await this.closeActive(input.sessionId);
-        await this.archiveStoreArchiveMany(archiveInputs);
+        await this.runTreeExclusiveOperation(plan.unarchivedTargets.map((target) => ({
+            sessionId: target.id,
+            ...(target.activeSession === undefined ? {} : { session: target.activeSession }),
+        })), `Stop current session activity before archiving ${sessionDisplayName(session)}`, async () => {
+            for (const target of plan.targets) {
+                if (target.archived)
+                    this.publishNotificationMutations(this.notificationStore.clearSession(target.id, "archive"));
+            }
+            for (const input of archiveInputs)
+                await this.closeActive(input.sessionId, { kind: "clear", reason: "archive" });
+            await this.archiveStoreArchiveMany(archiveInputs);
+        });
+        await this.forgetUnreadSessions(plan.targets.map((target) => ({ sessionId: target.id, cwd: target.cwd })));
         return {
             archived: true,
             sessionIds: archiveInputs.map((input) => input.sessionId),
@@ -913,8 +1300,9 @@ export class PiSessionService {
         const archived = await this.getArchived(ref);
         if (archived === undefined)
             throw new Error("Session not found");
-        await this.closeActive(archived.sessionId);
+        await this.closeActive(archived.sessionId, { kind: "clear", reason: "restore" });
         await this.archiveStore.restore(archived.sessionId);
+        await this.forgetUnreadSessions([archived]);
     }
     async deleteArchived(ref) {
         const record = await this.getArchived(ref);
@@ -922,10 +1310,11 @@ export class PiSessionService {
             throw new Error("Archived session not found");
         if (this.archiveStore.deleteArchived === undefined)
             throw new Error("Archive store does not support deletion");
-        await this.closeActive(record.sessionId);
+        await this.closeActive(record.sessionId, { kind: "clear", reason: "delete" });
         if (record.archivePath === undefined)
             await this.ensureArchivedRecordMoved(record);
         await this.archiveStore.deleteArchived(record.sessionId);
+        await this.forgetUnreadSessions([record]);
     }
     async deleteArchivedMany(refs) {
         if (this.archiveStore.deleteArchived === undefined && this.archiveStore.deleteArchivedMany === undefined)
@@ -950,7 +1339,7 @@ export class PiSessionService {
         const readyRecords = [];
         for (const item of planItems) {
             try {
-                await this.closeActive(item.record.sessionId);
+                await this.closeActive(item.record.sessionId, { kind: "clear", reason: "delete" });
                 readyRecords.push(item.record);
             }
             catch (error) {
@@ -971,6 +1360,8 @@ export class PiSessionService {
             for (const sessionId of deleteIds)
                 failures.push({ sessionId, error: errorMessage(error) });
         }
+        const deletedIdSet = new Set(deletedSessionIds);
+        await this.forgetUnreadSessions(readyRecords.filter((record) => deletedIdSet.has(record.sessionId)));
         return {
             deleted: true,
             deletedSessionIds,
@@ -983,9 +1374,29 @@ export class PiSessionService {
         const session = await this.getOrOpen(ref);
         if (this.hasActiveWork(session))
             throw new Error("Stop current session activity before reloading");
-        await this.closeActive(session.sessionId);
-        const reopened = await this.getActive(ref);
-        this.publishStatus(reopened.runtime.session);
+        const reopenedSession = await this.runTreeExclusiveOperation([{ sessionId: session.sessionId, session }], "Stop current session activity before reloading", async () => {
+            const priorGeneration = this.notificationGenerationBySession.get(session);
+            const { sessionId, cwd } = notificationIdentityForSession(session);
+            let candidateGeneration;
+            try {
+                await this.closeActive(sessionId, priorGeneration === undefined ? CLEAR_RUNTIME_NOTIFICATIONS : DEFER_RUNTIME_NOTIFICATIONS);
+                candidateGeneration = priorGeneration === undefined
+                    ? undefined
+                    : this.notificationStore.beginReplacement(priorGeneration, { sessionId, cwd });
+                const reopened = await this.getActive(ref, candidateGeneration === undefined ? {} : { notificationGeneration: candidateGeneration });
+                if (candidateGeneration !== undefined) {
+                    this.publishNotificationMutations(this.notificationStore.commitReplacement(candidateGeneration));
+                }
+                return reopened.runtime.session;
+            }
+            catch (error) {
+                if (candidateGeneration !== undefined) {
+                    this.publishNotificationMutations(this.notificationStore.abortReplacement(candidateGeneration));
+                }
+                throw error;
+            }
+        });
+        this.publishStatus(reopenedSession);
     }
     async detachParent(ref) {
         const session = await this.getOrOpen(ref);
@@ -995,6 +1406,21 @@ export class PiSessionService {
         await clearParentSession(sessionFile);
         clearParentSessionHeader(session.sessionManager);
         this.unregisterSubsession(session.sessionId);
+        await this.forgetUnreadSessions([{ sessionId: session.sessionId, cwd: session.sessionManager.getCwd() }]);
+    }
+    async clearQueue(ref) {
+        await this.assertWritable(ref);
+        const session = await this.getOrOpen(ref);
+        this.clearCompactionPromptQueue(session.sessionId);
+        clearSessionQueue(session);
+        this.publishStatus(session);
+        return this.statusFromSession(session);
+    }
+    async dismissWarning(ref, dismissId) {
+        const session = await this.getOrOpen(ref);
+        dismissSessionWarning(session, dismissId);
+        this.publishStatus(session);
+        return this.statusFromSession(session);
     }
     async abort(ref) {
         const active = this.activeForLookup(ref);
@@ -1003,17 +1429,30 @@ export class PiSessionService {
         const sessionId = active.runtime.session.sessionId;
         this.clearCompactionPromptQueue(sessionId);
         clearSessionQueue(active.runtime.session);
-        await active.runtime.session.abort();
-        this.publishActivity(active.runtime.session, "stopped", "idle");
-        this.publishStatus(active.runtime.session);
+        try {
+            await this.abortSessionOperations(active.runtime.session);
+            this.publishActivity(active.runtime.session, "stopped", "idle");
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            this.publishActivity(active.runtime.session, "stop failed", "error", message);
+            throw error;
+        }
+        finally {
+            this.publishStatus(active.runtime.session);
+        }
     }
-    stop(ref) {
+    async stop(ref) {
         const active = this.activeForLookup(ref);
-        if (active === undefined)
+        if (active !== undefined) {
+            await this.closeActive(active.runtime.session.sessionId);
             return;
-        void this.closeActive(active.runtime.session.sessionId).catch(() => {
-            // Best-effort shutdown; callers that need errors await closeActive directly.
-        });
+        }
+        if (isPiSessionRef(ref)) {
+            this.publishNotificationMutations(this.notificationStore.clearSessionIdentity(ref.id, canonicalizeStoredCwd(ref.cwd), "runtime-close"));
+            return;
+        }
+        await this.closeActive(ref);
     }
     async bulkSessionLookupContext(refs) {
         const cwdSet = new Set();
@@ -1202,13 +1641,21 @@ export class PiSessionService {
         }
         return [...names];
     }
-    async closeActive(sessionId) {
+    async closeActive(sessionId, notificationPolicy = CLEAR_RUNTIME_NOTIFICATIONS) {
         const pendingOpens = this.pendingSessionOpenPromises(sessionId);
         if (pendingOpens.length > 0)
             await Promise.allSettled(pendingOpens);
         const active = this.active.get(sessionId);
+        if (notificationPolicy.kind === "clear") {
+            const generation = active === undefined ? undefined : this.notificationGenerationBySession.get(active.runtime.session);
+            const mutations = generation === undefined
+                ? this.notificationStore.clearSession(sessionId, notificationPolicy.reason)
+                : this.notificationStore.clearGeneration(generation, notificationPolicy.reason);
+            this.publishNotificationMutations(mutations);
+        }
         if (!active)
             return;
+        this.forgetUnreadActivity(active.runtime.session);
         this.active.delete(sessionId);
         this.activities.delete(sessionId);
         this.workspaceActivity?.removeSession(sessionId, active.runtime.session.sessionManager.getCwd());
@@ -1221,13 +1668,36 @@ export class PiSessionService {
             this.subsessionNotifyArmed.delete(sessionId);
         clearSessionQueue(active.runtime.session);
         active.unsubscribe();
+        active.runtime.setRebindSession(undefined);
         try {
-            await active.runtime.session.abort();
+            await this.abortSessionOperations(active.runtime.session);
         }
         finally {
             await active.runtime.dispose();
         }
     }
+    async abortSessionOperations(session) {
+        let branchSummaryAbortFailed = false;
+        let branchSummaryAbortError;
+        try {
+            session.abortBranchSummary?.();
+        }
+        catch (error) {
+            branchSummaryAbortFailed = true;
+            branchSummaryAbortError = error;
+        }
+        try {
+            await session.abort();
+        }
+        catch (abortError) {
+            if (branchSummaryAbortFailed) {
+                throw new AggregateError([branchSummaryAbortError, abortError], "Failed to abort session operations", { cause: abortError });
+            }
+            throw abortError;
+        }
+        if (branchSummaryAbortFailed)
+            throw branchSummaryAbortError;
+    }
     async assertWritable(ref) {
         if (await this.getArchived(ref) !== undefined)
             throw new Error("Archived sessions are read-only. Restore the session to continue.");
@@ -1235,23 +1705,23 @@ export class PiSessionService {
     async getOrOpen(ref) {
         return (await this.getActive(ref)).runtime.session;
     }
-    async getActive(ref) {
+    async getActive(ref, options = {}) {
         const active = this.activeForLookup(ref);
         if (active !== undefined)
             return active;
         const archived = await this.getArchived(ref);
         if (archived?.archivePath !== undefined) {
             const { archivePath } = archived;
-            return this.openExistingSession(archived.sessionId, archived.cwd, () => this.sessionManager.open(archivePath));
+            return this.openExistingSession(archived.sessionId, archived.cwd, () => this.sessionManager.open(archivePath), { notifications: "disabled" });
         }
         const match = isPiSessionRef(ref)
             ? (await this.sessionManager.list(ref.cwd)).find((s) => s.id === ref.id || s.id.startsWith(ref.id))
             : (await this.sessionManager.listAll?.() ?? []).find((s) => s.id === ref || s.id.startsWith(ref));
         if (!match)
             throw new Error("Session not found");
-        return this.openExistingSession(match.id, match.cwd, () => this.sessionManager.open(match.path));
+        return this.openExistingSession(match.id, match.cwd, () => this.sessionManager.open(match.path), options);
     }
-    openExistingSession(sessionId, cwd, openSessionManager) {
+    openExistingSession(sessionId, cwd, openSessionManager, options = {}) {
         const active = this.activeForLookup({ id: sessionId, cwd });
         if (active !== undefined)
             return Promise.resolve(active);
@@ -1261,7 +1731,7 @@ export class PiSessionService {
             return existing.promise;
         const pending = {
             sessionId,
-            promise: this.create(openSessionManager(), cwd),
+            promise: this.create(openSessionManager(), cwd, options),
         };
         pending.promise = pending.promise.finally(() => {
             if (this.pendingSessionOpens.get(key) === pending)
@@ -1283,6 +1753,9 @@ export class PiSessionService {
             return undefined;
         return archived;
     }
+    isCurrentActiveSession(session) {
+        return this.active.get(session.sessionId)?.runtime.session === session;
+    }
     activeForLookup(ref) {
         const sessionId = sessionIdFromLookup(ref);
         const exact = this.active.get(sessionId);
@@ -1305,21 +1778,83 @@ export class PiSessionService {
             ...(options.initialModel === undefined ? {} : { initialModel: options.initialModel }),
         });
         const active = { runtime, unsubscribe: noop };
+        let boundSession = runtime.session;
+        let notificationGeneration = options.notificationGeneration;
+        let notificationOwnership = options.notifications === "disabled"
+            ? "disabled"
+            : notificationGeneration === undefined
+                ? "registered"
+                : "external";
+        if (notificationOwnership === "registered") {
+            const notificationIdentity = notificationIdentityForSession(runtime.session);
+            const existingCandidate = this.notificationStore.beginReplacementForSession(notificationIdentity.sessionId, notificationIdentity.cwd);
+            if (existingCandidate !== undefined) {
+                notificationGeneration = existingCandidate;
+                notificationOwnership = "replacement";
+            }
+            else {
+                const registration = this.notificationStore.registerSession(notificationIdentity.sessionId, notificationIdentity.cwd);
+                notificationGeneration = registration.generation;
+                this.publishNotificationMutations(registration.mutations);
+            }
+        }
+        if (notificationGeneration !== undefined)
+            this.notificationGenerationBySession.set(runtime.session, notificationGeneration);
         try {
-            await this.bindSessionExtensions(runtime.session);
+            if (options.creationProvenance === "tracked-subsession") {
+                await this.publishUnreadMutations(this.unreadStore.excludeSession(runtime.session.sessionId, canonicalizeStoredCwd(runtime.session.sessionManager.getCwd())));
+            }
+            else {
+                await this.recoverSubsessionTrackingForOpenedSession(runtime.session);
+            }
+            await this.bindSessionExtensions(runtime.session, notificationGeneration);
             this.bindRuntime(active);
             runtime.setRebindSession(async (session) => {
-                await this.bindSessionExtensions(session);
-                this.bindRuntime(active);
-                await this.recoverSubsessionTrackingForOpenedSession(session);
+                const priorGeneration = notificationGeneration;
+                let candidateGeneration;
+                try {
+                    await this.prepareUnreadRuntimeRebind(boundSession, session);
+                    await this.recoverSubsessionTrackingForOpenedSession(session);
+                    if (priorGeneration !== undefined) {
+                        candidateGeneration = this.notificationStore.beginReplacement(priorGeneration, notificationIdentityForSession(session));
+                        this.notificationGenerationBySession.set(session, candidateGeneration);
+                    }
+                    this.bindRuntime(active, session);
+                    boundSession = session;
+                    await this.bindSessionExtensions(session, candidateGeneration);
+                    if (candidateGeneration !== undefined) {
+                        this.publishNotificationMutations(this.notificationStore.commitReplacement(candidateGeneration));
+                        notificationGeneration = candidateGeneration;
+                    }
+                }
+                catch (error) {
+                    if (candidateGeneration !== undefined) {
+                        this.publishNotificationMutations(this.notificationStore.abortReplacement(candidateGeneration, "candidate"));
+                        notificationGeneration = candidateGeneration;
+                        this.notificationGenerationBySession.set(session, candidateGeneration);
+                    }
+                    throw error;
+                }
             });
             this.active.set(runtime.session.sessionId, active);
-            await this.recoverSubsessionTrackingForOpenedSession(runtime.session);
+            if (notificationOwnership === "replacement" && notificationGeneration !== undefined) {
+                this.publishNotificationMutations(this.notificationStore.commitReplacement(notificationGeneration));
+                notificationOwnership = "external";
+            }
             this.publishStatus(runtime.session);
             return active;
         }
         catch (error) {
+            if (notificationGeneration !== undefined) {
+                if (notificationOwnership === "registered") {
+                    this.publishNotificationMutations(this.notificationStore.clearSession(runtime.session.sessionId, "initialization-failed"));
+                }
+                else if (notificationOwnership === "replacement") {
+                    this.publishNotificationMutations(this.notificationStore.abortReplacement(notificationGeneration));
+                }
+            }
             active.unsubscribe();
+            this.forgetUnreadActivity(boundSession);
             let removedActive = false;
             for (const [sessionId, candidate] of this.active.entries()) {
                 if (candidate !== active)
@@ -1342,8 +1877,11 @@ export class PiSessionService {
             throw error;
         }
     }
-    async bindSessionExtensions(session) {
+    async bindSessionExtensions(session, generation) {
+        const uiContext = this.sessionUiContext(session, generation);
         await session.bindExtensions({
+            uiContext,
+            mode: "rpc",
             onError: (error) => {
                 const message = `${error.extensionPath}: ${error.error}`;
                 this.publishActivity(session, "extension error", "error", message);
@@ -1351,9 +1889,157 @@ export class PiSessionService {
             },
         });
     }
-    bindRuntime(active) {
+    replaceSessionNotificationContext(session, generation) {
+        session.extensionRunner.setUIContext(this.sessionUiContext(session, generation), "rpc");
+    }
+    sessionUiContext(session, generation) {
+        const baseUiContext = session.extensionRunner.getUIContext();
+        const notify = (message, type) => {
+            if (generation === undefined) {
+                this.events.publish(session.sessionId, {
+                    type: "command.output",
+                    level: type === "error" ? "error" : "info",
+                    message,
+                });
+                return;
+            }
+            const added = this.notificationStore.addNotification(generation, message, type);
+            this.publishNotificationMutations(added.mutations);
+            if (added.notification === undefined)
+                return;
+            this.events.publish(session.sessionId, {
+                type: "command.output",
+                level: type === "error" ? "error" : "info",
+                message,
+                notificationId: added.notification.id,
+            });
+        };
+        // PI WEB owns the browser-facing notification and text-formatting
+        // boundaries. Delegate every other UI method to Pi's headless defaults so
+        // unsupported dialogs cancel safely instead of hanging.
+        return new Proxy(baseUiContext, {
+            get(target, property, receiver) {
+                if (property === "notify")
+                    return notify;
+                if (property === "theme")
+                    return plainTextTheme;
+                const value = Reflect.get(target, property, receiver);
+                return value;
+            },
+        });
+    }
+    publishNotificationMutations(mutations) {
+        for (const mutation of mutations) {
+            this.events.publish(mutation.sessionId, mutation.inboxEvent);
+            this.events.publishNotificationSummary(mutation.summaryEvent);
+        }
+    }
+    async prepareUnreadRuntimeRebind(previous, next) {
+        const previousCwd = canonicalizeStoredCwd(previous.sessionManager.getCwd());
+        this.unreadStore.forgetActivity(previous.sessionId, previousCwd);
+        const nextCwd = canonicalizeStoredCwd(next.sessionManager.getCwd());
+        if (previous.sessionId === next.sessionId && cwdPathsEqual(previousCwd, nextCwd))
+            return;
+        await this.publishUnreadMutations(this.unreadStore.forgetSession(previous.sessionId, previousCwd));
+    }
+    forgetUnreadActivity(session) {
+        this.unreadStore.forgetActivity(session.sessionId, canonicalizeStoredCwd(session.sessionManager.getCwd()));
+    }
+    async forgetUnreadSessions(identities) {
+        const mutations = [];
+        for (const identity of identities) {
+            mutations.push(...this.unreadStore.forgetSession(identity.sessionId, canonicalizeStoredCwd(identity.cwd)));
+        }
+        await this.publishUnreadMutations(mutations);
+    }
+    observeUnreadActivityState(session) {
+        const mutations = this.unreadStore.observeActivityState(session.sessionId, canonicalizeStoredCwd(session.sessionManager.getCwd()), this.hasActiveWork(session));
+        if (mutations.length === 0)
+            return;
+        void this.publishUnreadMutations(mutations).catch(() => undefined);
+    }
+    publishUnreadMutations(mutations) {
+        this.enqueueUnreadMutations(mutations);
+        this.unreadPublicationFlushRequested = true;
+        if (this.unreadPublication === undefined && this.unreadPublicationRetryTimer !== undefined) {
+            const failure = this.unreadPublicationFailure;
+            return Promise.reject(failure instanceof Error
+                ? failure
+                : new Error("Session unread publication is awaiting retry", { cause: failure }));
+        }
+        return this.ensureUnreadPublication();
+    }
+    ensureUnreadPublication() {
+        const existing = this.unreadPublication;
+        if (existing !== undefined)
+            return existing;
+        const publication = this.drainUnreadPublication();
+        this.unreadPublication = publication;
+        void publication.then(() => {
+            if (this.unreadPublication === publication)
+                this.unreadPublication = undefined;
+        }, (error) => {
+            if (this.unreadPublication === publication)
+                this.unreadPublication = undefined;
+            this.unreadPublicationFailure = error;
+            this.logger.info({ error: error instanceof Error ? error.message : String(error) }, "failed to publish durable session unread mutations");
+            this.scheduleUnreadPublicationRetry();
+        });
+        return publication;
+    }
+    async drainUnreadPublication() {
+        while (this.unreadPublicationFlushRequested || this.pendingUnreadMutations.length > 0) {
+            this.unreadPublicationFlushRequested = false;
+            const batch = this.pendingUnreadMutations.splice(0);
+            let publishedCount = 0;
+            try {
+                await this.unreadStore.flush();
+                for (const mutation of batch) {
+                    this.events.publishGlobal(mutation.event);
+                    publishedCount += 1;
+                }
+            }
+            catch (error) {
+                this.prependUnreadMutations(batch.slice(publishedCount));
+                this.unreadPublicationFlushRequested = true;
+                throw error;
+            }
+            this.unreadPublicationFailure = undefined;
+            this.clearUnreadPublicationRetry();
+        }
+    }
+    enqueueUnreadMutations(mutations) {
+        this.pendingUnreadMutations.push(...mutations);
+        this.trimPendingUnreadMutations();
+    }
+    prependUnreadMutations(mutations) {
+        this.pendingUnreadMutations.unshift(...mutations);
+        this.trimPendingUnreadMutations();
+    }
+    trimPendingUnreadMutations() {
+        const excess = this.pendingUnreadMutations.length - MAX_PENDING_UNREAD_MUTATIONS;
+        if (excess > 0)
+            this.pendingUnreadMutations.splice(0, excess);
+    }
+    scheduleUnreadPublicationRetry() {
+        if (this.unreadPublicationStopped || this.unreadPublicationRetryTimer !== undefined)
+            return;
+        const delay = this.unreadPublicationRetryDelayMs;
+        this.unreadPublicationRetryDelayMs = Math.min(Math.max(delay * 2, this.unreadPublicationRetryInitialMs), Math.max(MAX_UNREAD_PUBLICATION_RETRY_MS, this.unreadPublicationRetryInitialMs));
+        this.unreadPublicationRetryTimer = setTimeout(() => {
+            this.unreadPublicationRetryTimer = undefined;
+            void this.ensureUnreadPublication().catch(() => undefined);
+        }, delay);
+        this.unreadPublicationRetryTimer.unref();
+    }
+    clearUnreadPublicationRetry() {
+        if (this.unreadPublicationRetryTimer !== undefined)
+            clearTimeout(this.unreadPublicationRetryTimer);
+        this.unreadPublicationRetryTimer = undefined;
+        this.unreadPublicationRetryDelayMs = this.unreadPublicationRetryInitialMs;
+    }
+    bindRuntime(active, session = active.runtime.session) {
         active.unsubscribe();
-        const { session } = active.runtime;
         for (const [sessionId, candidate] of this.active.entries()) {
             if (candidate === active) {
                 this.active.delete(sessionId);
@@ -1444,7 +2130,7 @@ export class PiSessionService {
         const model = session.model;
         if (model === undefined)
             return;
-        void generateShortSessionName(session.agent.streamFn, model, firstMessage).then((name) => {
+        void generateShortSessionName(session.agent.streamFunction, model, firstMessage).then((name) => {
             this.applyGeneratedSessionName(session, name ?? fallbackSessionName(firstMessage));
         }).catch(() => {
             this.applyGeneratedSessionName(session, fallbackSessionName(firstMessage));
@@ -1453,14 +2139,38 @@ export class PiSessionService {
     applyGeneratedSessionName(session, name) {
         if (name === undefined || session.sessionName !== undefined)
             return;
+        if (this.treeNavigations.has(session)) {
+            this.deferredGeneratedSessionNames.set(session, name);
+            return;
+        }
         session.setSessionName(name);
         this.publishSessionName(session);
     }
+    flushDeferredTreeNavigationWork(session) {
+        const generatedName = this.deferredGeneratedSessionNames.get(session);
+        this.deferredGeneratedSessionNames.delete(session);
+        if (generatedName !== undefined) {
+            try {
+                this.applyGeneratedSessionName(session, generatedName);
+            }
+            catch (error) {
+                this.logger.info({ sessionId: session.sessionId, error: error instanceof Error ? error.message : String(error) }, "failed to apply deferred session name");
+            }
+        }
+        const notifications = this.deferredSubsessionNotifications.get(session) ?? [];
+        this.deferredSubsessionNotifications.delete(session);
+        for (const notification of notifications) {
+            void this.deliverSubsessionNotification(session, notification).catch((error) => {
+                this.logSubsessionNotificationFailure(notification.parentId, notification.childId, error);
+            });
+        }
+    }
     applyAuthChange(change = {}) {
-        this.modelRegistry.refresh();
+        // ModelRuntime.login()/logout() refresh the shared runtime before AuthService
+        // emits the change, so no refresh is needed here. Keeping this synchronous
+        // also lets every active session observe the same committed auth snapshot.
         for (const active of this.active.values()) {
             const { session } = active.runtime;
-            session.modelRegistry.refresh();
             this.syncCurrentModelAuthWarning(session, change.removedProviderId);
             this.publishStatus(session);
         }
@@ -1472,10 +2182,10 @@ export class PiSessionService {
         if (model.provider === "unknown" && model.id === "unknown")
             return;
         const warningKey = authLossWarningKey(session.sessionId, model.provider, model.id);
-        const registered = session.modelRegistry.find(model.provider, model.id);
+        const registered = session.modelRuntime.getModel(model.provider, model.id);
         if (registered === undefined)
             return;
-        if (session.modelRegistry.hasConfiguredAuth(registered)) {
+        if (session.modelRuntime.hasConfiguredAuth(model.provider)) {
             this.authLossWarnings.delete(warningKey);
             return;
         }
@@ -1523,6 +2233,10 @@ export class PiSessionService {
         }
     }
     activityLabelFromStatus(session) {
+        if (this.treeNavigations.has(session))
+            return "navigating session tree";
+        if (this.isSessionEntryMutationActive(session))
+            return "updating session";
         if (session.isCompacting)
             return "compacting";
         if (session.isBashRunning)
@@ -1534,7 +2248,92 @@ export class PiSessionService {
         return "active";
     }
     hasActiveWork(session) {
-        return sessionHasActiveWork(session, this.compactionQueuedMessages(session.sessionId).length);
+        return this.treeNavigations.has(session)
+            || this.isSessionEntryMutationActive(session)
+            || this.isTreeExclusiveOperationActive(session)
+            || sessionHasActiveWork(session, this.compactionQueuedMessages(session.sessionId).length);
+    }
+    async runTreeExclusiveOperation(targets, activeError, operation) {
+        const sessionIds = new Set();
+        const runtimes = new Set();
+        const sessions = new Set();
+        for (const target of targets) {
+            const runtime = target.runtime ?? (target.session === undefined ? undefined : this.activeRuntimeForSession(target.session));
+            const session = target.session ?? runtime?.session;
+            if (session !== undefined && this.hasActiveWork(session))
+                throw new Error(activeError);
+            sessionIds.add(target.sessionId);
+            if (runtime !== undefined)
+                runtimes.add(runtime);
+            if (session !== undefined)
+                sessions.add(session);
+        }
+        for (const sessionId of sessionIds) {
+            this.treeExclusiveSessionOperationCounts.set(sessionId, (this.treeExclusiveSessionOperationCounts.get(sessionId) ?? 0) + 1);
+        }
+        for (const runtime of runtimes) {
+            this.treeExclusiveRuntimeOperationCounts.set(runtime, (this.treeExclusiveRuntimeOperationCounts.get(runtime) ?? 0) + 1);
+        }
+        for (const session of sessions)
+            this.observeUnreadActivityState(session);
+        try {
+            return await operation();
+        }
+        finally {
+            for (const runtime of runtimes)
+                decrementWeakCount(this.treeExclusiveRuntimeOperationCounts, runtime);
+            for (const sessionId of sessionIds)
+                decrementMapCount(this.treeExclusiveSessionOperationCounts, sessionId);
+            for (const session of sessions) {
+                if (this.isCurrentActiveSession(session))
+                    this.observeUnreadActivityState(session);
+            }
+        }
+    }
+    isTreeExclusiveSessionIdentityActive(sessionId) {
+        return (this.treeExclusiveSessionOperationCounts.get(sessionId) ?? 0) > 0;
+    }
+    isTreeExclusiveOperationActive(session) {
+        if (this.isTreeExclusiveSessionIdentityActive(session.sessionId))
+            return true;
+        const runtime = this.activeRuntimeForSession(session);
+        return runtime !== undefined && (this.treeExclusiveRuntimeOperationCounts.get(runtime) ?? 0) > 0;
+    }
+    activeRuntimeForSession(session) {
+        for (const active of new Set(this.active.values())) {
+            if (active.runtime.session === session)
+                return active.runtime;
+        }
+        return undefined;
+    }
+    assertTreeNavigationInactive(session, action) {
+        if (this.treeNavigations.has(session))
+            throw new Error(`Cannot ${action} while session tree navigation is active`);
+    }
+    async runSessionEntryMutation(session, action, operation) {
+        this.beginSessionEntryMutation(session, action);
+        try {
+            return await operation();
+        }
+        finally {
+            this.endSessionEntryMutation(session);
+        }
+    }
+    beginSessionEntryMutation(session, action) {
+        this.assertTreeNavigationInactive(session, action);
+        this.sessionEntryMutationCounts.set(session, (this.sessionEntryMutationCounts.get(session) ?? 0) + 1);
+        this.observeUnreadActivityState(session);
+    }
+    endSessionEntryMutation(session) {
+        const remaining = (this.sessionEntryMutationCounts.get(session) ?? 1) - 1;
+        if (remaining <= 0)
+            this.sessionEntryMutationCounts.delete(session);
+        else
+            this.sessionEntryMutationCounts.set(session, remaining);
+        this.observeUnreadActivityState(session);
+    }
+    isSessionEntryMutationActive(session) {
+        return (this.sessionEntryMutationCounts.get(session) ?? 0) > 0;
     }
     publishActivityForEvent(session, event) {
         const eventType = getString(event, "type");
@@ -1596,6 +2395,7 @@ export class PiSessionService {
         this.workspaceActivity?.applySessionActivity(session.sessionManager.getCwd(), activity);
         this.events.publish(session.sessionId, { type: "activity.update", activity });
         this.events.publishGlobal({ type: "activity.update", activity });
+        this.observeUnreadActivityState(session);
     }
     publishStatus(session) {
         const status = this.statusFromSession(session);
@@ -1603,6 +2403,7 @@ export class PiSessionService {
         this.workspaceActivity?.applySessionStatus(session.sessionManager.getCwd(), status);
         this.events.publish(session.sessionId, { type: "status.update", status });
         this.events.publishGlobal({ type: "status.update", status });
+        this.observeUnreadActivityState(session);
     }
     clearStaleActiveActivity(session) {
         const current = this.activities.get(session.sessionId);
@@ -1619,6 +2420,7 @@ export class PiSessionService {
         const stats = session.getSessionStats();
         const model = session.model === undefined ? undefined : modelToClientModel(session.model);
         const contextUsage = session.getContextUsage();
+        const warnings = this.warningsForSession(session);
         return {
             sessionId: session.sessionId,
             persisted: sessionFileExists(session.sessionFile),
@@ -1633,8 +2435,23 @@ export class PiSessionService {
             tokens: stats.tokens,
             cost: stats.cost,
             ...(contextUsage === undefined ? {} : { contextUsage }),
+            ...(warnings.length === 0 ? {} : { warnings }),
         };
     }
+    /**
+     * Compute the live warning set for a session: runtime/resource diagnostics from
+     * the active runtime (if any) plus the Anthropic subscription-auth notice. Read
+     * fresh on each status publish so a rebuilt runtime or an auth/model change is
+     * reflected without caching a stale snapshot.
+     */
+    warningsForSession(session) {
+        const runtime = this.active.get(session.sessionId)?.runtime;
+        const warnings = runtime === undefined ? [] : collectRuntimeWarnings(runtime);
+        const anthropic = anthropicSubscriptionWarning(session, join(this.agentDir, "auth.json"));
+        if (anthropic !== undefined)
+            warnings.push(anthropic);
+        return warnings;
+    }
     pendingMessageCount(session) {
         return session.pendingMessageCount + this.compactionQueuedMessages(session.sessionId).length;
     }
@@ -1699,6 +2516,12 @@ function modelToClientModel(model) {
         ...(reasoning === undefined ? {} : { reasoning }),
     };
 }
+function notificationIdentityForSession(session) {
+    return {
+        sessionId: session.sessionId,
+        cwd: canonicalizeStoredCwd(session.sessionManager.getCwd()),
+    };
+}
 function clientSessionFromListEntry(session) {
     return {
         id: session.id,
@@ -2096,11 +2919,13 @@ const SUBSESSION_LINK_CUSTOM_TYPE = "pi-web.subsession.link";
 const SUBSESSION_CHILD_LINK_CUSTOM_TYPE = "pi-web.subsession.spawned";
 /** customType marking a parent-facing subsession-completion notice. */
 const SUBSESSION_NOTIFICATION_CUSTOM_TYPE = "subsession.completion";
-const SUBSESSION_NOTIFICATION_PREVIEW_CHARS = 2000;
-function truncateForNotification(text) {
-    if (text.length <= SUBSESSION_NOTIFICATION_PREVIEW_CHARS)
-        return text;
-    return `${text.slice(0, SUBSESSION_NOTIFICATION_PREVIEW_CHARS)}…`;
+const SUBSESSION_NOTIFICATION_MAX_OUTPUT_CHARS = 2000;
+/** Avoid duplicating a partial result in context when deliberate inspection can return the full output. */
+function formatSubsessionNotificationOutput(childSessionId, text) {
+    if (text.length > SUBSESSION_NOTIFICATION_MAX_OUTPUT_CHARS) {
+        return `Output from subsession ${childSessionId} was too long for this completion notice and was omitted. Call check_subsession with sessionId "${childSessionId}" to retrieve the final output.`;
+    }
+    return `--- SUBSESSION OUTPUT: ${childSessionId} ---\n${text === "" ? "(no output)" : text}`;
 }
 /** Most recent assistant text from a history message list, or "" if none. */
 function finalAssistantText(messages) {