@hachej/boring-agent 0.1.95 → 0.1.97

package/dist/front/index.js

@@ -1,9 +1,14 @@
 import {
   DebugDrawer,
+  agentResourceUrl,
   cn,
-  copyTextToClipboard
-} from "../chunk-BOIV2I3N.js";
+  copyTextToClipboard,
+  createRequestId,
+  withStorageScope
+} from "../chunk-46HJK2ES.js";
 import {
+  AGENT_GATEWAY_ERROR_CODES,
+  AgentGatewayErrorCode,
   CommandReceiptSchema,
   FollowUpReceiptSchema,
   PiChatSnapshotSchema,
@@ -15,10 +20,11 @@ import {
   WORKSPACE_COMMAND_NOTIFY_EVENT,
   extractToolUiMetadata,
   sanitizeToolUiMetadata
-} from "../chunk-OFQ7J6SI.js";
+} from "../chunk-LSO2AO6Q.js";
+import "../chunk-YGRQ4Q5P.js";
 import {
   ErrorCode
-} from "../chunk-2GBHYJVC.js";
+} from "../chunk-VXF5DWS6.js";
 
 // src/front/upload/uploadFile.ts
 function readAsDataUrl(file) {
@@ -2012,14 +2018,16 @@ function MentionPicker({
     setActiveIdx(0);
     const ctrl = new AbortController();
     const runFetch = fetchImpl ?? globalThis.fetch.bind(globalThis);
-    const headers = scopedHeaders(requestHeaders, storageScope);
+    const headers = withStorageScope(requestHeaders, storageScope);
     const base = apiBaseUrl.replace(/\/$/, "");
     const t = setTimeout(() => {
       runFetch(`${base}/api/v1/files/search?q=${encodeURIComponent(mentionSearchGlob(mention.query))}&limit=8`, {
         signal: ctrl.signal,
         ...headers ? { headers } : {}
       }).then((r) => r.ok ? r.json() : null).then((data) => {
-        if (data?.results) setResults(data.results.slice(0, 8));
+        if (data?.resources) {
+          setResults(data.resources.filter((resource) => resource.filesystem === "user").map((resource) => resource.path).slice(0, 8));
+        }
       }).catch(() => {
       });
     }, 120);
@@ -2070,15 +2078,6 @@ function detectMention(value, cursorPos) {
   const atIdx = before.lastIndexOf("@");
   return { query: match[2], anchorStart: atIdx, anchorEnd: cursorPos };
 }
-function scopedHeaders(requestHeaders, storageScope) {
-  const headers = {};
-  for (const [key, value] of Object.entries(requestHeaders ?? {})) {
-    if (value !== void 0) headers[key] = value;
-  }
-  const hasStorageScope = Object.keys(headers).some((key) => key.toLowerCase() === "x-boring-storage-scope");
-  if (storageScope && !hasStorageScope) headers["x-boring-storage-scope"] = storageScope;
-  return Object.keys(headers).length > 0 ? headers : void 0;
-}
 
 // src/front/useComposerPickers.ts
 function setTextareaValue2(textarea, value) {
@@ -2599,6 +2598,7 @@ function resolveStorage(storage) {
 
 // src/front/hooks/useChatModelSelection.ts
 function useChatModelSelection({
+  agentTypeId,
   apiBaseUrl,
   defaultModel,
   fetch: fetchImpl,
@@ -2620,14 +2620,16 @@ function useChatModelSelection({
     userSelectedModelRef.current = userSelectedModel;
   }, [userSelectedModel]);
   const setModel = useCallback6((next) => {
-    userSelectedModelRef.current = next !== null;
-    setUserSelectedModel(next !== null);
-    setModelState(next);
-    writePiComposerModelSelection(next, { storageScope, storage });
+    const normalized = next === null ? null : parseModelSelection(next);
+    userSelectedModelRef.current = normalized !== null;
+    setUserSelectedModel(normalized !== null);
+    setModelState(normalized);
+    writePiComposerModelSelection(normalized, { storageScope, storage });
   }, [storage, storageScope]);
   const discoveryKey = useMemo2(
     () => JSON.stringify({
       apiBaseUrl: apiBaseUrl ?? "",
+      agentTypeId,
       headers: Object.entries(requestHeaders ?? {}).sort(([a], [b]) => a.localeCompare(b)),
       storageScope: storageScope ?? ""
     }),
@@ -2661,8 +2663,8 @@ function useChatModelSelection({
     let aborted = false;
     setLoaded(false);
     const nextFetch = fetchImpl ?? globalThis.fetch.bind(globalThis);
-    nextFetch(agentResourceUrl(apiBaseUrl, "/api/v1/agent/models"), {
-      headers: scopedHeaders2(requestHeaders, storageScope)
+    nextFetch(agentResourceUrl(apiBaseUrl, `/api/v1/agents/${encodeURIComponent(agentTypeId)}/models`), {
+      headers: withStorageScope(requestHeaders, storageScope)
     }).then((res) => res.ok ? res.json() : null).then((payload) => {
       if (aborted) return;
       if (!payload?.models) {
@@ -2702,7 +2704,7 @@ function useChatModelSelection({
     return () => {
       aborted = true;
     };
-  }, [apiBaseUrl, discoveryKey, enabled, fetchImpl, requestHeaders, storage, storageScope]);
+  }, [agentTypeId, apiBaseUrl, discoveryKey, enabled, fetchImpl, requestHeaders, storage, storageScope]);
   useEffect5(() => {
     const onChange = (event) => {
       const next = parseModelSelection(event.detail);
@@ -2716,17 +2718,6 @@ function useChatModelSelection({
   const currentModel = currentDiscoveryLoaded ? model : null;
   return { availableModels: currentAvailableModels, loaded: currentDiscoveryLoaded, model: currentModel, setModel };
 }
-function agentResourceUrl(apiBaseUrl, path) {
-  const base = apiBaseUrl?.replace(/\/$/, "") ?? "";
-  return `${base}${path}`;
-}
-function scopedHeaders2(headers, storageScope) {
-  if (!headers && !storageScope) return void 0;
-  const result = { ...headers ?? {} };
-  const hasStorageScope = Object.keys(result).some((key) => key.toLowerCase() === "x-boring-storage-scope");
-  if (storageScope && !hasStorageScope) result["x-boring-storage-scope"] = storageScope;
-  return result;
-}
 
 // src/front/hooks/useServerCommands.ts
 import { useEffect as useEffect6, useRef as useRef7, useState as useState8 } from "react";
@@ -2735,21 +2726,21 @@ function serverCommandErrorMessage(body, fallback) {
   if (body.error && typeof body.error === "object" && typeof body.error.message === "string") return body.error.message;
   return fallback;
 }
-function toSlashCommand(command, getSessionId, apiBaseUrl, requestHeaders, fetchImpl) {
+function toSlashCommand(command, identity, isCurrentIdentity, apiBaseUrl, requestHeaders, fetchImpl) {
   return {
     name: command.name,
     description: command.description ?? "",
     source: command.source,
     ...command.sourcePlugin ? { sourcePlugin: command.sourcePlugin } : {},
     handler: async (args) => {
+      if (!isCurrentIdentity(identity.key)) return;
       const base = apiBaseUrl?.replace(/\/$/, "") ?? "";
-      const params = new URLSearchParams({ sessionId: getSessionId() });
-      const url = `${base}/api/v1/agent/commands/execute?${params.toString()}`;
+      const url = `${base}/api/v1/agents/${encodeURIComponent(identity.agentTypeId)}/commands/execute`;
       try {
         const res = await fetchImpl(url, {
           method: "POST",
           headers: { ...requestHeaders ?? {}, "content-type": "application/json" },
-          body: JSON.stringify({ name: command.name, args })
+          body: JSON.stringify({ requestId: createRequestId("command"), sessionId: identity.sessionId, name: command.name, args })
         });
         if (!res.ok) {
           const body = await res.json().catch(() => ({}));
@@ -2770,6 +2761,7 @@ function toSlashCommand(command, getSessionId, apiBaseUrl, requestHeaders, fetch
   };
 }
 function useServerCommands({
+  agentTypeId,
   registry,
   requestHeaders,
   sessionId,
@@ -2780,41 +2772,62 @@ function useServerCommands({
   refreshKey = 0
 }) {
   const [stamp, setStamp] = useState8(0);
-  const registeredNamesRef = useRef7(/* @__PURE__ */ new Set());
-  const sessionIdRef = useRef7(sessionId);
-  useEffect6(() => {
-    sessionIdRef.current = sessionId;
-  }, [sessionId]);
+  const registrationsRef = useRef7({ registry, identity: void 0, names: /* @__PURE__ */ new Set() });
+  const canonicalSessionId = sessionId.trim() || void 0;
+  const identityKey = canonicalSessionId ? `${agentTypeId}\0${canonicalSessionId}` : void 0;
+  const identityKeyRef = useRef7(identityKey);
+  identityKeyRef.current = identityKey;
+  useEffect6(() => () => {
+    const registrations = registrationsRef.current;
+    for (const name of registrations.names) registrations.registry.unregister(name);
+    registrationsRef.current = { registry: registrations.registry, identity: void 0, names: /* @__PURE__ */ new Set() };
+  }, []);
   useEffect6(() => {
     const clearRegistered = () => {
-      if (registeredNamesRef.current.size === 0) return false;
-      for (const name of registeredNamesRef.current) registry.unregister(name);
-      registeredNamesRef.current = /* @__PURE__ */ new Set();
-      return true;
+      const registrations = registrationsRef.current;
+      for (const name of registrations.names) registrations.registry.unregister(name);
+      const changed = registrations.names.size > 0;
+      registrationsRef.current = { registry, identity: void 0, names: /* @__PURE__ */ new Set() };
+      return changed;
     };
-    if (!enabled) {
+    if (registrationsRef.current.registry !== registry) {
+      if (clearRegistered()) setStamp((n) => n + 1);
+    }
+    if (!enabled || !canonicalSessionId || !identityKey) {
       if (clearRegistered()) setStamp((n) => n + 1);
       return;
     }
+    if (registrationsRef.current.identity !== identityKey) {
+      if (clearRegistered()) setStamp((n) => n + 1);
+    }
     let aborted = false;
     const nextFetch = fetchImpl ?? globalThis.fetch.bind(globalThis);
     const base = apiBaseUrl?.replace(/\/$/, "") ?? "";
-    const url = `${base}/api/v1/agent/commands?sessionId=${encodeURIComponent(sessionIdRef.current)}`;
-    const headers = scopedHeaders3(requestHeaders, storageScope);
+    const url = `${base}/api/v1/agents/${encodeURIComponent(agentTypeId)}/commands?sessionId=${encodeURIComponent(canonicalSessionId)}`;
+    const headers = withStorageScope(requestHeaders, storageScope);
     nextFetch(url, { headers }).then(async (res) => {
       if (!res.ok) throw new Error(`commands request failed (${res.status})`);
       return await res.json();
     }).then((payload) => {
       if (aborted) return;
       const removed = clearRegistered();
+      const registeredNames = /* @__PURE__ */ new Set();
       let added = false;
       for (const serverCommand of payload.commands ?? []) {
-        const command = toSlashCommand(serverCommand, () => sessionIdRef.current, apiBaseUrl, headers, nextFetch);
+        const command = toSlashCommand(
+          serverCommand,
+          { key: identityKey, sessionId: canonicalSessionId, agentTypeId },
+          (key) => identityKeyRef.current === key,
+          apiBaseUrl,
+          headers,
+          nextFetch
+        );
         if (registry.get(command.name)) continue;
         registry.register(command);
-        registeredNamesRef.current.add(command.name);
+        registeredNames.add(command.name);
         added = true;
       }
+      registrationsRef.current = { registry, identity: identityKey, names: registeredNames };
       if (removed || added) setStamp((n) => n + 1);
     }).catch(() => {
       if (aborted) return;
@@ -2823,16 +2836,9 @@ function useServerCommands({
     return () => {
       aborted = true;
     };
-  }, [apiBaseUrl, enabled, fetchImpl, refreshKey, requestHeaders, registry, storageScope]);
+  }, [agentTypeId, apiBaseUrl, canonicalSessionId, enabled, fetchImpl, identityKey, refreshKey, requestHeaders, registry, storageScope]);
   return stamp;
 }
-function scopedHeaders3(headers, storageScope) {
-  if (!headers && !storageScope) return void 0;
-  const result = { ...headers ?? {} };
-  const hasScope = Object.keys(result).some((k) => k.toLowerCase() === "x-boring-storage-scope");
-  if (storageScope && !hasScope) result["x-boring-storage-scope"] = storageScope;
-  return result;
-}
 
 // src/front/hooks/useAttachmentNotice.ts
 import { useEffect as useEffect7, useState as useState9 } from "react";
@@ -3804,7 +3810,8 @@ function syncCursor(state, cursor) {
   return { ...state, lastSeq: cursor, hydrated: true, needsResync: void 0 };
 }
 function hydrateFromSnapshot(state, snapshot, options = {}) {
-  if (snapshot.seq < state.lastSeq && !options.allowSeqRewind) return state;
+  const hasUnhydratedLiveEvents = state.turnId !== void 0 || state.streamingMessage !== void 0 || state.committedMessages.length > 0 || state.status === "streaming" || state.status === "aborting";
+  if (snapshot.seq < state.lastSeq && !options.allowSeqRewind && (state.hydrated || hasUnhydratedLiveEvents)) return state;
   const queue = { followUps: enrichQueueWithKnownMetadata(snapshot.queue.followUps, state.optimisticOutbox, state.queue.followUps) };
   const snapshotMessages = normalizeSnapshotMessages(snapshot.messages);
   const preserveLocalHistory = shouldPreserveLocalCommittedHistory(state, snapshot, snapshotMessages, options);
@@ -4467,11 +4474,12 @@ function parsePiChatReplayRangeError(status, body) {
 }
 function buildPiChatEventsUrl({
   apiBaseUrl = "",
+  agentTypeId,
   sessionId,
   cursor
 }) {
   const base = apiBaseUrl.replace(/\/$/, "");
-  return `${base}/api/v1/agent/pi-chat/${encodeURIComponent(sessionId)}/events?cursor=${encodeURIComponent(String(cursor))}`;
+  return `${base}/api/v1/agents/${encodeURIComponent(agentTypeId)}/sessions/${encodeURIComponent(sessionId)}/events?cursor=${encodeURIComponent(String(cursor))}`;
 }
 function calculateJitteredBackoffDelayMs({
   attempt,
@@ -4512,6 +4520,7 @@ var SUPPORTED_PROTOCOL_VERSION = 1;
 var DEFAULT_RECONNECT_BASE_MS = 1e3;
 var DEFAULT_RECONNECT_MAX_MS = 3e4;
 var DEFAULT_REQUEST_TIMEOUT_MS = 15e3;
+var DEFAULT_COMMAND_TIMEOUT_MS = 6e4;
 var DEFAULT_LARGE_STATE_WARNING_BYTES = 5 * 1024 * 1024;
 var DEFAULT_LARGE_STATE_WARNING_MESSAGES = 300;
 var EVENT_TYPE_RING_LIMIT = 20;
@@ -4528,6 +4537,7 @@ var RemotePiSession = class {
     this.setTimeoutFn = options.setTimeoutFn ?? globalThis.setTimeout;
     this.clearTimeoutFn = options.clearTimeoutFn ?? globalThis.clearTimeout;
     this.requestTimeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
+    this.commandTimeoutMs = options.commandTimeoutMs ?? DEFAULT_COMMAND_TIMEOUT_MS;
     this.store = createPiChatStore(createInitialPiChatState({
       sessionId: options.sessionId,
       workspaceId: options.workspaceId,
@@ -4544,10 +4554,12 @@ var RemotePiSession = class {
   setTimeoutFn;
   clearTimeoutFn;
   requestTimeoutMs;
+  commandTimeoutMs;
   generation = 0;
   streamRunId = 0;
   reconnectAttempt = 0;
   started = false;
+  suspended = false;
   disposed = false;
   streamAbortController;
   reconnectTimer;
@@ -4581,6 +4593,7 @@ var RemotePiSession = class {
         streamingMessageCount: state.streamingMessage ? 1 : 0
       },
       disposed: this.disposed,
+      suspended: this.suspended,
       generation: this.generation,
       streamRunId: this.streamRunId,
       reconnectAttempt: this.reconnectAttempt,
@@ -4592,7 +4605,7 @@ var RemotePiSession = class {
     return this.store.subscribe(listener);
   }
   start(cursor) {
-    if (this.disposed || this.started) return Promise.resolve();
+    if (this.disposed || this.suspended || this.started) return Promise.resolve();
     this.started = true;
     const generation = this.generation;
     if (cursor === void 0) {
@@ -4607,8 +4620,8 @@ var RemotePiSession = class {
     if (!this.disposed) {
       this.store.dispatch({ type: "optimistic-user-message", message: toOptimisticUserMessage(payload) }, { flush: true });
     }
-    if (!this.started) await this.start(this.store.getState().lastSeq);
-    else this.ensureReconnectScheduled();
+    if (!this.started && !this.suspended) await this.start(this.store.getState().lastSeq);
+    else if (!this.suspended) this.ensureReconnectScheduled();
     try {
       const receipt = await this.postCommand("/prompt", payload, PromptReceiptSchema);
       return receipt;
@@ -4621,8 +4634,8 @@ var RemotePiSession = class {
     if (!this.disposed) {
       this.store.dispatch({ type: "optimistic-user-message", message: toOptimisticUserMessage(payload) }, { flush: true });
     }
-    if (!this.started) await this.start(this.store.getState().lastSeq);
-    else this.ensureReconnectScheduled();
+    if (!this.started && !this.suspended) await this.start(this.store.getState().lastSeq);
+    else if (!this.suspended) this.ensureReconnectScheduled();
     try {
       const receipt = await this.postCommand("/followup", payload, FollowUpReceiptSchema);
       return receipt;
@@ -4648,6 +4661,28 @@ var RemotePiSession = class {
     }
     return receipt;
   }
+  suspendStream() {
+    if (this.disposed || this.suspended) return;
+    this.suspended = true;
+    this.started = false;
+    this.streamRunId += 1;
+    this.clearReconnectTimer();
+    this.abortEventStream();
+    this.store.dispatch({ type: "connection-state", state: "suspended" }, { flush: true });
+  }
+  resumeStream() {
+    if (this.disposed || !this.suspended && this.started) return;
+    this.suspended = false;
+    this.started = true;
+    const generation = this.generation;
+    const state = this.store.getState();
+    if (!state.hydrated) {
+      void this.hydrateAndConnect(generation);
+      return;
+    }
+    this.store.dispatch({ type: "connection-state", state: "connecting" }, { flush: true });
+    void this.connectEvents(state.lastSeq, generation);
+  }
   dispose() {
     if (this.disposed) return;
     this.disposed = true;
@@ -4661,33 +4696,34 @@ var RemotePiSession = class {
     this.store.dispose();
   }
   async hydrateAndConnect(generation, options = {}) {
-    if (!this.isGenerationActive(generation)) return;
+    const hydrationRunId = this.streamRunId;
+    if (!this.isHydrationActive(generation, hydrationRunId)) return;
     this.clearReconnectTimer();
     this.abortEventStream();
     this.store.dispatch({ type: "connection-state", state: this.store.getState().hydrated ? "reconnecting" : "connecting" }, { flush: true });
     try {
       const headers = await this.requestHeaders();
-      if (!this.isGenerationActive(generation)) return;
+      if (!this.isHydrationActive(generation, hydrationRunId)) return;
       const responseBody = await this.fetchJson(this.stateUrl(), { method: "GET", headers });
-      if (!this.isGenerationActive(generation)) return;
-      const raw = this.options.agentTypeId ? addressedSnapshot(responseBody) : responseBody;
+      if (!this.isHydrationActive(generation, hydrationRunId)) return;
+      const raw = addressedSnapshot(responseBody);
       this.recordLargeStateWarning(raw);
       if (readProtocolVersion(raw) !== SUPPORTED_PROTOCOL_VERSION) {
         this.dispatchProtocolError(`Unsupported Pi chat protocol version: ${String(readProtocolVersion(raw) ?? "missing")}`);
         return;
       }
       const snapshot = PiChatSnapshotSchema.parse(raw);
-      if (!this.isGenerationActive(generation)) return;
+      if (!this.isHydrationActive(generation, hydrationRunId)) return;
       this.store.dispatch({ type: "hydrate", snapshot, allowSeqRewind: options?.allowSeqRewind }, { flush: true });
       this.connectEvents(snapshot.seq, generation);
     } catch (error) {
-      if (!this.isGenerationActive(generation) || isAbortError(error)) return;
+      if (!this.isHydrationActive(generation, hydrationRunId) || isAbortError(error)) return;
       this.dispatchProtocolError(errorMessage(error, "Failed to hydrate Pi chat session state."));
       this.scheduleReconnect(generation);
     }
   }
   connectEvents(cursor, generation) {
-    if (!this.isGenerationActive(generation)) return Promise.resolve();
+    if (!this.isStreamLifecycleActive(generation)) return Promise.resolve();
     this.clearReconnectTimer();
     this.abortEventStream();
     const runId = ++this.streamRunId;
@@ -4801,20 +4837,20 @@ var RemotePiSession = class {
     }
   }
   rehydrateAfterStreamReset(generation, options = {}) {
-    if (!this.isGenerationActive(generation)) return;
+    if (!this.isStreamLifecycleActive(generation)) return;
     this.streamRunId += 1;
     this.abortEventStream();
     void this.hydrateAndConnect(generation, options);
   }
   ensureReconnectScheduled() {
-    if (!this.isGenerationActive(this.generation)) return;
+    if (!this.isStreamLifecycleActive(this.generation)) return;
     const state = this.store.getState();
     if (state.connection.state === "connected" || state.connection.state === "connecting") return;
     if (this.reconnectTimer !== void 0) return;
     void this.hydrateAndConnect(this.generation);
   }
   scheduleReconnect(generation) {
-    if (!this.isGenerationActive(generation)) return;
+    if (!this.isStreamLifecycleActive(generation)) return;
     this.clearReconnectTimer();
     this.store.dispatch({ type: "connection-state", state: "reconnecting" }, { flush: true });
     const attempt = this.reconnectAttempt++;
@@ -4828,7 +4864,7 @@ var RemotePiSession = class {
       clearTimeoutFn: this.clearTimeoutFn,
       reconnect: () => {
         this.reconnectTimer = void 0;
-        if (!this.isGenerationActive(generation)) return;
+        if (!this.isStreamLifecycleActive(generation)) return;
         const state = this.store.getState();
         if (state.hydrated) this.connectEvents(state.lastSeq, generation);
         else void this.hydrateAndConnect(generation);
@@ -4844,14 +4880,14 @@ var RemotePiSession = class {
       method: "POST",
       headers: { ...headers, "Content-Type": "application/json" },
       body: JSON.stringify(this.addressedCommandPayload(path, payload))
-    });
+    }, this.commandTimeoutMs);
     if (!this.isGenerationActive(generation)) {
       throw abortError("Remote Pi session disposed before command receipt.");
     }
     return schema.parse(this.addressedCommandReceipt(path, raw));
   }
   addressedCommandReceipt(path, receipt) {
-    if (!this.options.agentTypeId || path !== "/followup" || typeof receipt !== "object" || receipt === null) {
+    if (path !== "/followup" || typeof receipt !== "object" || receipt === null) {
       return receipt;
     }
     const record = receipt;
@@ -4861,21 +4897,21 @@ var RemotePiSession = class {
     if (this.disposed) return;
     this.store.dispatch({ type: "remove-optimistic-user-message", clientNonce }, { flush: true });
   }
-  async fetchJson(url, init) {
+  async fetchJson(url, init, timeoutMs = this.requestTimeoutMs) {
     const controller = new AbortController();
     this.fetchControllers.add(controller);
     let timedOut = false;
     const timer = globalThis.setTimeout(() => {
       timedOut = true;
       controller.abort();
-    }, this.requestTimeoutMs);
+    }, timeoutMs);
     try {
       const response = await this.fetchImpl(url, { ...init, signal: controller.signal });
       const body = await safeReadJson(response);
       if (!response.ok) throw new RemotePiSessionHttpError(response.status, routeErrorMessage(body, `HTTP ${response.status}`), body, routeErrorCode(body));
       return body;
     } catch (error) {
-      if (timedOut) throw new Error(`Request to ${url} timed out after ${this.requestTimeoutMs}ms.`);
+      if (timedOut) throw new Error(`Request to ${url} timed out after ${timeoutMs}ms.`);
       throw error;
     } finally {
       globalThis.clearTimeout(timer);
@@ -4897,19 +4933,18 @@ var RemotePiSession = class {
     return this.sessionUrl("/state");
   }
   eventsUrl(cursor) {
-    if (!this.options.agentTypeId) {
-      return buildPiChatEventsUrl({ apiBaseUrl: this.apiBaseUrl, sessionId: this.options.sessionId, cursor });
-    }
-    return `${this.sessionUrl("/events")}?cursor=${encodeURIComponent(String(cursor))}`;
+    return buildPiChatEventsUrl({
+      apiBaseUrl: this.apiBaseUrl,
+      agentTypeId: this.options.agentTypeId,
+      sessionId: this.options.sessionId,
+      cursor
+    });
   }
   sessionUrl(path) {
-    if (this.options.agentTypeId) {
-      return `${this.apiBaseUrl}/api/v1/agents/${encodeURIComponent(this.options.agentTypeId)}/sessions/${encodeURIComponent(this.options.sessionId)}${path}`;
-    }
-    return `${this.apiBaseUrl}/api/v1/agent/pi-chat/${encodeURIComponent(this.options.sessionId)}${path}`;
+    return `${this.apiBaseUrl}/api/v1/agents/${encodeURIComponent(this.options.agentTypeId)}/sessions/${encodeURIComponent(this.options.sessionId)}${path}`;
   }
   addressedCommandPayload(path, payload) {
-    if (!this.options.agentTypeId || typeof payload !== "object" || payload === null) return payload;
+    if (typeof payload !== "object" || payload === null) return payload;
     const record = payload;
     if (typeof record.requestId === "string" && record.requestId.length > 0) return payload;
     if (path === "/prompt" && typeof record.clientNonce === "string" && typeof record.message === "string") {
@@ -4972,8 +5007,14 @@ var RemotePiSession = class {
   isGenerationActive(generation) {
     return !this.disposed && generation === this.generation;
   }
+  isStreamLifecycleActive(generation) {
+    return !this.suspended && this.isGenerationActive(generation);
+  }
+  isHydrationActive(generation, runId) {
+    return this.isStreamLifecycleActive(generation) && runId === this.streamRunId;
+  }
   isStreamActive(generation, runId) {
-    return this.isGenerationActive(generation) && runId === this.streamRunId;
+    return this.isStreamLifecycleActive(generation) && runId === this.streamRunId;
   }
 };
 function addressedSnapshot(value) {
@@ -5100,13 +5141,23 @@ function clearPageUnloading() {
   pageUnloading = false;
 }
 
-// src/front/chat/session/activeSessionStorage.ts
+// src/front/chat/session/sessionSelectionStorage.ts
 var ACTIVE_SESSION_KEY_PREFIX = "boring-agent:v2";
 var ACTIVE_SESSION_KEY_SUFFIX = "activeSessionId";
+var BOOT_RESUME_SESSION_KEY_SUFFIX = "bootResumeSessionId";
 var DEFAULT_STORAGE_SCOPE2 = "default";
 function activeSessionStorageKey(storageScope) {
-  const scope = storageScope && storageScope.length > 0 ? storageScope : DEFAULT_STORAGE_SCOPE2;
-  return `${ACTIVE_SESSION_KEY_PREFIX}:${scope}:${ACTIVE_SESSION_KEY_SUFFIX}`;
+  return scopedSessionStorageKey(storageScope, ACTIVE_SESSION_KEY_SUFFIX);
+}
+function bootResumeSessionStorageKey(source) {
+  const scope = typeof source === "object" && source !== null ? encodeURIComponent(JSON.stringify([
+    source.apiBaseUrl?.replace(/\/$/, "") ?? "",
+    source.sessionsApiPath,
+    source.agentTypeId ?? "",
+    source.workspaceId ?? "",
+    source.storageScope ?? DEFAULT_STORAGE_SCOPE2
+  ])) : source;
+  return scopedSessionStorageKey(scope, BOOT_RESUME_SESSION_KEY_SUFFIX);
 }
 function readActiveSessionId(options = {}) {
   const storage = resolveStorage2(options.storage);
@@ -5127,8 +5178,28 @@ function writeActiveSessionId(sessionId, options = {}) {
   } catch {
   }
 }
-function clearActiveSessionId(options = {}) {
-  writeActiveSessionId(void 0, options);
+function readBootResumeSessionId(options = {}) {
+  const storage = resolveBootStorage(options.storage);
+  if (!storage) return void 0;
+  try {
+    return storage.getItem(bootResumeSessionStorageKey(options.bootResumeSource ?? options.storageScope)) ?? void 0;
+  } catch {
+    return void 0;
+  }
+}
+function writeBootResumeSessionId(sessionId, options = {}) {
+  const storage = resolveBootStorage(options.storage);
+  if (!storage) return;
+  try {
+    const key = bootResumeSessionStorageKey(options.bootResumeSource ?? options.storageScope);
+    if (sessionId === void 0 || sessionId.length === 0) storage.removeItem(key);
+    else storage.setItem(key, sessionId);
+  } catch {
+  }
+}
+function scopedSessionStorageKey(storageScope, suffix) {
+  const scope = storageScope && storageScope.length > 0 ? storageScope : DEFAULT_STORAGE_SCOPE2;
+  return `${ACTIVE_SESSION_KEY_PREFIX}:${scope}:${suffix}`;
 }
 function resolveStorage2(storage) {
   if (storage) return storage;
@@ -5138,29 +5209,43 @@ function resolveStorage2(storage) {
     return void 0;
   }
 }
+function resolveBootStorage(storage) {
+  if (storage) return storage;
+  try {
+    return globalThis.sessionStorage;
+  } catch {
+    return void 0;
+  }
+}
 
 // src/front/chat/session/usePiSessions.ts
-import { useCallback as useCallback7, useEffect as useEffect8, useMemo as useMemo4, useRef as useRef8, useState as useState10 } from "react";
-var DEFAULT_SESSIONS_API_PATH = "/api/v1/agent/pi-chat/sessions";
+import { useCallback as useCallback7, useEffect as useEffect8, useLayoutEffect, useMemo as useMemo4, useRef as useRef8, useState as useState10 } from "react";
 var SESSION_PAGE_SIZE = 50;
 var DEFAULT_MAX_RETRIES = 60;
 var DEFAULT_RETRY_BASE_MS = 250;
 var DEFAULT_RETRY_MAX_MS = 2e3;
+var useIsomorphicLayoutEffect = typeof window === "undefined" ? useEffect8 : useLayoutEffect;
 var SessionsPreparingError = class extends Error {
   constructor() {
     super("Agent runtime is still preparing");
     this.name = "SessionsPreparingError";
   }
 };
+var StaleSessionsSourceError = class extends Error {
+  constructor() {
+    super("Pi sessions source is stale");
+    this.name = "StaleSessionsSourceError";
+  }
+};
 function isNetworkFetchError(error) {
   return error instanceof TypeError;
 }
-function usePiSessions(options = {}) {
+function usePiSessions(options) {
   const enabled = options.enabled ?? true;
   const apiBaseUrl = options.apiBaseUrl?.replace(/\/$/, "") ?? "";
-  const addressed = typeof options.agentTypeId === "string" && options.agentTypeId.length > 0;
-  const sessionsApiPath = options.sessionsApiPath ?? (addressed ? `/api/v1/agents/${encodeURIComponent(options.agentTypeId)}/sessions` : DEFAULT_SESSIONS_API_PATH);
+  const sessionsApiPath = options.sessionsApiPath ?? `/api/v1/agents/${encodeURIComponent(options.agentTypeId)}/sessions`;
   const storageScope = options.storageScope ?? "default";
+  const activeSessionStorageScope = options.activeSessionStorageScope ?? storageScope;
   const fetchImpl = useMemo4(() => options.fetch ?? globalThis.fetch.bind(globalThis), [options.fetch]);
   const createRemoteSession = options.createRemoteSession ?? createRemotePiSession;
   const connectActiveSession = options.connectActiveSession ?? true;
@@ -5168,12 +5253,30 @@ function usePiSessions(options = {}) {
   const retryBaseMs = options.retry?.baseMs ?? DEFAULT_RETRY_BASE_MS;
   const retryMaxMs = options.retry?.maxMs ?? DEFAULT_RETRY_MAX_MS;
   const headersKey = useMemo4(() => headersScopeKey(options.requestHeaders, storageScope), [options.requestHeaders, storageScope]);
-  const normalizedHeaders = useMemo4(() => buildRequestHeaders(options.requestHeaders, storageScope), [headersKey, storageScope]);
-  const requestScopeKey = useMemo4(() => requestScopeIdentity(apiBaseUrl, sessionsApiPath, storageScope, headersKey), [apiBaseUrl, headersKey, sessionsApiPath, storageScope]);
-  const dataSourceKey = useMemo4(() => dataSourceIdentity(apiBaseUrl, sessionsApiPath, storageScope), [apiBaseUrl, sessionsApiPath, storageScope]);
+  const normalizedHeaders = useMemo4(() => withStorageScope(options.requestHeaders, storageScope) ?? {}, [headersKey, storageScope]);
+  const requestScopeKey = useMemo4(
+    () => requestScopeIdentity(apiBaseUrl, sessionsApiPath, options.agentTypeId, storageScope, headersKey, options.workspaceId, options.sourceIdentity),
+    [apiBaseUrl, headersKey, options.agentTypeId, options.sourceIdentity, options.workspaceId, sessionsApiPath, storageScope]
+  );
+  const dataSourceKey = useMemo4(
+    () => dataSourceIdentity(apiBaseUrl, sessionsApiPath, options.agentTypeId, storageScope, options.workspaceId, options.sourceIdentity),
+    [apiBaseUrl, options.agentTypeId, options.sourceIdentity, options.workspaceId, sessionsApiPath, storageScope]
+  );
+  const bootResumeSource = useMemo4(() => ({
+    apiBaseUrl,
+    sessionsApiPath,
+    agentTypeId: options.agentTypeId,
+    workspaceId: options.workspaceId,
+    storageScope
+  }), [apiBaseUrl, options.agentTypeId, options.workspaceId, sessionsApiPath, storageScope]);
   const [sessions, setSessions] = useState10([]);
   const [dataStorageScope, setDataStorageScope] = useState10(storageScope);
-  const [activeSessionId, setActiveSessionId] = useState10(() => options.initialActiveSessionId ?? readActiveSessionId({ storageScope, storage: options.storage }));
+  const [activeSessionId, setActiveSessionId] = useState10(void 0);
+  const [resumeSessionState, setResumeSessionState] = useState10(() => ({
+    dataSourceKey,
+    id: readBootResumeSessionId({ bootResumeSource, storage: options.bootResumeStorage })
+  }));
+  const resumeSessionId = resumeSessionState.dataSourceKey === dataSourceKey ? resumeSessionState.id : void 0;
   const [activePiSession, setActivePiSession] = useState10(void 0);
   const [loading, setLoading] = useState10(enabled);
   const [loadingMore, setLoadingMore] = useState10(false);
@@ -5190,17 +5293,30 @@ function usePiSessions(options = {}) {
   const loadMoreRequestSeqRef = useRef8(0);
   const loadMoreInFlightRef = useRef8(false);
   const pendingCreatedRef = useRef8(/* @__PURE__ */ new Map());
+  const pendingDeletedRef = useRef8(/* @__PURE__ */ new Set());
   const pendingCreatedScopeRef = useRef8(requestScopeKey);
   const dataStorageScopeRef = useRef8(storageScope);
   const loadedDataSourceRef = useRef8(dataSourceKey);
-  const requestScopeRef = useRef8(requestScopeKey);
-  requestScopeRef.current = requestScopeKey;
+  const committedRequestScopeRef = useRef8(requestScopeKey);
+  useIsomorphicLayoutEffect(() => {
+    committedRequestScopeRef.current = requestScopeKey;
+  }, [requestScopeKey]);
+  const sourceIsCurrent = useCallback7(
+    (scope) => mountedRef.current && committedRequestScopeRef.current === scope,
+    []
+  );
   const remoteSessionOptionsRef = useRef8(options.remoteSessionOptions);
   remoteSessionOptionsRef.current = options.remoteSessionOptions;
   const remoteSessionOptionsKey = useMemo4(
     () => remoteSessionOptionsIdentity(options.remoteSessionOptions),
     [options.remoteSessionOptions]
   );
+  useIsomorphicLayoutEffect(() => {
+    setResumeSessionState((current) => current.dataSourceKey === dataSourceKey ? current : {
+      dataSourceKey,
+      id: readBootResumeSessionId({ bootResumeSource, storage: options.bootResumeStorage })
+    });
+  }, [bootResumeSource, dataSourceKey, options.bootResumeStorage]);
   useEffect8(() => {
     sessionsRef.current = sessions;
   }, [sessions]);
@@ -5213,48 +5329,66 @@ function usePiSessions(options = {}) {
   const activeSessionKnown = Boolean(activeSessionId && sessions.some((session) => session.id === activeSessionId));
   const requestHeaders = useCallback7(() => normalizedHeaders, [normalizedHeaders]);
   const sessionsUrl = useCallback7((suffix = "") => `${apiBaseUrl}${sessionsApiPath}${suffix}`, [apiBaseUrl, sessionsApiPath]);
-  const sessionsListUrl = useCallback7((offset = 0, includeId, cursor) => {
-    const query = new URLSearchParams();
-    if (addressed) {
-      query.set("limit", String(SESSION_PAGE_SIZE));
-      if (cursor) query.set("cursor", cursor);
-    } else {
-      if (offset > 0) {
-        query.set("limit", String(SESSION_PAGE_SIZE));
-        query.set("offset", String(offset));
-      }
-      if (offset <= 0 && includeId) query.set("activeSessionId", includeId);
-    }
-    if (query.size === 0) return sessionsUrl();
+  const sessionsListUrl = useCallback7((cursor) => {
+    const query = new URLSearchParams({ limit: String(SESSION_PAGE_SIZE) });
+    if (cursor) query.set("cursor", cursor);
     return sessionsUrl(`?${query.toString()}`);
-  }, [addressed, sessionsUrl]);
+  }, [sessionsUrl]);
   const persistActive = useCallback7((id) => {
-    writeActiveSessionId(id, { storageScope, storage: options.storage });
-  }, [options.storage, storageScope]);
+    writeActiveSessionId(id, { storageScope: activeSessionStorageScope, storage: options.storage });
+  }, [activeSessionStorageScope, options.storage]);
+  const persistBootResume = useCallback7((id) => {
+    writeBootResumeSessionId(id, { bootResumeSource, storage: options.bootResumeStorage });
+    setResumeSessionState({ dataSourceKey, id });
+  }, [bootResumeSource, dataSourceKey, options.bootResumeStorage]);
+  const rememberConfirmedEmptySession = useCallback7((id) => {
+    writeBootResumeSessionId(id, { bootResumeSource, storage: options.bootResumeStorage });
+    setResumeSessionState({ dataSourceKey, id: void 0 });
+  }, [bootResumeSource, dataSourceKey, options.bootResumeStorage]);
   const ensurePendingScope = useCallback7(() => {
     if (pendingCreatedScopeRef.current === requestScopeKey) return;
     pendingCreatedScopeRef.current = requestScopeKey;
     pendingCreatedRef.current.clear();
+    pendingDeletedRef.current.clear();
   }, [requestScopeKey]);
   const preferredSessionId = useCallback7(() => {
-    const persisted = options.initialActiveSessionId ?? readActiveSessionId({ storageScope, storage: options.storage });
+    const persisted = options.initialActiveSessionId ?? readActiveSessionId({
+      storageScope: activeSessionStorageScope,
+      storage: options.storage
+    });
     if (loadedDataSourceRef.current === dataSourceKey) return activeSessionIdRef.current ?? persisted;
     if (dataStorageScopeRef.current !== storageScope) return persisted;
     return void 0;
-  }, [dataSourceKey, options.initialActiveSessionId, options.storage, storageScope]);
+  }, [activeSessionStorageScope, dataSourceKey, options.initialActiveSessionId, options.storage, storageScope]);
   const applySessions = useCallback7((data, applyOptions = {}) => {
     ensurePendingScope();
     const replacingScope = loadedDataSourceRef.current !== dataSourceKey;
     const requestedActiveId = preferredSessionId();
     const replacingScopePreferred = replacingScope ? requestedActiveId : void 0;
     const pendingCreated = pendingCreatedRef.current;
+    const pendingDeleted = pendingDeletedRef.current;
+    const deletedIds = new Set(pendingDeleted);
     for (const session of data) pendingCreated.delete(session.id);
-    const canonicalCount = canonicalPageCount(data);
-    const pageMayHaveMore = addressed ? applyOptions.nextCursor !== void 0 : data.length >= SESSION_PAGE_SIZE;
+    const filteredData = data.filter((session) => !deletedIds.has(session.id));
+    if (applyOptions.nextCursor === void 0) {
+      const returnedIds = new Set(data.map((session) => session.id));
+      for (const deletedId of pendingDeleted) {
+        if (!returnedIds.has(deletedId)) pendingDeleted.delete(deletedId);
+      }
+    }
+    const canonicalCount = canonicalPageCount(filteredData);
+    const pageMayHaveMore = applyOptions.nextCursor !== void 0;
     const wasExhaustedBeyondFirstPage = applyOptions.background && !hasMoreRef.current && canonicalLoadedCountRef.current >= canonicalCount;
-    const requestedActiveReturned = Boolean(requestedActiveId && data.some((session) => session.id === requestedActiveId));
+    const requestedActiveReturned = Boolean(requestedActiveId && filteredData.some((session) => session.id === requestedActiveId));
     const current = applyOptions.background && pageMayHaveMore ? sessionsRef.current.filter((session) => !requestedActiveId || requestedActiveReturned || session.id !== requestedActiveId) : [];
-    const merged = mergeSessions(Array.from(pendingCreated.values()), data, current);
+    const merged = mergeSessions(Array.from(pendingCreated.values()), filteredData, current.filter((session) => !deletedIds.has(session.id)));
+    const rememberedEmptyId = readBootResumeSessionId({
+      bootResumeSource,
+      storage: options.bootResumeStorage
+    });
+    if (rememberedEmptyId && filteredData.some((session) => session.id === rememberedEmptyId)) {
+      persistBootResume(void 0);
+    }
     const nextHasMore = pageMayHaveMore && !wasExhaustedBeyondFirstPage;
     canonicalLoadedCountRef.current = applyOptions.background ? Math.max(canonicalLoadedCountRef.current, canonicalCount) : canonicalCount;
     loadedDataSourceRef.current = dataSourceKey;
@@ -5269,10 +5403,12 @@ function usePiSessions(options = {}) {
       persistActive(next);
       return next;
     });
-  }, [addressed, dataSourceKey, ensurePendingScope, persistActive, preferredSessionId, storageScope]);
+  }, [bootResumeSource, dataSourceKey, ensurePendingScope, options.bootResumeStorage, persistActive, persistBootResume, preferredSessionId, storageScope]);
   const refresh = useCallback7(async (refreshOptions = {}) => {
+    const scope = requestScopeKey;
+    if (mountedRef.current && !sourceIsCurrent(scope)) throw new StaleSessionsSourceError();
     const version = ++refreshVersionRef.current;
-    const isCurrent = () => mountedRef.current && version === refreshVersionRef.current;
+    const isCurrent = () => sourceIsCurrent(scope) && version === refreshVersionRef.current;
     clearRetryTimer(retryTimerRef);
     const background = refreshOptions.background === true;
     if (!enabled) {
@@ -5299,7 +5435,7 @@ function usePiSessions(options = {}) {
       let page;
       for (let attempt = 0; ; attempt += 1) {
         try {
-          page = await fetchSessionList(fetchImpl, sessionsListUrl(0, preferredSessionId()), requestHeaders(), addressed);
+          page = await fetchSessionList(fetchImpl, sessionsListUrl(), requestHeaders());
           break;
         } catch (err) {
           const transient = err instanceof SessionsPreparingError || isNetworkFetchError(err);
@@ -5321,7 +5457,7 @@ function usePiSessions(options = {}) {
       setLoading(false);
       if (refreshOptions.throwOnError) throw error2;
     }
-  }, [addressed, applySessions, enabled, fetchImpl, persistActive, preferredSessionId, requestHeaders, retryBaseMs, retryMaxMs, retryMaxRetries, sessionsListUrl]);
+  }, [applySessions, enabled, fetchImpl, persistActive, preferredSessionId, requestHeaders, requestScopeKey, retryBaseMs, retryMaxMs, retryMaxRetries, sessionsListUrl, sourceIsCurrent]);
   useEffect8(() => {
     mountedRef.current = true;
     void refresh();
@@ -5337,14 +5473,13 @@ function usePiSessions(options = {}) {
     loadMoreInFlightRef.current = true;
     const version = refreshVersionRef.current;
     const scope = requestScopeKey;
-    const offset = canonicalLoadedCountRef.current;
     setLoadingMore(true);
     try {
-      const page = await fetchSessionList(fetchImpl, sessionsListUrl(offset, void 0, nextCursorRef.current), requestHeaders(), addressed);
-      const data = page.sessions;
-      if (!mountedRef.current || requestSeq !== loadMoreRequestSeqRef.current || version !== refreshVersionRef.current || scope !== requestScopeRef.current) return;
-      const merged = mergeSessions(sessionsRef.current, data);
-      const nextHasMore = addressed ? page.nextCursor !== void 0 : data.length >= SESSION_PAGE_SIZE;
+      const page = await fetchSessionList(fetchImpl, sessionsListUrl(nextCursorRef.current), requestHeaders());
+      const data = page.sessions.filter((session) => !pendingDeletedRef.current.has(session.id));
+      if (requestSeq !== loadMoreRequestSeqRef.current || version !== refreshVersionRef.current || !sourceIsCurrent(scope)) return;
+      const merged = mergeSessions(sessionsRef.current.filter((session) => !pendingDeletedRef.current.has(session.id)), data);
+      const nextHasMore = page.nextCursor !== void 0;
       canonicalLoadedCountRef.current += data.length;
       nextCursorRef.current = page.nextCursor;
       setSessions(merged);
@@ -5357,16 +5492,16 @@ function usePiSessions(options = {}) {
         return next;
       });
     } catch (err) {
-      if (mountedRef.current && requestSeq === loadMoreRequestSeqRef.current && version === refreshVersionRef.current && scope === requestScopeRef.current) {
+      if (requestSeq === loadMoreRequestSeqRef.current && version === refreshVersionRef.current && sourceIsCurrent(scope)) {
         setError(err instanceof Error ? err : new Error(String(err)));
       }
     } finally {
       if (requestSeq === loadMoreRequestSeqRef.current) loadMoreInFlightRef.current = false;
-      if (mountedRef.current && requestSeq === loadMoreRequestSeqRef.current && version === refreshVersionRef.current && scope === requestScopeRef.current) {
+      if (requestSeq === loadMoreRequestSeqRef.current && version === refreshVersionRef.current && sourceIsCurrent(scope)) {
         setLoadingMore(false);
       }
     }
-  }, [addressed, enabled, fetchImpl, hasMore, loading, loadingMore, persistActive, requestHeaders, requestScopeKey, sessionsListUrl]);
+  }, [enabled, fetchImpl, hasMore, loading, loadingMore, persistActive, requestHeaders, requestScopeKey, sessionsListUrl, sourceIsCurrent]);
   useEffect8(() => {
     if (!enabled || !connectActiveSession || !activeSessionId || !activeSessionKnown) {
       setActivePiSession(void 0);
@@ -5388,6 +5523,8 @@ function usePiSessions(options = {}) {
     };
   }, [activeSessionId, activeSessionKnown, apiBaseUrl, connectActiveSession, createRemoteSession, enabled, fetchImpl, remoteSessionOptionsKey, options.agentTypeId, options.workspaceId, requestHeaders, storageScope]);
   const create = useCallback7(async (init) => {
+    const scope = requestScopeKey;
+    if (!sourceIsCurrent(scope)) throw new StaleSessionsSourceError();
     if (!enabled) throw new Error("Pi sessions are disabled");
     const response = await fetchImpl(sessionsUrl(), {
       method: "POST",
@@ -5400,8 +5537,10 @@ function usePiSessions(options = {}) {
       throw err;
     }
     const body = await response.json();
-    const session = addressed ? addressedCreatedSession(body, init?.title) : toSessionSummary(body);
+    const session = addressedCreatedSession(body, options.agentTypeId, init?.title);
+    if (!sourceIsCurrent(scope)) return session;
     ensurePendingScope();
+    rememberConfirmedEmptySession(session.id);
     pendingCreatedRef.current.set(session.id, session);
     setDataStorageScope(storageScope);
     setSessions((previous) => mergeSessions([session], previous));
@@ -5409,17 +5548,43 @@ function usePiSessions(options = {}) {
     persistActive(session.id);
     void refresh();
     return session;
-  }, [addressed, enabled, ensurePendingScope, fetchImpl, persistActive, refresh, requestHeaders, sessionsUrl, storageScope]);
+  }, [enabled, ensurePendingScope, fetchImpl, persistActive, refresh, rememberConfirmedEmptySession, requestHeaders, requestScopeKey, sessionsUrl, sourceIsCurrent, storageScope]);
   const switchSession = useCallback7((id) => {
+    if (!sourceIsCurrent(requestScopeKey)) return;
     const known = sessionsRef.current.some((session) => session.id === id);
     const next = known ? id : sessionsRef.current[0]?.id;
     setActiveSessionId(next);
     persistActive(next);
-  }, [persistActive]);
+  }, [persistActive, requestScopeKey, sourceIsCurrent]);
+  const rename = useCallback7(async (id, title) => {
+    const scope = requestScopeKey;
+    if (!sourceIsCurrent(scope)) throw new StaleSessionsSourceError();
+    if (!enabled) throw new Error("Pi sessions are disabled");
+    const response = await fetchImpl(sessionsUrl(`/${encodeURIComponent(id)}/rename`), {
+      method: "POST",
+      headers: { ...requestHeaders(), "Content-Type": "application/json" },
+      body: JSON.stringify({ requestId: createRequestId("rename"), title })
+    });
+    if (!response.ok) throw new Error(`Failed to rename session: ${response.status}`);
+    const renamed = toAddressedSessionSummary(await response.json());
+    if (!sourceIsCurrent(scope)) throw new StaleSessionsSourceError();
+    ensurePendingScope();
+    if (pendingCreatedRef.current.has(id)) pendingCreatedRef.current.set(id, renamed);
+    setSessions((current) => current.map((session) => session.id === id ? renamed : session));
+    return renamed;
+  }, [enabled, ensurePendingScope, fetchImpl, requestHeaders, requestScopeKey, sessionsUrl, sourceIsCurrent]);
   const deleteSession = useCallback7(async (id) => {
+    const scope = requestScopeKey;
+    if (!sourceIsCurrent(scope)) throw new StaleSessionsSourceError();
     if (!enabled) throw new Error("Pi sessions are disabled");
     ensurePendingScope();
+    if (readBootResumeSessionId({ bootResumeSource, storage: options.bootResumeStorage }) === id) {
+      persistBootResume(void 0);
+    }
+    const deletedSession = sessionsRef.current.find((session) => session.id === id);
+    const deletedSessionWasActive = activeSessionIdRef.current === id;
     pendingCreatedRef.current.delete(id);
+    pendingDeletedRef.current.add(id);
     setDataStorageScope(storageScope);
     setSessions((previous) => previous.filter((session) => session.id !== id));
     setActiveSessionId((previous) => {
@@ -5436,18 +5601,29 @@ function usePiSessions(options = {}) {
       if (!response.ok && response.status !== 404) throw new Error(`Failed to delete session: ${response.status}`);
     } catch (err) {
       const error2 = err instanceof Error ? err : new Error(String(err));
-      setError(error2);
-      void refresh();
+      if (sourceIsCurrent(scope)) {
+        pendingDeletedRef.current.delete(id);
+        if (deletedSession) {
+          setSessions((previous) => mergeSessions([deletedSession], previous));
+          if (deletedSessionWasActive) {
+            setActiveSessionId(id);
+            persistActive(id);
+          }
+        }
+        setError(error2);
+        void refresh();
+      }
       throw error2;
     }
-    void refresh();
-  }, [enabled, ensurePendingScope, fetchImpl, persistActive, refresh, requestHeaders, sessionsUrl, storageScope]);
+    if (sourceIsCurrent(scope)) void refresh();
+  }, [bootResumeSource, enabled, ensurePendingScope, fetchImpl, options.bootResumeStorage, persistActive, persistBootResume, refresh, requestHeaders, requestScopeKey, sessionsUrl, sourceIsCurrent, storageScope]);
   const reset = useCallback7(() => {
+    if (!sourceIsCurrent(requestScopeKey)) return;
     pendingCreatedRef.current.clear();
+    pendingDeletedRef.current.clear();
     loadMoreRequestSeqRef.current += 1;
     loadMoreInFlightRef.current = false;
     canonicalLoadedCountRef.current = canonicalPageCount(sessionsRef.current);
-    nextCursorRef.current = void 0;
     loadedDataSourceRef.current = dataSourceKey;
     dataStorageScopeRef.current = storageScope;
     setDataStorageScope(storageScope);
@@ -5455,36 +5631,35 @@ function usePiSessions(options = {}) {
     setActivePiSession(void 0);
     setLoadingMore(false);
     persistActive(void 0);
-  }, [dataSourceKey, persistActive, storageScope]);
+  }, [dataSourceKey, persistActive, requestScopeKey, sourceIsCurrent, storageScope]);
   const visibleActiveSessionId = enabled ? activeSessionId : void 0;
   const activeSession = enabled ? sessions.find((session) => session.id === visibleActiveSessionId) : void 0;
   return {
     sessions,
     activeSession,
     activeSessionId: visibleActiveSessionId,
+    resumeSessionId,
     activePiSession: visibleActiveSessionId ? activePiSession : void 0,
     dataStorageScope,
+    sourceIdentity: enabled && loadedDataSourceRef.current === dataSourceKey ? options.sourceIdentity : void 0,
     loading: enabled ? loading : false,
     loadingMore,
     hasMore: enabled ? hasMore : false,
     error,
     refresh,
     create,
+    rename,
     switch: switchSession,
     delete: deleteSession,
     loadMore,
     reset
   };
 }
-async function fetchSessionList(fetchImpl, url, headers, addressed) {
+async function fetchSessionList(fetchImpl, url, headers) {
   const response = await fetchImpl(url, Object.keys(headers).length > 0 ? { headers } : void 0);
   if (response.status === 503) throw new SessionsPreparingError();
   if (!response.ok) throw new Error(`Failed to load sessions: ${response.status}`);
   const body = await response.json();
-  if (!addressed) {
-    if (!Array.isArray(body)) throw new Error("Failed to load sessions: invalid response");
-    return { sessions: body.map(toSessionSummary) };
-  }
   if (typeof body !== "object" || body === null || !Array.isArray(body.sessions)) {
     throw new Error("Failed to load sessions: invalid response");
   }
@@ -5494,19 +5669,6 @@ async function fetchSessionList(fetchImpl, url, headers, addressed) {
     ...typeof page.nextCursor === "string" ? { nextCursor: page.nextCursor } : {}
   };
 }
-function toSessionSummary(value) {
-  if (typeof value !== "object" || value === null) throw new Error("invalid session summary");
-  const record = value;
-  if (typeof record.id !== "string" || !record.id) throw new Error("invalid session id");
-  const now = (/* @__PURE__ */ new Date(0)).toISOString();
-  return {
-    id: record.id,
-    title: typeof record.title === "string" ? record.title : "Untitled",
-    createdAt: typeof record.createdAt === "string" ? record.createdAt : now,
-    updatedAt: typeof record.updatedAt === "string" ? record.updatedAt : now,
-    turnCount: typeof record.turnCount === "number" ? record.turnCount : 0
-  };
-}
 function toAddressedSessionSummary(value) {
   if (typeof value !== "object" || value === null) throw new Error("invalid addressed session summary");
   const record = value;
@@ -5516,21 +5678,29 @@ function toAddressedSessionSummary(value) {
   }
   const createdAt = typeof record.createdAt === "number" ? new Date(record.createdAt).toISOString() : (/* @__PURE__ */ new Date(0)).toISOString();
   const updatedAt = typeof record.updatedAt === "number" ? new Date(record.updatedAt).toISOString() : createdAt;
+  const agentTypeId = ref.agentTypeId;
+  const status = record.status;
+  const addressedStatus = status === "idle" || status === "running" || status === "aborting" || status === "error" ? status : void 0;
   return {
     id: ref.sessionId,
     title: typeof record.title === "string" ? record.title : "Untitled",
     createdAt,
     updatedAt,
-    turnCount: 0
+    turnCount: typeof record.turnCount === "number" ? record.turnCount : 0,
+    ...typeof agentTypeId === "string" ? { agentTypeId } : {},
+    ...typeof record.nativeSessionId === "string" ? { nativeSessionId: record.nativeSessionId } : {},
+    ...typeof record.hasAssistantReply === "boolean" ? { hasAssistantReply: record.hasAssistantReply } : {},
+    ...addressedStatus ? { status: addressedStatus } : {}
   };
 }
-function addressedCreatedSession(value, title) {
-  if (typeof value !== "object" || value === null || typeof value.sessionId !== "string") {
+function addressedCreatedSession(value, expectedAgentTypeId, title) {
+  if (typeof value !== "object" || value === null || typeof value.sessionId !== "string" || value.agentTypeId !== expectedAgentTypeId) {
     throw new Error("invalid addressed session ref");
   }
   const now = (/* @__PURE__ */ new Date()).toISOString();
   return {
     id: value.sessionId,
+    agentTypeId: expectedAgentTypeId,
     title: title ?? "Untitled",
     createdAt: now,
     updatedAt: now,
@@ -5586,31 +5756,25 @@ function mergeSessions(...lists) {
   }
   return merged;
 }
-function buildRequestHeaders(headers, storageScope) {
-  const result = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (typeof value === "string") result[key] = value;
-  }
-  if (storageScope && !hasHeader2(result, "x-boring-storage-scope")) result["x-boring-storage-scope"] = storageScope;
-  return result;
-}
 function headersScopeKey(headers, storageScope) {
   return JSON.stringify({ storageScope, headers: Object.entries(headers ?? {}).sort(([a], [b]) => a.localeCompare(b)) });
 }
-function requestScopeIdentity(apiBaseUrl, sessionsApiPath, storageScope, headersKey) {
+function requestScopeIdentity(apiBaseUrl, sessionsApiPath, agentTypeId, storageScope, headersKey, workspaceId, sourceIdentity) {
   return `${apiBaseUrl}
 ${sessionsApiPath}
+${agentTypeId}
 ${storageScope}
-${headersKey}`;
+${headersKey}
+${workspaceId ?? ""}
+${sourceIdentity ?? ""}`;
 }
-function dataSourceIdentity(apiBaseUrl, sessionsApiPath, storageScope) {
+function dataSourceIdentity(apiBaseUrl, sessionsApiPath, agentTypeId, storageScope, workspaceId, sourceIdentity) {
   return `${apiBaseUrl}
 ${sessionsApiPath}
-${storageScope}`;
-}
-function hasHeader2(headers, name) {
-  const lower = name.toLowerCase();
-  return Object.keys(headers).some((key) => key.toLowerCase() === lower);
+${agentTypeId}
+${storageScope}
+${workspaceId ?? ""}
+${sourceIdentity ?? ""}`;
 }
 function retryDelayMs(attempt, retry) {
   const base = retry.baseMs ?? DEFAULT_RETRY_BASE_MS;
@@ -5991,8 +6155,8 @@ function searchPiSessions(sessions, query, options = {}) {
 }
 
 // src/front/chat/components/PiConversationSurface.tsx
-import { Loader2 as Loader22 } from "lucide-react";
-import { useCallback as useCallback14, useEffect as useEffect14, useLayoutEffect, useRef as useRef11, useState as useState15 } from "react";
+import { Skeleton } from "@hachej/boring-ui-kit";
+import { useCallback as useCallback14, useEffect as useEffect14, useLayoutEffect as useLayoutEffect2, useRef as useRef11, useState as useState15 } from "react";
 import { useStickToBottomContext as useStickToBottomContext2 } from "use-stick-to-bottom";
 
 // src/front/primitives/conversation.tsx
@@ -6053,7 +6217,7 @@ var ConversationScrollButton = ({
     Button7,
     {
       className: cn(
-        "absolute bottom-4 left-[50%] translate-x-[-50%] rounded-full dark:bg-background dark:hover:bg-muted",
+        "boring-agent-scroll-latest absolute bottom-4 left-[50%] translate-x-[-50%] rounded-full dark:bg-background dark:hover:bg-muted",
         className
       ),
       onClick: handleScrollToBottom,
@@ -6098,8 +6262,27 @@ function noticeTextClass(className) {
 import { memo as memo2 } from "react";
 import { AlertTriangleIcon, InfoIcon, Loader2Icon, PlugZapIcon, RefreshCwIcon, XIcon as XIcon2 } from "lucide-react";
 import { Button as Button8 } from "@hachej/boring-ui-kit";
-import { jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
-var RuntimeNotices = memo2(({ notices, onDismiss, onAction, renderAction, className, ...props }) => {
+
+// src/front/chat/components/terminalChatErrors.ts
+var TERMINAL_CHAT_ERROR_IDS = /* @__PURE__ */ new Set(["chat-error", "session-navigation-error"]);
+function isTerminalChatErrorId(id) {
+  return TERMINAL_CHAT_ERROR_IDS.has(id);
+}
+function isTerminalChatErrorNotice(id, historyEmpty) {
+  return historyEmpty && isTerminalChatErrorId(id);
+}
+function hasTerminalChatError(notices, historyEmpty) {
+  return historyEmpty && notices.some((notice) => isTerminalChatErrorId(notice.id));
+}
+var COMPETING_NOISE_NOTICE_IDS = /* @__PURE__ */ new Set(["connection-reconnecting", "auto-retry"]);
+function filterCompetingNoiseNotices(notices, historyEmpty) {
+  if (!hasTerminalChatError(notices, historyEmpty)) return notices;
+  return notices.filter((notice) => !COMPETING_NOISE_NOTICE_IDS.has(notice.id));
+}
+
+// src/front/chat/components/RuntimeNotices.tsx
+import { Fragment as Fragment7, jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
+var RuntimeNotices = memo2(({ notices, onDismiss, onAction, renderAction, historyEmpty, className, ...props }) => {
   if (notices.length === 0) return null;
   return /* @__PURE__ */ jsx16(
     "div",
@@ -6107,16 +6290,29 @@ var RuntimeNotices = memo2(({ notices, onDismiss, onAction, renderAction, classN
       "data-boring-agent-part": "runtime-notices",
       className: cn("flex flex-col gap-2 px-4 py-2", className),
       ...props,
-      children: notices.map((notice) => /* @__PURE__ */ jsx16(RuntimeNoticeRow, { notice, onDismiss, onAction, renderAction }, notice.id))
+      children: notices.map((notice) => /* @__PURE__ */ jsx16(
+        RuntimeNoticeRow,
+        {
+          notice,
+          onDismiss,
+          onAction,
+          renderAction,
+          historyEmpty: historyEmpty ?? false
+        },
+        notice.id
+      ))
     }
   );
 });
 RuntimeNotices.displayName = "RuntimeNotices";
-function RuntimeNoticeRow({ notice, onDismiss, onAction, renderAction }) {
+function RuntimeNoticeRow({ notice, onDismiss, onAction, renderAction, historyEmpty }) {
   const kind = inferNoticeKind(notice);
   const Icon = iconForNotice(kind, notice.level);
   const actionLabel = notice.actionLabel ?? defaultActionLabel(kind);
   const hostAction = renderAction?.(notice);
+  const isTerminalError = isTerminalChatErrorNotice(notice.id, historyEmpty);
+  const explicitAction = actionLabel && onAction ? /* @__PURE__ */ jsx16(Button8, { type: "button", variant: "ghost", size: "sm", onClick: () => onAction(notice.id), children: actionLabel }) : null;
+  const primaryAction = hostAction ?? explicitAction ?? (isTerminalError ? /* @__PURE__ */ jsx16(Button8, { type: "button", variant: "outline", size: "sm", className: "shrink-0", onClick: () => window.location.reload(), children: "Reload workspace" }) : null);
   return /* @__PURE__ */ jsxs14(
     "div",
     {
@@ -6132,9 +6328,15 @@ function RuntimeNoticeRow({ notice, onDismiss, onAction, renderAction }) {
       ),
       children: [
         /* @__PURE__ */ jsx16(Icon, { className: cn(noticeIconClass(notice.level), kind === "retry" && "animate-spin motion-reduce:animate-none"), "aria-hidden": "true" }),
-        /* @__PURE__ */ jsx16("div", { className: "min-w-0 flex-1", children: /* @__PURE__ */ jsx16("p", { className: noticeTextClass(), children: notice.text }) }),
-        hostAction ?? null,
-        actionLabel && onAction ? /* @__PURE__ */ jsx16(Button8, { type: "button", variant: "ghost", size: "sm", onClick: () => onAction(notice.id), children: actionLabel }) : null,
+        /* @__PURE__ */ jsx16("div", { className: "min-w-0 flex-1", children: isTerminalError ? /* @__PURE__ */ jsxs14(Fragment7, { children: [
+          /* @__PURE__ */ jsx16("p", { className: "text-sm font-semibold text-foreground", children: "Chat history unavailable" }),
+          /* @__PURE__ */ jsx16("p", { className: noticeTextClass("mt-0.5"), children: "The saved conversation could not be loaded. Reload the workspace to try again." }),
+          /* @__PURE__ */ jsxs14("details", { className: "mt-2 text-xs text-muted-foreground", children: [
+            /* @__PURE__ */ jsx16("summary", { className: "cursor-pointer select-none", children: "Error details" }),
+            /* @__PURE__ */ jsx16("p", { className: "mt-1 break-words", children: notice.text })
+          ] })
+        ] }) : /* @__PURE__ */ jsx16("p", { className: noticeTextClass(), children: notice.text }) }),
+        primaryAction,
         notice.dismissible && onDismiss ? /* @__PURE__ */ jsx16(
           Button8,
           {
@@ -6177,7 +6379,8 @@ import { jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
 function RuntimeNoticeMessages({
   notices,
   onDismiss,
-  renderAction
+  renderAction,
+  historyEmpty
 }) {
   const visible = notices.filter(
     (notice) => notice.level === "error" || notice.level === "warning" || notice.id === "connection-reconnecting" || notice.id === "auto-retry" || notice.id === "large-state-warning" || notice.id.startsWith("command:") || notice.id.startsWith("composer-warning:")
@@ -6189,6 +6392,7 @@ function RuntimeNoticeMessages({
       notices: visible,
       onDismiss,
       renderAction,
+      historyEmpty,
       className: "mx-auto w-full max-w-3xl px-0 py-0"
     }
   );
@@ -6650,11 +6854,11 @@ function extractCodeBlockText(children) {
   };
   return walk(children);
 }
-var MarkdownPre = ({ children }) => {
+var MarkdownPre = ({ children, filename }) => {
   const code3 = extractCodeBlockText(children).replace(/\n$/, "");
   const language = extractCodeBlockLanguage(children);
   return /* @__PURE__ */ jsx19(CodeBlock2, { code: code3, language: language ?? "text", className: "my-3", children: /* @__PURE__ */ jsxs17(CodeBlockHeader, { children: [
-    /* @__PURE__ */ jsx19(CodeBlockTitle, { children: /* @__PURE__ */ jsx19(CodeBlockFilename, { children: language ?? "text" }) }),
+    /* @__PURE__ */ jsx19(CodeBlockTitle, { children: /* @__PURE__ */ jsx19(CodeBlockFilename, { children: filename ?? language ?? "text" }) }),
     /* @__PURE__ */ jsx19(CodeBlockCopyButton, {})
   ] }) });
 };
@@ -6684,7 +6888,7 @@ var markdownComponents = {
   code: MarkdownCode
 };
 var MessageResponse = memo3(
-  ({ className, shikiTheme, components, ...props }) => /* @__PURE__ */ jsx19(
+  ({ className, shikiTheme, components, codeFilename, ...props }) => /* @__PURE__ */ jsx19(
     Streamdown,
     {
       className: cn(
@@ -6693,11 +6897,15 @@ var MessageResponse = memo3(
       ),
       plugins: streamdownPlugins,
       shikiTheme: shikiTheme ?? DEFAULT_SHIKI_THEME,
-      components: { ...markdownComponents, ...components ?? {} },
+      components: {
+        ...markdownComponents,
+        ...components ?? {},
+        ...codeFilename ? { pre: (props2) => /* @__PURE__ */ jsx19(MarkdownPre, { ...props2, filename: codeFilename }) } : {}
+      },
       ...props
     }
   ),
-  (prevProps, nextProps) => prevProps.children === nextProps.children && nextProps.isAnimating === prevProps.isAnimating && nextProps.components === prevProps.components
+  (prevProps, nextProps) => prevProps.children === nextProps.children && nextProps.isAnimating === prevProps.isAnimating && nextProps.components === prevProps.components && prevProps.codeFilename === nextProps.codeFilename
 );
 MessageResponse.displayName = "MessageResponse";
 
@@ -6778,7 +6986,7 @@ var ShimmerComponent = ({
 var Shimmer = memo4(ShimmerComponent);
 
 // src/front/primitives/reasoning.tsx
-import { Fragment as Fragment7, jsx as jsx21, jsxs as jsxs18 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx21, jsxs as jsxs18 } from "react/jsx-runtime";
 var ReasoningContext = createContext6(null);
 var useReasoning = () => {
   const context = useContext6(ReasoningContext);
@@ -6891,7 +7099,7 @@ var ReasoningTrigger = memo5(
           className
         ),
         ...props,
-        children: children ?? /* @__PURE__ */ jsxs18(Fragment7, { children: [
+        children: children ?? /* @__PURE__ */ jsxs18(Fragment8, { children: [
           /* @__PURE__ */ jsx21(BrainIcon, { className: "size-3" }),
           getThinkingMessage(isStreaming, duration),
           /* @__PURE__ */ jsx21(
@@ -7053,6 +7261,10 @@ var ToolCallGroup = memo6(({ tools, mergedToolRenderers }) => {
     return () => window.clearInterval(interval);
   }, [isRunning]);
   if (toolParts.length === 0) return null;
+  const inlineToolKeys = new Set(toolParts.flatMap(({ part, key }) => {
+    const { renderer } = resolveToolRendererForPart(part, mergedToolRenderers);
+    return renderer.presentation === "inline" ? [key] : [];
+  }));
   return /* @__PURE__ */ jsxs19(
     Collapsible3,
     {
@@ -7061,6 +7273,11 @@ var ToolCallGroup = memo6(({ tools, mergedToolRenderers }) => {
       className: "not-prose my-1.5",
       "data-boring-agent-tool-state": visualState,
       children: [
+        toolParts.map(({ part, key }) => {
+          if (!inlineToolKeys.has(key)) return null;
+          const { renderer, part: resolvedPart, resolution } = resolveToolRendererForPart(part, mergedToolRenderers);
+          return /* @__PURE__ */ jsx22("div", { "data-boring-agent-part": "inline-tool-renderer", "data-tool-call-id": resolvedPart.toolCallId, "data-tool-renderer-key": resolution.key, children: renderer(resolvedPart) }, key);
+        }),
         /* @__PURE__ */ jsxs19(
           CollapsibleTrigger4,
           {
@@ -7106,7 +7323,10 @@ var ToolCallGroup = memo6(({ tools, mergedToolRenderers }) => {
             children: [
               /* @__PURE__ */ jsx22("div", { className: "absolute left-[5px] top-0 bottom-2 w-px bg-border/35" }),
               /* @__PURE__ */ jsx22("div", { className: "flex min-w-0 flex-col gap-1.5 [&_[data-boring-agent-part=tool-card]]:!my-0", children: toolParts.map(({ part, key }) => {
-                const { renderer, part: resolvedPart, resolution } = resolveToolRendererForPart(part, mergedToolRenderers);
+                const { renderer, part: resolvedPart, resolution } = resolveToolRendererForPart(
+                  part,
+                  inlineToolKeys.has(key) ? {} : mergedToolRenderers
+                );
                 return /* @__PURE__ */ jsx22(
                   "div",
                   {
@@ -7158,7 +7378,7 @@ function ChatMessageContributionBoundary({
 
 // src/front/chat/components/MessageMentions.tsx
 import { Children, cloneElement, isValidElement as isValidElement2 } from "react";
-import { Fragment as Fragment8, jsx as jsx24 } from "react/jsx-runtime";
+import { Fragment as Fragment9, jsx as jsx24 } from "react/jsx-runtime";
 var TERMINAL_BOUNDARY = String.raw`(?=$|\s|[.,;!?)}\]"'”’]+(?=$|\s))`;
 var PREFIX_BOUNDARY = String.raw`(^|[\s(\[{"'“‘])`;
 function escapeRegExp2(value) {
@@ -7316,8 +7536,8 @@ function createMessageMentionMarkdownComponents(catalog, onActivate) {
     const content = Children.toArray(children).filter((child) => child !== null && child !== "");
     if (content.length === 1 && isValidElement2(content[0])) {
       const child = content[0];
-      if (child.props.node?.tagName === "img") return /* @__PURE__ */ jsx24(Fragment8, { children });
-      if (child.props.node?.tagName === "code" && "data-block" in child.props) return /* @__PURE__ */ jsx24(Fragment8, { children });
+      if (child.props.node?.tagName === "img") return /* @__PURE__ */ jsx24(Fragment9, { children });
+      if (child.props.node?.tagName === "code" && "data-block" in child.props) return /* @__PURE__ */ jsx24(Fragment9, { children });
     }
     return /* @__PURE__ */ jsx24("p", { ...props, children: decorate(children) });
   };
@@ -7403,12 +7623,13 @@ function DefaultPiTimelineMessage({ message, isLast, isStreaming, showThoughts,
     mentionActivateRef.current?.(mention);
   }, [openArtifact]);
   const hasMentions = effectiveMentionCatalog.files || effectiveMentionCatalog.commands.length > 0 || effectiveMentionCatalog.skills.length > 0;
-  const mentionsEnabled = Boolean(isAssistant && !(isStreaming && isLast) && hasMentions);
+  const messageIsStreaming = isAssistant && isLast && (isStreaming || message.status === "streaming");
+  const mentionsEnabled = Boolean(isAssistant && !messageIsStreaming && hasMentions);
   const mentionMarkdownComponents = useMemo12(
     () => mentionsEnabled ? createMessageMentionMarkdownComponents(effectiveMentionCatalog, activateCurrentMention) : void 0,
     [activateCurrentMention, effectiveMentionCatalog, mentionSignature, mentionsEnabled]
   );
-  const shouldReserveStreamingActions = isStreaming && isAssistant && isLast;
+  const shouldReserveStreamingActions = messageIsStreaming;
   return /* @__PURE__ */ jsxs20(
     Message,
     {
@@ -7467,7 +7688,7 @@ function DefaultPiTimelineMessage({ message, isLast, isStreaming, showThoughts,
               })
             }
           ) : null,
-          finalParts.map((item) => {
+          finalParts.map((item, index) => {
             if (item.kind === "reasoning") {
               return /* @__PURE__ */ jsx25(
                 TimelineReasoningPart,
@@ -7491,6 +7712,7 @@ function DefaultPiTimelineMessage({ message, isLast, isStreaming, showThoughts,
                 MessageResponse,
                 {
                   components: mentionMarkdownComponents,
+                  codeFilename: codeFilenameForPart(finalParts, index),
                   className: "boring-agent-markdown max-w-none",
                   children: text
                 },
@@ -7507,7 +7729,7 @@ function DefaultPiTimelineMessage({ message, isLast, isStreaming, showThoughts,
           MessageActionsBar,
           {
             text: textParts.map((part) => part.text).join("\n\n"),
-            visible: !isStreaming
+            visible: !messageIsStreaming
           }
         ) : null
       ]
@@ -7542,7 +7764,7 @@ function TimelineReasoningPart({ item, showThoughts }) {
           ReasoningTrigger,
           {
             className: "mb-1 w-fit rounded-[var(--radius-sm)] px-0 py-0 !text-xs !font-normal !text-muted-foreground/75 hover:bg-transparent hover:!text-muted-foreground/75 [&_svg]:!text-muted-foreground/75",
-            getThinkingMessage: (streaming) => /* @__PURE__ */ jsx25("span", { children: streaming ? "thinking" : "thoughts" }),
+            getThinkingMessage: () => /* @__PURE__ */ jsx25("span", { children: "Reasoning" }),
             onClick: toggleManualOpen
           }
         ),
@@ -7603,6 +7825,15 @@ ${part.text}`;
   flushTools();
   return grouped;
 }
+function codeFilenameForPart(parts, index) {
+  const precedingPart = parts[index - 1];
+  if (!precedingPart || precedingPart.kind !== "tool-plain") return void 0;
+  if (precedingPart.part.toolName !== "write" && precedingPart.part.toolName !== "edit") return void 0;
+  const input = precedingPart.part.input;
+  if (!input || typeof input !== "object" || Array.isArray(input)) return void 0;
+  const path = input.path;
+  return typeof path === "string" && path.trim() ? path : void 0;
+}
 function NoticeBubble({ level, text }) {
   return /* @__PURE__ */ jsx25(
     "div",
@@ -7683,10 +7914,10 @@ function MessageActionsBar({
     }
   };
   const iconActionBtnClass = cn(
-    "inline-flex h-6 w-6 items-center justify-center rounded-[var(--radius-sm)]",
-    "text-muted-foreground/35 transition-colors",
-    "hover:bg-foreground/[0.04] hover:text-muted-foreground/80",
-    "focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-[color:var(--accent)]/40"
+    "boring-agent-message-action inline-flex size-8 items-center justify-center rounded-[var(--radius-sm)]",
+    "text-muted-foreground/70 transition-colors duration-150",
+    "hover:bg-foreground/[0.04] hover:text-muted-foreground",
+    "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[color:var(--accent)]/40"
   );
   const hiddenActionProps = visible ? {} : { tabIndex: -1 };
   return /* @__PURE__ */ jsx25(
@@ -7694,7 +7925,7 @@ function MessageActionsBar({
     {
       "aria-hidden": !visible,
       className: cn(
-        "flex min-h-6 items-center gap-0.5 -mt-1 transition-opacity duration-200",
+        "flex min-h-8 items-center gap-1 -mt-1 text-xs text-muted-foreground transition-opacity duration-200",
         visible ? "opacity-100" : "pointer-events-none opacity-0"
       ),
       children: /* @__PURE__ */ jsx25(
@@ -7755,6 +7986,8 @@ function PiConversationSurface({
 }) {
   const messageItems = buildMessageRenderItems(messages);
   const total = messageItems.length;
+  const historyEmpty = messages.length === 0;
+  const terminalError = hasTerminalChatError(runtimeNotices, historyEmpty);
   const [visibleCount, setVisibleCount] = useState15(TRANSCRIPT_WINDOW);
   useEffect14(() => {
     setVisibleCount(TRANSCRIPT_WINDOW);
@@ -7778,11 +8011,8 @@ function PiConversationSurface({
           chrome ? "max-w-3xl px-6 py-8" : "max-w-[680px] px-4 py-4",
           emptyHero && "py-4 text-center"
         ), children: [
-          messages.length === 0 && emptyStateHydrating ? /* @__PURE__ */ jsxs21("div", { className: "flex items-center gap-2 rounded-xl border border-border bg-card/70 px-4 py-3 text-sm text-muted-foreground", children: [
-            /* @__PURE__ */ jsx26(Loader22, { className: "h-4 w-4 animate-spin" }),
-            "Loading chat history\u2026"
-          ] }) : null,
-          messages.length === 0 && !emptyStateHydrating ? /* @__PURE__ */ jsx26(
+          messages.length === 0 && emptyStateHydrating && !terminalError ? /* @__PURE__ */ jsx26(ConversationHistoryLoadingState, {}) : null,
+          messages.length === 0 && !emptyStateHydrating && !terminalError ? /* @__PURE__ */ jsx26(
             ChatEmptyState,
             {
               eyebrow: emptyState?.eyebrow,
@@ -7814,13 +8044,45 @@ function PiConversationSurface({
             },
             key
           )),
-          /* @__PURE__ */ jsx26(RuntimeNoticeMessages, { notices: runtimeNotices, onDismiss: onDismissNotice, renderAction: renderNoticeAction })
+          /* @__PURE__ */ jsx26(RuntimeNoticeMessages, { notices: runtimeNotices, onDismiss: onDismissNotice, renderAction: renderNoticeAction, historyEmpty })
         ] }),
         /* @__PURE__ */ jsx26(ConversationScrollButton, {})
       ]
     }
   );
 }
+function ConversationHistoryLoadingState() {
+  const skeletonClassName = "motion-reduce:animate-none";
+  return /* @__PURE__ */ jsxs21(
+    "div",
+    {
+      role: "status",
+      "aria-label": "Loading chat history",
+      "aria-busy": "true",
+      "data-boring-agent-part": "chat-history-loading",
+      className: "flex flex-col gap-7 py-4",
+      children: [
+        /* @__PURE__ */ jsxs21("div", { "aria-hidden": "true", className: "flex items-start gap-3", children: [
+          /* @__PURE__ */ jsx26(Skeleton, { className: cn("mt-0.5 size-7 shrink-0 rounded-lg", skeletonClassName) }),
+          /* @__PURE__ */ jsxs21("div", { className: "flex min-w-0 flex-1 flex-col gap-2.5", children: [
+            /* @__PURE__ */ jsx26(Skeleton, { className: cn("h-3 w-24 rounded-sm", skeletonClassName) }),
+            /* @__PURE__ */ jsx26(Skeleton, { className: cn("h-3 w-full rounded-sm", skeletonClassName) }),
+            /* @__PURE__ */ jsx26(Skeleton, { className: cn("h-3 w-4/5 rounded-sm", skeletonClassName) })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsx26("div", { "aria-hidden": "true", className: "flex justify-end", children: /* @__PURE__ */ jsx26(Skeleton, { className: cn("h-11 w-[min(72%,30rem)] rounded-xl", skeletonClassName) }) }),
+        /* @__PURE__ */ jsxs21("div", { "aria-hidden": "true", className: "flex items-start gap-3", children: [
+          /* @__PURE__ */ jsx26(Skeleton, { className: cn("mt-0.5 size-7 shrink-0 rounded-lg", skeletonClassName) }),
+          /* @__PURE__ */ jsxs21("div", { className: "flex min-w-0 flex-1 flex-col gap-3", children: [
+            /* @__PURE__ */ jsx26(Skeleton, { className: cn("h-3 w-20 rounded-sm", skeletonClassName) }),
+            /* @__PURE__ */ jsx26(Skeleton, { className: cn("h-20 w-full rounded-lg", skeletonClassName) }),
+            /* @__PURE__ */ jsx26(Skeleton, { className: cn("h-3 w-3/5 rounded-sm", skeletonClassName) })
+          ] })
+        ] })
+      ]
+    }
+  );
+}
 function TranscriptHistoryLoader({ olderCount, onLoadOlder }) {
   const { scrollRef } = useStickToBottomContext2();
   const pendingAnchor = useRef11(null);
@@ -7839,7 +8101,7 @@ function TranscriptHistoryLoader({ olderCount, onLoadOlder }) {
     el.addEventListener("scroll", onScroll, { passive: true });
     return () => el.removeEventListener("scroll", onScroll);
   }, [scrollRef, onLoadOlder]);
-  useLayoutEffect(() => {
+  useLayoutEffect2(() => {
     const el = scrollRef.current;
     if (!el) return;
     if (pendingAnchor.current != null) {
@@ -7853,7 +8115,7 @@ function TranscriptHistoryLoader({ olderCount, onLoadOlder }) {
     {
       type: "button",
       onClick: onLoadOlder,
-      className: "rounded-full border border-border/60 px-3 py-1 text-[11px] text-muted-foreground transition-colors hover:text-foreground",
+      className: "boring-agent-history-action min-h-8 rounded-full border border-border/60 px-3 py-1.5 text-xs text-muted-foreground transition-colors hover:text-foreground",
       children: [
         "Load ",
         olderCount,
@@ -7885,8 +8147,8 @@ function buildMessageRenderItems(messages) {
 }
 
 // src/front/chat/components/PiChatComposerSurface.tsx
-import { useCallback as useCallback16, useLayoutEffect as useLayoutEffect2 } from "react";
-import { motion as motion2 } from "motion/react";
+import { useCallback as useCallback16, useLayoutEffect as useLayoutEffect3 } from "react";
+import { motion as motion2, useReducedMotion } from "motion/react";
 
 // src/front/composer/PluginUpdateStatus.tsx
 import { useEffect as useEffect15, useRef as useRef12 } from "react";
@@ -8129,7 +8391,7 @@ function PluginUpdateStatus({
 
 // src/front/composer/CommandRunStatus.tsx
 import { useEffect as useEffect16, useRef as useRef13 } from "react";
-import { Fragment as Fragment9, jsx as jsx29, jsxs as jsxs24 } from "react/jsx-runtime";
+import { Fragment as Fragment10, jsx as jsx29, jsxs as jsxs24 } from "react/jsx-runtime";
 function CommandRunStatus({
   state,
   onDismiss,
@@ -8154,7 +8416,7 @@ function CommandRunStatus({
         tone: "running",
         dataAttribute: "data-boring-command-run",
         maxWidthClassName,
-        runningContent: state.command ? /* @__PURE__ */ jsxs24(Fragment9, { children: [
+        runningContent: state.command ? /* @__PURE__ */ jsxs24(Fragment10, { children: [
           " Running ",
           /* @__PURE__ */ jsxs24("code", { className: "font-mono", children: [
             "/",
@@ -8172,7 +8434,7 @@ function CommandRunStatus({
         tone: "success",
         dataAttribute: "data-boring-command-run",
         maxWidthClassName,
-        title: state.command ? /* @__PURE__ */ jsxs24(Fragment9, { children: [
+        title: state.command ? /* @__PURE__ */ jsxs24(Fragment10, { children: [
           " Ran ",
           /* @__PURE__ */ jsxs24("code", { className: "font-mono", children: [
             "/",
@@ -8192,7 +8454,7 @@ function CommandRunStatus({
       tone: "error",
       dataAttribute: "data-boring-command-run",
       maxWidthClassName,
-      title: state.command ? /* @__PURE__ */ jsxs24(Fragment9, { children: [
+      title: state.command ? /* @__PURE__ */ jsxs24(Fragment10, { children: [
         " ",
         /* @__PURE__ */ jsxs24("code", { className: "font-mono", children: [
           "/",
@@ -8242,7 +8504,7 @@ function displayProviderLabel(provider) {
 }
 
 // src/front/chatPanelComposerControls.tsx
-import { Fragment as Fragment10, jsx as jsx30, jsxs as jsxs25 } from "react/jsx-runtime";
+import { Fragment as Fragment11, jsx as jsx30, jsxs as jsxs25 } from "react/jsx-runtime";
 var composerActionClass = cn(
   "inline-flex h-8 items-center justify-center gap-1.5 rounded-[var(--radius-md)] border-0 bg-transparent",
   "text-muted-foreground shadow-none transition-colors motion-reduce:transition-none",
@@ -8384,14 +8646,14 @@ var ModelSelectTrigger = forwardRef(function ModelSelectTrigger2({
         className
       ),
       ...props,
-      children: trigger === "slash" ? /* @__PURE__ */ jsxs25(Fragment10, { children: [
+      children: trigger === "slash" ? /* @__PURE__ */ jsxs25(Fragment11, { children: [
         /* @__PURE__ */ jsx30("span", { className: "text-muted-foreground", children: "Model \xB7 " }),
         /* @__PURE__ */ jsx30("span", { className: "min-w-0 truncate text-foreground", children: triggerLabel }),
         value ? /* @__PURE__ */ jsxs25("span", { className: "shrink-0 text-muted-foreground", children: [
           " \xB7 ",
           displayProviderLabel(value.provider)
         ] }) : null
-      ] }) : /* @__PURE__ */ jsxs25(Fragment10, { children: [
+      ] }) : /* @__PURE__ */ jsxs25(Fragment11, { children: [
         /* @__PURE__ */ jsx30("span", { className: "min-w-0 truncate", children: triggerDisplay }),
         /* @__PURE__ */ jsx30(ChevronDownIcon5, { className: "h-3 w-3 shrink-0 text-muted-foreground/50", "aria-hidden": "true" })
       ] })
@@ -8680,10 +8942,10 @@ var ThinkingSelectTrigger = forwardRef(function ThinkingSelectTrigger2({
       ...props,
       children: [
         trigger === "button" ? /* @__PURE__ */ jsx30(ThinkingLevelGlyph, { level: value }) : null,
-        trigger === "slash" ? /* @__PURE__ */ jsxs25(Fragment10, { children: [
+        trigger === "slash" ? /* @__PURE__ */ jsxs25(Fragment11, { children: [
           /* @__PURE__ */ jsx30("span", { className: "text-muted-foreground", children: "Thinking \xB7 " }),
           /* @__PURE__ */ jsx30("span", { className: "text-foreground", children: THINKING_LEVEL_STATUS_LABELS[value] })
-        ] }) : /* @__PURE__ */ jsxs25(Fragment10, { children: [
+        ] }) : /* @__PURE__ */ jsxs25(Fragment11, { children: [
           /* @__PURE__ */ jsx30("span", { children: THINKING_LEVEL_LABELS[value] }),
           /* @__PURE__ */ jsx30(ChevronDownIcon5, { className: "h-3 w-3 shrink-0 text-muted-foreground/50", "aria-hidden": "true" })
         ] })
@@ -8847,7 +9109,7 @@ var PromptInputFooter = ({
 );
 
 // src/front/primitives/prompt-input.tsx
-import { Fragment as Fragment11, jsx as jsx32, jsxs as jsxs27 } from "react/jsx-runtime";
+import { Fragment as Fragment12, jsx as jsx32, jsxs as jsxs27 } from "react/jsx-runtime";
 var PromptInput = ({
   className,
   accept,
@@ -9190,7 +9452,7 @@ var PromptInput = ({
     },
     [usingProvider, controller, files, onSubmit, clear]
   );
-  const inner = /* @__PURE__ */ jsxs27(Fragment11, { children: [
+  const inner = /* @__PURE__ */ jsxs27(Fragment12, { children: [
     /* @__PURE__ */ jsx32(
       Input,
       {
@@ -9359,7 +9621,7 @@ var PromptInputSubmit = ({
 
 // src/front/primitives/slash-command-picker.tsx
 import { useEffect as useEffect19, useMemo as useMemo14, useRef as useRef16, useState as useState18 } from "react";
-import { Fragment as Fragment12, jsx as jsx33, jsxs as jsxs28 } from "react/jsx-runtime";
+import { Fragment as Fragment13, jsx as jsx33, jsxs as jsxs28 } from "react/jsx-runtime";
 var ALL_PLUGINS = "__all__";
 function commandGroup(cmd) {
   if (cmd.source === "skill") return "skills";
@@ -9471,7 +9733,7 @@ function SlashCommandPicker({ query, commands, onSelect, onDismiss }) {
               "/",
               cmd.name
             ] }),
-            cmd.source === "skill" ? /* @__PURE__ */ jsxs28(Fragment12, { children: [
+            cmd.source === "skill" ? /* @__PURE__ */ jsxs28(Fragment13, { children: [
               /* @__PURE__ */ jsx33("span", { className: "rounded-sm bg-accent/15 px-1 py-px text-[9px] font-medium uppercase tracking-wide text-accent-foreground", children: "skill" }),
               cmd.sourcePlugin ? /* @__PURE__ */ jsx33("span", { className: "rounded-sm bg-muted px-1 py-px text-[9px] font-medium text-muted-foreground", children: cmd.sourcePlugin }) : null
             ] }) : cmd.sourcePlugin ? (
@@ -9488,7 +9750,7 @@ function SlashCommandPicker({ query, commands, onSelect, onDismiss }) {
 }
 
 // src/front/chat/components/ComposerAttachments.tsx
-import { AlertCircleIcon as AlertCircleIcon2, Loader2 as Loader23, PaperclipIcon as PaperclipIcon2 } from "lucide-react";
+import { AlertCircleIcon as AlertCircleIcon2, Loader2 as Loader22, PaperclipIcon as PaperclipIcon2 } from "lucide-react";
 import { IconButton as IconButton3 } from "@hachej/boring-ui-kit";
 import { jsx as jsx34, jsxs as jsxs29 } from "react/jsx-runtime";
 function AttachmentButton({ disabled, className }) {
@@ -9503,7 +9765,7 @@ function AttachmentButton({ disabled, className }) {
       onClick: () => {
         if (!disabled) attachments.openFileDialog();
       },
-      className: cn(composerActionClass, "!h-10 !w-10", className),
+      className: cn(composerActionClass, "composer-attachment-button !h-10 !w-10", className),
       "aria-label": "Attach files",
       title: disabled ? "Attachments are available when the composer is ready." : "Attach files",
       children: /* @__PURE__ */ jsx34(PaperclipIcon2, { className: "h-4 w-4", strokeWidth: 1.75 })
@@ -9526,18 +9788,18 @@ function AttachmentsList() {
           data: file,
           onRemove: () => attachments.remove(file.id),
           className: cn(
-            "!h-9 !gap-2 !rounded-full !border-input/80 !bg-muted/40 !pl-1 !pr-2",
+            "composer-attachment-chip !h-9 !gap-2 !rounded-full !border-input/80 !bg-muted/40 !pl-1 !pr-2",
             "transition-colors hover:!bg-muted/70 hover:!text-foreground",
             file.status === "error" && "!border-destructive/50 !bg-destructive/10"
           ),
           children: [
             /* @__PURE__ */ jsxs29("div", { className: "relative shrink-0", children: [
               /* @__PURE__ */ jsx34(AttachmentPreview, { className: "!size-7 overflow-hidden !rounded-full bg-background/60" }),
-              file.status === "uploading" ? /* @__PURE__ */ jsx34("div", { className: "absolute inset-0 flex items-center justify-center rounded-full bg-background/70", children: /* @__PURE__ */ jsx34(Loader23, { className: "size-3.5 animate-spin text-muted-foreground" }) }) : null,
+              file.status === "uploading" ? /* @__PURE__ */ jsx34("div", { className: "absolute inset-0 flex items-center justify-center rounded-full bg-background/70", children: /* @__PURE__ */ jsx34(Loader22, { className: "size-3.5 animate-spin text-muted-foreground" }) }) : null,
               file.status === "error" ? /* @__PURE__ */ jsx34("div", { className: "absolute inset-0 flex items-center justify-center rounded-full bg-destructive/20", children: /* @__PURE__ */ jsx34(AlertCircleIcon2, { className: "size-3.5 text-destructive" }) }) : null
             ] }),
             /* @__PURE__ */ jsx34(AttachmentInfo, { className: "min-w-0 !max-w-[180px] truncate text-[13px] font-medium" }),
-            /* @__PURE__ */ jsx34(AttachmentRemove, { className: "!size-5 !rounded-full !opacity-100 text-muted-foreground/80 hover:text-foreground" })
+            /* @__PURE__ */ jsx34(AttachmentRemove, { className: "composer-attachment-remove !size-5 !rounded-full !opacity-100 text-muted-foreground/80 hover:text-foreground" })
           ]
         },
         file.id
@@ -9629,6 +9891,7 @@ function PiChatComposerSurface({
   onSubmitMessage,
   onStop
 }) {
+  const prefersReducedMotion = useReducedMotion();
   const workspaceRequestId = getHeaderValue(requestHeaders, "x-boring-workspace-id");
   const composerContributions = useComposerContributions();
   const uploadAttachment = useCallback16((file) => uploadFile(file, {
@@ -9658,7 +9921,7 @@ function PiChatComposerSurface({
     rail?.style.setProperty("--composer-input-group-height", `${inputGroupHeight}px`);
     rail?.setAttribute("data-composer-multiline", inputGroupHeight > COMPOSER_INPUT_GROUP_MIN_HEIGHT ? "true" : "false");
   }, []);
-  useLayoutEffect2(() => {
+  useLayoutEffect3(() => {
     resizeTextarea(textareaRef.current);
   }, [draft, resizeTextarea, textareaRef]);
   return /* @__PURE__ */ jsxs30("div", { className: cn(
@@ -9681,15 +9944,15 @@ function PiChatComposerSurface({
             "data-testid": isStreaming ? "chat-working" : void 0,
             role: isStreaming ? "status" : void 0,
             "aria-live": isStreaming ? "polite" : void 0,
-            className: "inline-flex items-center gap-2 rounded-full border border-border/50 bg-background/85 px-2.5 py-1 text-[12px] text-muted-foreground/75 shadow-sm backdrop-blur",
+            className: "inline-flex items-center gap-2 rounded-full border border-border/50 bg-background/85 px-2.5 py-1 text-[12px] text-foreground shadow-sm backdrop-blur",
             children: [
               /* @__PURE__ */ jsx35(
                 motion2.span,
                 {
                   "aria-hidden": "true",
                   className: "inline-block size-1.5 rounded-full bg-[color:var(--accent)]",
-                  animate: { opacity: [0.35, 1, 0.35] },
-                  transition: { duration: 1.2, repeat: Infinity, ease: "easeInOut" }
+                  animate: prefersReducedMotion ? { opacity: 1 } : { opacity: [0.35, 1, 0.35] },
+                  transition: prefersReducedMotion ? { duration: 0 } : { duration: 1.2, repeat: Infinity, ease: "easeInOut" }
                 }
               ),
               /* @__PURE__ */ jsx35("span", { children: "Working\u2026" })
@@ -9881,7 +10144,7 @@ function PiChatComposerSurface({
                                 onStop,
                                 disabled: submitDisabled,
                                 className: cn(
-                                  "h-8 w-8 shrink-0 rounded-full",
+                                  "composer-submit-control h-8 w-8 shrink-0 rounded-full",
                                   "bg-foreground text-background",
                                   "transition-all duration-150 ease-[cubic-bezier(0.22,1,0.36,1)]",
                                   "hover:bg-foreground/90 hover:shadow-[0_0_0_3px_oklch(from_var(--foreground)_l_c_h/0.12)] hover:scale-[1.04]",
@@ -9920,6 +10183,7 @@ function PiChatComposerSurface({
                 disabled: isStreaming || modelControlled,
                 trigger: "slash",
                 open: modelPickerOpen,
+                className: "composer-settings-trigger",
                 onClick: () => {
                   if (modelPickerOpen) {
                     onSetModelPickerOpen(false);
@@ -9936,6 +10200,7 @@ function PiChatComposerSurface({
                 disabled: isStreaming || thinkingControlled,
                 trigger: "slash",
                 open: thinkingPickerOpen,
+                className: "composer-settings-trigger",
                 onClick: () => {
                   if (thinkingPickerOpen) {
                     onSetThinkingPickerOpen(false);
@@ -9958,86 +10223,6 @@ function getHeaderValue(headers, name) {
 
 // src/front/chat/piChatPanelHooks.ts
 import { useCallback as useCallback17, useEffect as useEffect20, useMemo as useMemo15, useRef as useRef17, useState as useState19, useSyncExternalStore } from "react";
-function useExternalRemotePiSession({
-  sessionId,
-  agentTypeId,
-  workspaceId,
-  storageScope,
-  apiBaseUrl,
-  requestHeaders,
-  fetch: fetch2,
-  createRemoteSession,
-  remoteSessionOptions
-}) {
-  const [session, setSession] = useState19();
-  const remoteSessionOptionsRef = useRef17(remoteSessionOptions);
-  remoteSessionOptionsRef.current = remoteSessionOptions;
-  const remoteSessionOptionsKey = useMemo15(
-    () => remoteSessionOptionsIdentity2(remoteSessionOptions),
-    [remoteSessionOptions]
-  );
-  useEffect20(() => {
-    if (!sessionId) {
-      setSession(void 0);
-      return;
-    }
-    const next = (createRemoteSession ?? createRemotePiSession)({
-      ...remoteSessionOptionsRef.current,
-      sessionId,
-      agentTypeId,
-      workspaceId,
-      storageScope,
-      apiBaseUrl,
-      headers: requestHeaders,
-      fetch: fetch2
-    });
-    setSession(next);
-    return () => next.dispose();
-  }, [agentTypeId, apiBaseUrl, createRemoteSession, fetch2, remoteSessionOptionsKey, requestHeaders, sessionId, storageScope, workspaceId]);
-  return session;
-}
-var remoteSessionOptionObjectIds2 = /* @__PURE__ */ new WeakMap();
-var remoteSessionOptionObjectSeq2 = 0;
-function remoteSessionOptionObjectIdentity2(value) {
-  if (typeof value !== "object" && typeof value !== "function" || value === null) return void 0;
-  const object = value;
-  let id = remoteSessionOptionObjectIds2.get(object);
-  if (!id) {
-    id = ++remoteSessionOptionObjectSeq2;
-    remoteSessionOptionObjectIds2.set(object, id);
-  }
-  return String(id);
-}
-function remoteSessionOptionsIdentity2(options) {
-  if (!options) return "{}";
-  return JSON.stringify({
-    autoStart: options.autoStart,
-    requestTimeoutMs: options.requestTimeoutMs,
-    onEvent: remoteSessionOptionObjectIdentity2(options.onEvent),
-    storeOptions: remoteSessionOptionObjectIdentity2(options.storeOptions),
-    setTimeoutFn: remoteSessionOptionObjectIdentity2(options.setTimeoutFn),
-    clearTimeoutFn: remoteSessionOptionObjectIdentity2(options.clearTimeoutFn),
-    reconnect: options.reconnect ? {
-      baseMs: options.reconnect.baseMs,
-      maxMs: options.reconnect.maxMs,
-      jitterRatio: options.reconnect.jitterRatio,
-      random: remoteSessionOptionObjectIdentity2(options.reconnect.random)
-    } : void 0,
-    debug: options.debug ? {
-      largeStateWarningBytes: options.debug.largeStateWarningBytes,
-      largeStateWarningMessages: options.debug.largeStateWarningMessages,
-      onWarning: remoteSessionOptionObjectIdentity2(options.debug.onWarning)
-    } : void 0
-  });
-}
-function useRemotePiSessionState(session) {
-  return useSyncExternalStore(
-    useCallback17((listener) => session?.subscribe(listener) ?? (() => {
-    }), [session]),
-    useCallback17(() => session?.getState(), [session]),
-    useCallback17(() => session?.getState(), [session])
-  );
-}
 
 // src/front/chat/piChatPanelUtils.ts
 function headersContentKey(headers) {
@@ -10144,9 +10329,103 @@ function errorMessage2(error, fallback) {
   return error instanceof Error && error.message ? error.message : fallback;
 }
 
+// src/front/chat/piChatPanelHooks.ts
+function useExternalRemotePiSession({
+  sessionId,
+  agentTypeId,
+  workspaceId,
+  storageScope,
+  apiBaseUrl,
+  requestHeaders,
+  fetch: fetch2,
+  createRemoteSession,
+  remoteSessionOptions,
+  enabled = true
+}) {
+  const [session, setSession] = useState19();
+  const remoteSessionOptionsRef = useRef17(remoteSessionOptions);
+  remoteSessionOptionsRef.current = remoteSessionOptions;
+  const requestHeadersKey = headersContentKey(requestHeaders);
+  const stableRequestHeaders = useMemo15(
+    () => normalizedHeadersFromContentKey(requestHeadersKey),
+    [requestHeadersKey]
+  );
+  const remoteSessionOptionsKey = useMemo15(
+    () => remoteSessionOptionsIdentity2(remoteSessionOptions),
+    [remoteSessionOptions]
+  );
+  useEffect20(() => {
+    if (!sessionId) {
+      setSession(void 0);
+      return;
+    }
+    const next = (createRemoteSession ?? createRemotePiSession)({
+      ...remoteSessionOptionsRef.current,
+      autoStart: false,
+      sessionId,
+      agentTypeId,
+      workspaceId,
+      storageScope,
+      apiBaseUrl,
+      headers: stableRequestHeaders,
+      fetch: fetch2
+    });
+    setSession(next);
+    return () => next.dispose();
+  }, [agentTypeId, apiBaseUrl, createRemoteSession, fetch2, remoteSessionOptionsKey, sessionId, stableRequestHeaders, storageScope, workspaceId]);
+  useEffect20(() => {
+    if (!session) return;
+    if (enabled) session.resumeStream?.();
+    else session.suspendStream?.();
+  }, [enabled, session]);
+  return session;
+}
+var remoteSessionOptionObjectIds2 = /* @__PURE__ */ new WeakMap();
+var remoteSessionOptionObjectSeq2 = 0;
+function remoteSessionOptionObjectIdentity2(value) {
+  if (typeof value !== "object" && typeof value !== "function" || value === null) return void 0;
+  const object = value;
+  let id = remoteSessionOptionObjectIds2.get(object);
+  if (!id) {
+    id = ++remoteSessionOptionObjectSeq2;
+    remoteSessionOptionObjectIds2.set(object, id);
+  }
+  return String(id);
+}
+function remoteSessionOptionsIdentity2(options) {
+  if (!options) return "{}";
+  return JSON.stringify({
+    autoStart: options.autoStart,
+    requestTimeoutMs: options.requestTimeoutMs,
+    onEvent: remoteSessionOptionObjectIdentity2(options.onEvent),
+    storeOptions: remoteSessionOptionObjectIdentity2(options.storeOptions),
+    setTimeoutFn: remoteSessionOptionObjectIdentity2(options.setTimeoutFn),
+    clearTimeoutFn: remoteSessionOptionObjectIdentity2(options.clearTimeoutFn),
+    reconnect: options.reconnect ? {
+      baseMs: options.reconnect.baseMs,
+      maxMs: options.reconnect.maxMs,
+      jitterRatio: options.reconnect.jitterRatio,
+      random: remoteSessionOptionObjectIdentity2(options.reconnect.random)
+    } : void 0,
+    debug: options.debug ? {
+      largeStateWarningBytes: options.debug.largeStateWarningBytes,
+      largeStateWarningMessages: options.debug.largeStateWarningMessages,
+      onWarning: remoteSessionOptionObjectIdentity2(options.debug.onWarning)
+    } : void 0
+  });
+}
+function useRemotePiSessionState(session) {
+  return useSyncExternalStore(
+    useCallback17((listener) => session?.subscribe(listener) ?? (() => {
+    }), [session]),
+    useCallback17(() => session?.getState(), [session]),
+    useCallback17(() => session?.getState(), [session])
+  );
+}
+
 // src/front/chat/PiChatPanel.tsx
 import { jsx as jsx36, jsxs as jsxs31 } from "react/jsx-runtime";
-var DebugDrawer2 = lazy(() => import("../DebugDrawer-RYEBQ6CO.js").then((m) => ({ default: m.DebugDrawer })));
+var DebugDrawer2 = lazy(() => import("../DebugDrawer-2TO5SE2D.js").then((m) => ({ default: m.DebugDrawer })));
 var EMPTY_COMMANDS = [];
 var EMPTY_COMMAND_NAMES = [];
 var EMPTY_BLOCKERS = [];
@@ -10282,6 +10561,7 @@ function PiChatPanel({
   const selectedSessionPending = Boolean(activeSessionId && !selectedChatState);
   const modelDiscoveryEnabled = serverResourcesEnabled && availableModels === void 0;
   const modelDiscovery = useChatModelSelection({
+    agentTypeId,
     apiBaseUrl,
     defaultModel,
     fetch: fetch2,
@@ -10385,6 +10665,7 @@ function PiChatPanel({
     return next;
   }, [apiBaseUrl, commands, contributedCommands, excludeBuiltinCommands, extraCommands, hotReloadEnabled, normalizedRequestHeaders, serverResourcesEnabled, serverSkillsRefreshKey, storageScope]);
   const commandsStamp = useServerCommands({
+    agentTypeId,
     registry,
     requestHeaders: normalizedRequestHeaders,
     sessionId: activeSessionId ?? "default",
@@ -10414,7 +10695,8 @@ function PiChatPanel({
   const queuePreview = selectedChatState ? selectQueuePreview(selectedChatState) : [];
   const messages = canonicalMessages;
   const userHistory = useMemo16(() => selectComposerHistoryFromCanonicalUsers(canonicalMessages), [canonicalMessages]);
-  const emptyStateHydrating = statusForState(selectedChatState, sessionsLoading || chatStatePending || selectedSessionPending) === "hydrating";
+  const awaitingHydration = Boolean(hydrateMessages && selectedChatState && !selectedChatState.hydrated);
+  const emptyStateHydrating = statusForState(selectedChatState, sessionsLoading || chatStatePending || selectedSessionPending) === "hydrating" || awaitingHydration;
   const emptyHero = emptyPlacement === "hero" && messages.length === 0 && queuePreview.length === 0 && !emptyStateHydrating;
   const debugState = selectedPiSession?.getDebugState();
   const composerBlocked = workspaceWarmupBlocked || activeBlockers.length > 0;
@@ -10430,8 +10712,9 @@ function PiChatPanel({
       text: `Large chat state: ${debugState.largeStateWarning.messageCount} messages, approximately ${debugState.largeStateWarning.approxBytes} bytes.`,
       dismissible: true
     }] : [];
-    return [...fromState, ...sessionNotice, ...largeStateNotice, ...localNotices].filter((notice) => !dismissedNoticeIds.has(notice.id));
-  }, [debug, debugState?.largeStateWarning, dismissedNoticeIds, localNotices, selectedChatState, sessionsError]);
+    const combined = [...fromState, ...sessionNotice, ...largeStateNotice, ...localNotices].filter((notice) => !dismissedNoticeIds.has(notice.id));
+    return filterCompetingNoiseNotices(combined, messages.length === 0);
+  }, [debug, debugState?.largeStateWarning, dismissedNoticeIds, localNotices, messages.length, selectedChatState, sessionsError]);
   const addLocalNotice = useCallback18((notice) => {
     setLocalNotices((previous) => {
       const next = previous.filter((candidate) => candidate.id !== notice.id);
@@ -10462,11 +10745,11 @@ function PiChatPanel({
     if (resetInProgressRef.current) return;
     if (autoCreateInFlightRef.current) return;
     autoCreateInFlightRef.current = true;
-    void sessions.create().catch((error) => {
+    void sessions.create({ resumeSessionId: sessions.resumeSessionId }).catch((error) => {
       autoCreateInFlightRef.current = false;
       addLocalNotice({ id: "session-auto-create-error", level: "error", text: errorMessage2(error, "Could not create a chat session."), dismissible: true });
     });
-  }, [activeSessionId, addLocalNotice, externalSessionId, sessionList.length, sessions.create, sessionsError, sessionsLoading]);
+  }, [activeSessionId, addLocalNotice, externalSessionId, sessionList.length, sessions.create, sessions.resumeSessionId, sessionsError, sessionsLoading]);
   useEffect21(() => {
     if (externalSessionId || sessionsError || activeSessionId || sessionList.length > 0) {
       autoCreateInFlightRef.current = false;
@@ -10914,14 +11197,18 @@ function PiChatPanel({
   }, [isStreaming]);
   useEffect21(() => {
     if (typeof window === "undefined" || !activeChatSessionId) return;
-    window.dispatchEvent(new CustomEvent("boring:chat-session-status", {
+    const emitStatus = () => window.dispatchEvent(new CustomEvent("boring:chat-session-status", {
       detail: {
+        ...workspaceId ? { workspaceId } : {},
         sessionId: activeChatSessionId,
         ...agentTypeId ? { agentTypeId } : {},
         working: isStreaming
       }
     }));
-  }, [activeChatSessionId, agentTypeId, isStreaming]);
+    emitStatus();
+    window.addEventListener("boring:chat-session-status-request", emitStatus);
+    return () => window.removeEventListener("boring:chat-session-status-request", emitStatus);
+  }, [activeChatSessionId, agentTypeId, isStreaming, workspaceId]);
   const onTextareaKeyDown = useCallback18((event) => {
     if (event.key === "Escape" && isStreaming) {
       if (event.defaultPrevented || mentionState !== null || slashQuery !== null) {
@@ -11011,6 +11298,7 @@ function PiChatPanel({
     {
       "data-boring-agent": "",
       "data-boring-agent-part": "chat",
+      "data-agent-type-id": agentTypeId,
       "data-pi-chat-session-id": activeSessionId,
       "data-pi-chat-connection": debugState?.connection ?? "disconnected",
       "data-pi-chat-last-seq": debugState?.lastSeq ?? 0,
@@ -11089,6 +11377,7 @@ function PiChatPanel({
         debug ? /* @__PURE__ */ jsx36(Suspense, { fallback: null, children: /* @__PURE__ */ jsx36("div", { "aria-label": "Chat debug metadata", className: "contents", role: "region", children: /* @__PURE__ */ jsx36(
           DebugDrawer2,
           {
+            agentTypeId,
             apiBaseUrl,
             fetch: fetch2,
             sessionId: activeSessionId ?? activeChatSessionId ?? "unknown",
@@ -11105,6 +11394,207 @@ function PiChatPanel({
   ) });
 }
 
+// src/front/chat/useAddressedAgentSelection.ts
+import { useCallback as useCallback19, useEffect as useEffect22, useMemo as useMemo17, useState as useState21 } from "react";
+
+// src/front/chat/gatewayResponseError.ts
+var RUNTIME_SCOPE_MISMATCH_MESSAGE = "This chat belongs to a previous runtime configuration and can no longer be changed.";
+var GatewayResponseError = class extends Error {
+  constructor(status, message, code3, details, body, operation) {
+    super(message);
+    this.status = status;
+    this.code = code3;
+    this.details = details;
+    this.body = body;
+    this.operation = operation;
+    this.name = "GatewayResponseError";
+    this.errorCode = code3;
+  }
+  status;
+  code;
+  details;
+  body;
+  operation;
+  errorCode;
+};
+async function gatewayResponseError(response, fallbackMessage, operation) {
+  const body = await safeReadJson2(response);
+  return gatewayResponseErrorFromBody(response.status, body, fallbackMessage, operation);
+}
+function gatewayResponseErrorFromBody(status, body, fallbackMessage, operation) {
+  const payload = errorPayload(body);
+  const code3 = gatewayResponseErrorCode(payload?.code);
+  const serverMessage = typeof payload?.message === "string" && payload.message.trim().length > 0 ? payload.message : fallbackMessage;
+  const message = code3 === AgentGatewayErrorCode.AGENT_SESSION_RUNTIME_SCOPE_MISMATCH ? RUNTIME_SCOPE_MISMATCH_MESSAGE : serverMessage;
+  const details = isJsonValue(payload?.details) ? payload.details : void 0;
+  return new GatewayResponseError(status, message, code3, details, body, operation);
+}
+function gatewayResponseErrorCode(value) {
+  const sharedCode = ErrorCode.safeParse(value);
+  if (sharedCode.success) return sharedCode.data;
+  return typeof value === "string" && AGENT_GATEWAY_ERROR_CODES.includes(value) ? value : void 0;
+}
+function errorResponseCode(error) {
+  if (error instanceof GatewayResponseError) return error.code;
+  const record = typeof error === "object" && error !== null ? error : void 0;
+  return gatewayResponseErrorCode(record?.code ?? record?.errorCode);
+}
+function isRuntimeScopeMismatchError(error) {
+  return errorResponseCode(error) === AgentGatewayErrorCode.AGENT_SESSION_RUNTIME_SCOPE_MISMATCH;
+}
+async function safeReadJson2(response) {
+  const text = await response.text();
+  if (!text) return void 0;
+  try {
+    return JSON.parse(text);
+  } catch {
+    return void 0;
+  }
+}
+function errorPayload(body) {
+  if (typeof body !== "object" || body === null) return void 0;
+  const record = body;
+  return typeof record.error === "object" && record.error !== null ? record.error : record;
+}
+function isJsonValue(value) {
+  if (value === null || ["string", "number", "boolean"].includes(typeof value)) return true;
+  if (Array.isArray(value)) return value.every(isJsonValue);
+  return typeof value === "object" && value !== null && Object.values(value).every(isJsonValue);
+}
+
+// src/front/chat/useAddressedAgentSelection.ts
+var inFlightDiscoveries = /* @__PURE__ */ new WeakMap();
+function useAddressedAgentSelection({
+  apiBaseUrl,
+  requestHeaders,
+  storageScope,
+  fetch: fetch2,
+  enabled = false
+} = {}) {
+  const normalizedBaseUrl = apiBaseUrl?.replace(/\/$/, "") ?? "";
+  const headersKey = useMemo17(
+    () => JSON.stringify({
+      storageScope: storageScope ?? "",
+      headers: Object.entries(requestHeaders ?? {}).sort(([a], [b]) => a.localeCompare(b))
+    }),
+    [requestHeaders, storageScope]
+  );
+  const discoveryKey = `${normalizedBaseUrl}
+${headersKey}`;
+  const fetchImpl = fetch2 ?? globalThis.fetch;
+  const [state, setState] = useState21(() => ({
+    discoveryKey: enabled ? "" : discoveryKey,
+    agents: [],
+    selectedAgentTypeId: void 0,
+    loading: enabled,
+    error: void 0
+  }));
+  useEffect22(() => {
+    if (!enabled) {
+      setState({
+        discoveryKey,
+        agents: [],
+        selectedAgentTypeId: void 0,
+        loading: false,
+        error: void 0
+      });
+      return;
+    }
+    let cancelled = false;
+    setState((previous) => ({
+      discoveryKey,
+      agents: previous.discoveryKey === discoveryKey ? previous.agents : [],
+      selectedAgentTypeId: previous.discoveryKey === discoveryKey ? previous.selectedAgentTypeId : void 0,
+      loading: true,
+      error: void 0
+    }));
+    void discoverAgents(fetchImpl, discoveryKey, `${normalizedBaseUrl}/api/v1/agents`, {
+      headers: scopedHeaders(requestHeaders, storageScope)
+    }).then((agents2) => {
+      if (cancelled) return;
+      setState((previous) => ({
+        discoveryKey,
+        agents: agents2,
+        selectedAgentTypeId: agents2.some((agent) => agent.agentTypeId === previous.selectedAgentTypeId) ? previous.selectedAgentTypeId : agents2[0]?.agentTypeId,
+        loading: false,
+        error: void 0
+      }));
+    }).catch((error) => {
+      if (cancelled) return;
+      setState({
+        discoveryKey,
+        agents: [],
+        selectedAgentTypeId: void 0,
+        loading: false,
+        error: error instanceof Error ? error : new Error(String(error))
+      });
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [discoveryKey, enabled, fetchImpl, normalizedBaseUrl]);
+  const current = state.discoveryKey === discoveryKey;
+  const agents = enabled && current ? state.agents : [];
+  const selectedAgentTypeId = enabled && current ? state.selectedAgentTypeId : void 0;
+  const selectAgentTypeId = useCallback19((agentTypeId) => {
+    setState((previous) => {
+      if (previous.discoveryKey !== discoveryKey) return previous;
+      if (!previous.agents.some((agent) => agent.agentTypeId === agentTypeId)) return previous;
+      return { ...previous, selectedAgentTypeId: agentTypeId };
+    });
+  }, [discoveryKey]);
+  return {
+    agents,
+    selectedAgentTypeId,
+    loading: enabled && (!current || state.loading),
+    error: enabled && current ? state.error : void 0,
+    selectAgentTypeId
+  };
+}
+function discoverAgents(fetchImpl, discoveryKey, url, init) {
+  let requests = inFlightDiscoveries.get(fetchImpl);
+  if (!requests) {
+    requests = /* @__PURE__ */ new Map();
+    inFlightDiscoveries.set(fetchImpl, requests);
+  }
+  const existing = requests.get(discoveryKey);
+  if (existing) return existing;
+  const request = fetchImpl(url, init).then(async (response) => {
+    if (!response.ok) throw await gatewayResponseError(response, "Failed to load agents.", "load agents");
+    return parseAgentOptions(await response.json());
+  });
+  requests.set(discoveryKey, request);
+  void request.finally(() => {
+    if (requests?.get(discoveryKey) === request) requests.delete(discoveryKey);
+  }).catch(() => void 0);
+  return request;
+}
+function parseAgentOptions(value) {
+  if (!Array.isArray(value)) throw new Error("Failed to load agents: invalid response");
+  return value.map((item) => {
+    if (typeof item !== "object" || item === null) throw new Error("Failed to load agents: invalid response");
+    const record = item;
+    if (typeof record.agentTypeId !== "string" || record.agentTypeId.length === 0) {
+      throw new Error("Failed to load agents: invalid response");
+    }
+    return {
+      agentTypeId: record.agentTypeId,
+      label: typeof record.label === "string" && record.label.length > 0 ? record.label : record.agentTypeId,
+      ...typeof record.description === "string" ? { description: record.description } : {},
+      ...Array.isArray(record.pluginIds) ? { pluginIds: record.pluginIds.filter((pluginId) => typeof pluginId === "string" && pluginId.length > 0) } : {}
+    };
+  });
+}
+function scopedHeaders(headers, storageScope) {
+  const result = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (typeof value === "string") result[key] = value;
+  }
+  const hasStorageScope = Object.keys(result).some((key) => key.toLowerCase() === "x-boring-storage-scope");
+  if (storageScope && !hasStorageScope) result["x-boring-storage-scope"] = storageScope;
+  return result;
+}
+
 // src/front/commands.ts
 var AGENT_COMMAND_SOURCE = "agent";
 function getAgentCommands(options = {}) {
@@ -11150,6 +11640,7 @@ export {
   ConversationContent,
   ConversationScrollButton,
   DebugDrawer,
+  GatewayResponseError,
   Message,
   MessageAction,
   MessageActions,
@@ -11165,6 +11656,7 @@ export {
   PromptInputFooter,
   PromptInputSubmit,
   PromptInputTextarea,
+  RUNTIME_SCOPE_MISMATCH_MESSAGE,
   Reasoning,
   ReasoningContent,
   ReasoningTrigger,
@@ -11175,12 +11667,15 @@ export {
   ToolHeader,
   activeSessionStorageKey,
   builtinCommands,
-  clearActiveSessionId,
   cn,
   createCommandRegistry,
   defaultChatSuggestions,
   defaultToolRenderers,
+  errorResponseCode,
+  gatewayResponseError,
+  gatewayResponseErrorFromBody,
   getAgentCommands,
+  isRuntimeScopeMismatchError,
   matchPiSessionSearch,
   mergeShadcnToolRenderers,
   mergeToolRenderers,
@@ -11190,6 +11685,7 @@ export {
   resolveToolRenderer,
   searchPiSessions,
   uploadFile,
+  useAddressedAgentSelection,
   useOpenArtifact,
   usePiSessions,
   writeActiveSessionId