@hachej/boring-agent 0.1.103 → 0.1.104

package/dist/front/index.js

@@ -31,7 +31,7 @@ import {
   WORKSPACE_COMMAND_NOTIFY_EVENT,
   extractToolUiMetadata,
   sanitizeToolUiMetadata
-} from "../chunk-7QM22DU7.js";
+} from "../chunk-6DRHERVK.js";
 import "../chunk-YGRQ4Q5P.js";
 import {
   ErrorCode
@@ -85,7 +85,7 @@ function rawWorkspaceFileUrl(path, opts) {
 }
 
 // src/front/chat/PiChatPanel.tsx
-import { lazy, Suspense, useCallback as useCallback18, useEffect as useEffect21, useMemo as useMemo16, useRef as useRef18, useState as useState20 } from "react";
+import { lazy, Suspense, useCallback as useCallback18, useEffect as useEffect21, useMemo as useMemo16, useRef as useRef17, useState as useState20 } from "react";
 
 // src/front/chatPanelSettings.ts
 var DEFAULT_THINKING = "medium";
@@ -2126,7 +2126,7 @@ function useComposerPickers({
 }
 
 // src/front/hooks/useChatModelSelection.ts
-import { useCallback as useCallback6, useEffect as useEffect5, useMemo as useMemo2, useRef as useRef6, useState as useState7 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect5, useMemo as useMemo2, useState as useState7 } from "react";
 
 // src/front/browserFiles.ts
 var convertBlobUrlToDataUrl = async (url) => {
@@ -2550,35 +2550,59 @@ function resolveStorage(storage) {
 }
 
 // src/front/hooks/useChatModelSelection.ts
+function sameModel(left, right) {
+  return left?.provider === right?.provider && left?.id === right?.id;
+}
+function availableModel(models, model) {
+  return Boolean(model && models.some((candidate) => candidate.available && candidate.provider === model.provider && candidate.id === model.id));
+}
 function useChatModelSelection({
   agentTypeId,
   apiBaseUrl,
   defaultModel,
+  sessionId,
+  sessionHydrated = sessionId === void 0,
+  sessionIsNew = sessionId === void 0,
+  sessionModel,
   fetch: fetchImpl,
   requestHeaders,
   storage,
   storageScope,
   enabled = true
 }) {
-  const initialModelState = useMemo2(() => readPiComposerSettings({ storageScope, storage }), []);
-  const [model, setModelState] = useState7(
-    () => initialModelState.model ?? defaultModel ?? null
-  );
-  const [userSelectedModel, setUserSelectedModel] = useState7(
-    () => initialModelState.userSelectedModel
-  );
-  const userSelectedModelRef = useRef6(userSelectedModel);
-  const loadedSettingsSourceRef = useRef6({ storage, storageScope });
+  const initialSettings = useMemo2(() => readPiComposerSettings({ storageScope, storage }), []);
+  const [selection, setSelection] = useState7(() => ({
+    sessionId,
+    storage,
+    storageScope,
+    localDefault: initialSettings.model ?? defaultModel ?? null
+  }));
   useEffect5(() => {
-    userSelectedModelRef.current = userSelectedModel;
-  }, [userSelectedModel]);
+    const settings = readPiComposerSettings({ storageScope, storage });
+    setSelection((current) => {
+      const sameSession = current.sessionId === sessionId;
+      const pendingOverride2 = sameSession && current.pendingOverride && sessionModel && !sameModel(current.pendingOverride, sessionModel) ? current.pendingOverride : sessionIsNew && sessionModel && settings.model && !sameModel(settings.model, sessionModel) ? settings.model : void 0;
+      return {
+        sessionId,
+        storage,
+        storageScope,
+        localDefault: settings.model ?? defaultModel ?? null,
+        ...pendingOverride2 ? { pendingOverride: pendingOverride2 } : {}
+      };
+    });
+  }, [defaultModel, sessionId, sessionIsNew, sessionModel?.id, sessionModel?.provider, storage, storageScope]);
   const setModel = useCallback6((next) => {
     const normalized = next === null ? null : parseModelSelection(next);
-    userSelectedModelRef.current = normalized !== null;
-    setUserSelectedModel(normalized !== null);
-    setModelState(normalized);
+    setSelection((current) => {
+      if (sessionModel) {
+        const pendingOverride2 = normalized && !sameModel(normalized, sessionModel) ? normalized : void 0;
+        return { ...current, sessionId, ...pendingOverride2 ? { pendingOverride: pendingOverride2 } : { pendingOverride: void 0 } };
+      }
+      if (sessionId && !sessionIsNew) return current;
+      return { ...current, sessionId, localDefault: normalized, pendingOverride: void 0 };
+    });
     writePiComposerModelSelection(normalized, { storageScope, storage });
-  }, [storage, storageScope]);
+  }, [sessionId, sessionIsNew, sessionModel, storage, storageScope]);
   const discoveryKey = useMemo2(
     () => JSON.stringify({
       apiBaseUrl: apiBaseUrl ?? "",
@@ -2591,22 +2615,6 @@ function useChatModelSelection({
   const [availableModels, setAvailableModels] = useState7([]);
   const [loaded, setLoaded] = useState7(!enabled);
   const [loadedDiscoveryKey, setLoadedDiscoveryKey] = useState7(enabled ? null : discoveryKey);
-  useEffect5(() => {
-    if (loadedSettingsSourceRef.current.storage !== storage || loadedSettingsSourceRef.current.storageScope !== storageScope) return;
-    if (!userSelectedModel || !model) return;
-    writePiComposerModelSelection(model, { storageScope, storage });
-  }, [model, storage, storageScope, userSelectedModel]);
-  useEffect5(() => {
-    const settings = readPiComposerSettings({ storageScope, storage });
-    loadedSettingsSourceRef.current = { storage, storageScope };
-    userSelectedModelRef.current = settings.userSelectedModel;
-    setUserSelectedModel(settings.userSelectedModel);
-    setModelState(settings.model ?? defaultModel ?? null);
-  }, [storage, storageScope]);
-  useEffect5(() => {
-    if (userSelectedModelRef.current || !defaultModel) return;
-    setModelState(defaultModel);
-  }, [defaultModel]);
   useEffect5(() => {
     if (!enabled) {
       setLoaded(true);
@@ -2618,46 +2626,44 @@ function useChatModelSelection({
     const nextFetch = fetchImpl ?? globalThis.fetch.bind(globalThis);
     nextFetch(agentResourceUrl(apiBaseUrl, `/api/v1/agents/${encodeURIComponent(agentTypeId)}/models`), {
       headers: withStorageScope(requestHeaders, storageScope)
-    }).then((res) => res.ok ? res.json() : null).then((payload) => {
+    }).then((response) => response.ok ? response.json() : null).then((payload) => {
       if (aborted) return;
-      if (!payload?.models) {
-        userSelectedModelRef.current = false;
-        setUserSelectedModel(false);
+      const models = payload?.models;
+      if (!models) {
         setAvailableModels([]);
-        setModelState(null);
-        writePiComposerModelSelection(null, { storageScope, storage });
+        setSelection((current) => ({ ...current, pendingOverride: void 0, localDefault: sessionModel ?? null }));
+        if (!sessionModel) writePiComposerModelSelection(null, { storageScope, storage });
         setLoadedDiscoveryKey(discoveryKey);
         setLoaded(true);
         return;
       }
-      setAvailableModels(payload.models);
+      setAvailableModels(models);
+      setSelection((current) => {
+        const selected = current.pendingOverride ?? sessionModel ?? current.localDefault;
+        if (availableModel(models, selected)) return current;
+        if (sessionModel) return { ...current, pendingOverride: void 0 };
+        if (sessionId && !sessionIsNew) return { ...current, pendingOverride: void 0, localDefault: null };
+        const firstAvailable = models.find((candidate) => candidate.available);
+        return {
+          ...current,
+          pendingOverride: void 0,
+          localDefault: payload.defaultModel ?? (firstAvailable ? { provider: firstAvailable.provider, id: firstAvailable.id } : null)
+        };
+      });
       setLoadedDiscoveryKey(discoveryKey);
       setLoaded(true);
-      const available = payload.models.filter((m) => m.available);
-      setModelState((current) => {
-        const currentAvailable = current ? available.some((m) => m.provider === current.provider && m.id === current.id) : false;
-        if (currentAvailable) return current;
-        userSelectedModelRef.current = false;
-        setUserSelectedModel(false);
-        writePiComposerModelSelection(null, { storageScope, storage });
-        if (payload.defaultModel) return { provider: payload.defaultModel.provider, id: payload.defaultModel.id };
-        const firstAvailable = available[0];
-        return firstAvailable ? { provider: firstAvailable.provider, id: firstAvailable.id } : null;
-      });
     }).catch(() => {
       if (aborted) return;
-      userSelectedModelRef.current = false;
-      setUserSelectedModel(false);
       setAvailableModels([]);
-      setModelState(null);
-      writePiComposerModelSelection(null, { storageScope, storage });
+      setSelection((current) => ({ ...current, pendingOverride: void 0, localDefault: sessionModel ?? null }));
+      if (!sessionModel) writePiComposerModelSelection(null, { storageScope, storage });
       setLoadedDiscoveryKey(discoveryKey);
       setLoaded(true);
     });
     return () => {
       aborted = true;
     };
-  }, [agentTypeId, apiBaseUrl, discoveryKey, enabled, fetchImpl, requestHeaders, storage, storageScope]);
+  }, [agentTypeId, apiBaseUrl, discoveryKey, enabled, fetchImpl, requestHeaders, sessionId, sessionIsNew, sessionModel, storage, storageScope]);
   useEffect5(() => {
     const onChange = (event) => {
       const next = parseModelSelection(event.detail);
@@ -2667,13 +2673,23 @@ function useChatModelSelection({
     return () => globalThis.removeEventListener?.("boring:model-change", onChange);
   }, [setModel]);
   const currentDiscoveryLoaded = !enabled || loaded && loadedDiscoveryKey === discoveryKey;
-  const currentAvailableModels = currentDiscoveryLoaded ? availableModels : [];
-  const currentModel = currentDiscoveryLoaded ? model : null;
-  return { availableModels: currentAvailableModels, loaded: currentDiscoveryLoaded, model: currentModel, setModel };
+  const selectionBelongsToSession = selection.sessionId === sessionId && selection.storage === storage && selection.storageScope === storageScope;
+  const pendingOverride = selectionBelongsToSession ? selection.pendingOverride : void 0;
+  const isOverride = Boolean(pendingOverride && sessionModel && !sameModel(pendingOverride, sessionModel));
+  const sessionAuthorityReady = !sessionId || sessionHydrated && (sessionModel !== void 0 || sessionIsNew);
+  const model = currentDiscoveryLoaded && sessionAuthorityReady ? pendingOverride ?? sessionModel ?? selection.localDefault : null;
+  return {
+    availableModels: currentDiscoveryLoaded ? availableModels : [],
+    loaded: currentDiscoveryLoaded,
+    model,
+    sessionModel,
+    isOverride,
+    setModel
+  };
 }
 
 // src/front/hooks/useServerCommands.ts
-import { useEffect as useEffect6, useRef as useRef7, useState as useState8 } from "react";
+import { useEffect as useEffect6, useRef as useRef6, useState as useState8 } from "react";
 function serverCommandErrorMessage(body, fallback) {
   if (typeof body.error === "string") return body.error;
   if (body.error && typeof body.error === "object" && typeof body.error.message === "string") return body.error.message;
@@ -2725,10 +2741,10 @@ function useServerCommands({
   refreshKey = 0
 }) {
   const [stamp, setStamp] = useState8(0);
-  const registrationsRef = useRef7({ registry, identity: void 0, names: /* @__PURE__ */ new Set() });
+  const registrationsRef = useRef6({ 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);
+  const identityKeyRef = useRef6(identityKey);
   identityKeyRef.current = identityKey;
   useEffect6(() => () => {
     const registrations = registrationsRef.current;
@@ -3760,6 +3776,8 @@ function piChatReducer(state, action) {
       return hydrateFromSnapshot(state, action.snapshot, { allowSeqRewind: action.allowSeqRewind });
     case "cursor-sync":
       return syncCursor(state, action.cursor);
+    case "model-confirmed":
+      return { ...state, currentModel: action.model };
     case "event":
       return applySequencedEvent(state, action.event);
     case "optimistic-user-message":
@@ -3856,6 +3874,7 @@ function hydrateFromSnapshot(state, snapshot, options = {}) {
     ...state,
     sessionId: snapshot.sessionId,
     status: snapshot.status,
+    currentModel: snapshot.currentModel,
     turnId: snapshot.activeTurnId,
     lastSeq: snapshot.seq,
     committedMessages,
@@ -3906,6 +3925,8 @@ function applySequencedEvent(state, event) {
 }
 function reduceEvent(state, event) {
   switch (event.type) {
+    case "model-changed":
+      return { ...state, currentModel: event.currentModel };
     case "agent-start":
       return { ...state, status: "streaming", turnId: event.turnId, error: void 0, streamingPreservedTextPartKeys: void 0 };
     case "agent-end":
@@ -4638,6 +4659,9 @@ var RemotePiSession = class {
     else if (!this.suspended) this.ensureReconnectScheduled();
     try {
       const receipt = await this.postCommand("/prompt", payload, PromptReceiptSchema);
+      if (!this.disposed && payload.model) {
+        this.store.dispatch({ type: "model-confirmed", model: payload.model }, { flush: true });
+      }
       return receipt;
     } catch (error) {
       this.rollbackOptimisticMessage(payload.clientNonce);
@@ -5212,7 +5236,7 @@ function resolveBootStorage(storage) {
 }
 
 // src/front/chat/session/usePiSessions.ts
-import { useCallback as useCallback7, useEffect as useEffect8, useLayoutEffect, useMemo as useMemo4, useRef as useRef8, useState as useState10 } from "react";
+import { useCallback as useCallback7, useEffect as useEffect8, useLayoutEffect, useMemo as useMemo4, useRef as useRef7, useState as useState10 } from "react";
 var SESSION_PAGE_SIZE = 50;
 var DEFAULT_MAX_RETRIES = 60;
 var DEFAULT_RETRY_BASE_MS = 250;
@@ -5275,22 +5299,22 @@ function usePiSessions(options) {
   const [loadingMore, setLoadingMore] = useState10(false);
   const [hasMore, setHasMore] = useState10(false);
   const [error, setError] = useState10(void 0);
-  const mountedRef = useRef8(false);
-  const refreshVersionRef = useRef8(0);
-  const retryTimerRef = useRef8(void 0);
-  const sessionsRef = useRef8([]);
-  const activeSessionIdRef = useRef8(activeSessionId);
-  const hasMoreRef = useRef8(hasMore);
-  const canonicalLoadedCountRef = useRef8(0);
-  const nextCursorRef = useRef8(void 0);
-  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 committedRequestScopeRef = useRef8(requestScopeKey);
+  const mountedRef = useRef7(false);
+  const refreshVersionRef = useRef7(0);
+  const retryTimerRef = useRef7(void 0);
+  const sessionsRef = useRef7([]);
+  const activeSessionIdRef = useRef7(activeSessionId);
+  const hasMoreRef = useRef7(hasMore);
+  const canonicalLoadedCountRef = useRef7(0);
+  const nextCursorRef = useRef7(void 0);
+  const loadMoreRequestSeqRef = useRef7(0);
+  const loadMoreInFlightRef = useRef7(false);
+  const pendingCreatedRef = useRef7(/* @__PURE__ */ new Map());
+  const pendingDeletedRef = useRef7(/* @__PURE__ */ new Set());
+  const pendingCreatedScopeRef = useRef7(requestScopeKey);
+  const dataStorageScopeRef = useRef7(storageScope);
+  const loadedDataSourceRef = useRef7(dataSourceKey);
+  const committedRequestScopeRef = useRef7(requestScopeKey);
   useIsomorphicLayoutEffect(() => {
     committedRequestScopeRef.current = requestScopeKey;
   }, [requestScopeKey]);
@@ -5298,7 +5322,7 @@ function usePiSessions(options) {
     (scope) => mountedRef.current && committedRequestScopeRef.current === scope,
     []
   );
-  const remoteSessionOptionsRef = useRef8(options.remoteSessionOptions);
+  const remoteSessionOptionsRef = useRef7(options.remoteSessionOptions);
   remoteSessionOptionsRef.current = options.remoteSessionOptions;
   const remoteSessionOptionsKey = useMemo4(
     () => remoteSessionOptionsIdentity(options.remoteSessionOptions),
@@ -6149,7 +6173,7 @@ function searchPiSessions(sessions, query, options = {}) {
 
 // src/front/chat/components/PiConversationSurface.tsx
 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 { useCallback as useCallback14, useEffect as useEffect14, useLayoutEffect as useLayoutEffect2, useRef as useRef10, useState as useState15 } from "react";
 import { useStickToBottomContext as useStickToBottomContext2 } from "use-stick-to-bottom";
 
 // src/front/primitives/conversation.tsx
@@ -6497,7 +6521,7 @@ function QueuedComposerNotice({ followUps, onEdit }) {
 }
 
 // src/front/chat/components/PiTimelineMessage.tsx
-import { useCallback as useCallback13, useEffect as useEffect13, useMemo as useMemo12, useRef as useRef10, useState as useState14 } from "react";
+import { useCallback as useCallback13, useEffect as useEffect13, useMemo as useMemo12, useRef as useRef9, useState as useState14 } from "react";
 import { CheckIcon as CheckIcon2, CopyIcon as CopyIcon3 } from "lucide-react";
 import { Button as Button10 } from "@hachej/boring-ui-kit";
 
@@ -6921,7 +6945,7 @@ import {
   useContext as useContext5,
   useEffect as useEffect11,
   useMemo as useMemo9,
-  useRef as useRef9,
+  useRef as useRef8,
   useState as useState12
 } from "react";
 import { Streamdown as Streamdown2 } from "streamdown";
@@ -7013,9 +7037,9 @@ var Reasoning = memo5(
       defaultProp: void 0,
       prop: durationProp
     });
-    const hasEverStreamedRef = useRef9(isStreaming);
+    const hasEverStreamedRef = useRef8(isStreaming);
     const [hasAutoClosed, setHasAutoClosed] = useState12(false);
-    const startTimeRef = useRef9(null);
+    const startTimeRef = useRef8(null);
     useEffect11(() => {
       if (isStreaming) {
         hasEverStreamedRef.current = true;
@@ -7606,7 +7630,7 @@ function DefaultPiTimelineMessage({ message, isLast, isStreaming, showThoughts,
     ...effectiveMentionCatalog.skills.map((skill) => `skill:${skill.name}:${skill.commandName}`),
     effectiveMentionCatalog.files ? "files:enabled" : "files:disabled"
   ].join("|");
-  const mentionActivateRef = useRef10(onMentionActivate);
+  const mentionActivateRef = useRef9(onMentionActivate);
   mentionActivateRef.current = onMentionActivate;
   const activateCurrentMention = useCallback13((mention) => {
     if (mention.kind === "file") {
@@ -8078,8 +8102,8 @@ function ConversationHistoryLoadingState() {
 }
 function TranscriptHistoryLoader({ olderCount, onLoadOlder }) {
   const { scrollRef } = useStickToBottomContext2();
-  const pendingAnchor = useRef11(null);
-  const armed = useRef11(true);
+  const pendingAnchor = useRef10(null);
+  const armed = useRef10(true);
   useEffect14(() => {
     const el = scrollRef.current;
     if (!el) return;
@@ -8144,7 +8168,7 @@ import { useCallback as useCallback16, useLayoutEffect as useLayoutEffect3 } fro
 import { motion as motion2, useReducedMotion } from "motion/react";
 
 // src/front/composer/PluginUpdateStatus.tsx
-import { useEffect as useEffect15, useRef as useRef12 } from "react";
+import { useEffect as useEffect15, useRef as useRef11 } from "react";
 
 // src/front/composer/ComposerStatusBanner.tsx
 import { jsx as jsx25, jsxs as jsxs21 } from "react/jsx-runtime";
@@ -8267,7 +8291,7 @@ function PluginUpdateStatus({
   successAutoDismissMs = 1400,
   maxWidthClassName = "max-w-3xl"
 }) {
-  const onDismissRef = useRef12(onDismiss);
+  const onDismissRef = useRef11(onDismiss);
   useEffect15(() => {
     onDismissRef.current = onDismiss;
   }, [onDismiss]);
@@ -8383,7 +8407,7 @@ function PluginUpdateStatus({
 }
 
 // src/front/composer/CommandRunStatus.tsx
-import { useEffect as useEffect16, useRef as useRef13 } from "react";
+import { useEffect as useEffect16, useRef as useRef12 } from "react";
 import { Fragment as Fragment10, jsx as jsx27, jsxs as jsxs23 } from "react/jsx-runtime";
 function CommandRunStatus({
   state,
@@ -8391,7 +8415,7 @@ function CommandRunStatus({
   successAutoDismissMs = 1400,
   maxWidthClassName = "max-w-3xl"
 }) {
-  const onDismissRef = useRef13(onDismiss);
+  const onDismissRef = useRef12(onDismiss);
   useEffect16(() => {
     onDismissRef.current = onDismiss;
   }, [onDismiss]);
@@ -8463,7 +8487,7 @@ function CommandRunStatus({
 }
 
 // src/front/chatPanelComposerControls.tsx
-import { forwardRef, useEffect as useEffect17, useRef as useRef14, useState as useState16 } from "react";
+import { forwardRef, useEffect as useEffect17, useRef as useRef13, useState as useState16 } from "react";
 import { CheckIcon as CheckIcon3, ChevronDownIcon as ChevronDownIcon5 } from "lucide-react";
 import {
   Command,
@@ -8611,6 +8635,8 @@ function groupModelOptions(options) {
 var ModelSelectTrigger = forwardRef(function ModelSelectTrigger2({
   value,
   options,
+  sessionModel,
+  isOverride = false,
   disabled,
   trigger = "button",
   open = false,
@@ -8620,7 +8646,10 @@ var ModelSelectTrigger = forwardRef(function ModelSelectTrigger2({
   ...props
 }, ref) {
   const triggerLabel = modelTriggerLabel(value, options, emptyLabel);
+  const sessionTriggerLabel = sessionModel ? modelTriggerLabel(sessionModel, options) : void 0;
   const triggerDisplay = value ? `${triggerLabel} (${displayProviderLabel(value.provider)})` : triggerLabel;
+  const sessionDisplay = sessionModel && sessionTriggerLabel ? `${sessionTriggerLabel} (${displayProviderLabel(sessionModel.provider)})` : triggerDisplay;
+  const accessibleDisplay = isOverride && value ? `Current model: ${sessionDisplay}. Next-message override: ${triggerDisplay}` : `Current model: ${sessionDisplay}`;
   return /* @__PURE__ */ jsx28(
     "button",
     {
@@ -8628,9 +8657,10 @@ var ModelSelectTrigger = forwardRef(function ModelSelectTrigger2({
       type: "button",
       "data-boring-agent-part": "model-select",
       "data-boring-state": disabled ? "disabled" : void 0,
+      "data-boring-model-override": isOverride ? "true" : void 0,
       disabled,
-      "aria-label": trigger === "slash" ? `Open model picker. Current model: ${triggerDisplay}` : "Model",
-      title: trigger === "slash" ? `Open model picker. Current model: ${triggerDisplay}` : void 0,
+      "aria-label": trigger === "slash" ? `Open model picker. ${accessibleDisplay}` : "Model",
+      title: trigger === "slash" ? accessibleDisplay : void 0,
       onClick,
       className: cn(
         trigger === "slash" ? "h-8 max-w-[min(68vw,420px)] cursor-pointer overflow-hidden text-ellipsis whitespace-nowrap rounded-[var(--radius-md)] px-2 text-xs transition-colors hover:bg-muted/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-popover disabled:pointer-events-none disabled:opacity-50 motion-reduce:transition-none" : selectorTriggerClass,
@@ -8641,8 +8671,17 @@ var ModelSelectTrigger = forwardRef(function ModelSelectTrigger2({
       ...props,
       children: trigger === "slash" ? /* @__PURE__ */ jsxs24(Fragment11, { children: [
         /* @__PURE__ */ jsx28("span", { className: "text-muted-foreground", children: "Model \xB7 " }),
-        /* @__PURE__ */ jsx28("span", { className: "min-w-0 truncate text-foreground", children: triggerLabel }),
-        value ? /* @__PURE__ */ jsxs24("span", { className: "shrink-0 text-muted-foreground", children: [
+        /* @__PURE__ */ jsx28("span", { className: "min-w-0 truncate text-foreground", children: sessionTriggerLabel ?? triggerLabel }),
+        sessionModel ? /* @__PURE__ */ jsxs24("span", { className: "shrink-0 text-muted-foreground", children: [
+          " \xB7 ",
+          displayProviderLabel(sessionModel.provider)
+        ] }) : value ? /* @__PURE__ */ jsxs24("span", { className: "shrink-0 text-muted-foreground", children: [
+          " \xB7 ",
+          displayProviderLabel(value.provider)
+        ] }) : null,
+        isOverride && value ? /* @__PURE__ */ jsxs24("span", { className: "shrink-0 text-amber-600 dark:text-amber-400", children: [
+          " \xB7 Next override: ",
+          triggerLabel,
           " \xB7 ",
           displayProviderLabel(value.provider)
         ] }) : null
@@ -8669,8 +8708,8 @@ function ModelPickerMenu({
   const keyboardOptions = hideDefaultOption ? groupedOptions : [null, ...groupedOptions];
   const selectedIndex = currentKey ? Math.max(0, keyboardOptions.findIndex((option) => option && encodeModelKey(option) === currentKey)) : 0;
   const [activeIndex, setActiveIndex] = useState16(selectedIndex);
-  const activeIndexRef = useRef14(selectedIndex);
-  const menuRef = useRef14(null);
+  const activeIndexRef = useRef13(selectedIndex);
+  const menuRef = useRef13(null);
   useDismissOnOutsidePointer(menuRef, onClose);
   const setKeyboardActiveIndex = (next) => {
     const resolved = typeof next === "function" ? next(activeIndexRef.current) : next;
@@ -8797,7 +8836,7 @@ function ModelSelect({
   hideDefaultOption = false
 }) {
   const [open, setOpen] = useState16(false);
-  const previousOpenSignalRef = useRef14(openSignal);
+  const previousOpenSignalRef = useRef13(openSignal);
   useEffect17(() => {
     if (disabled) setOpen(false);
   }, [disabled]);
@@ -8858,7 +8897,7 @@ function ThinkingSelect({
   className
 }) {
   const [open, setOpen] = useState16(false);
-  const previousOpenSignalRef = useRef14(openSignal);
+  const previousOpenSignalRef = useRef13(openSignal);
   useEffect17(() => {
     if (disabled) setOpen(false);
   }, [disabled]);
@@ -8955,8 +8994,8 @@ function ThinkingPickerMenu({
 }) {
   const selectedIndex = Math.max(0, THINKING_LEVELS.indexOf(value));
   const [activeIndex, setActiveIndex] = useState16(selectedIndex);
-  const activeIndexRef = useRef14(selectedIndex);
-  const menuRef = useRef14(null);
+  const activeIndexRef = useRef13(selectedIndex);
+  const menuRef = useRef13(null);
   useDismissOnOutsidePointer(menuRef, onClose);
   const setKeyboardActiveIndex = (next) => {
     const resolved = typeof next === "function" ? next(activeIndexRef.current) : next;
@@ -9052,7 +9091,7 @@ import {
   XIcon as XIcon4
 } from "lucide-react";
 import { nanoid } from "nanoid";
-import { useCallback as useCallback15, useEffect as useEffect18, useMemo as useMemo13, useRef as useRef15, useState as useState17 } from "react";
+import { useCallback as useCallback15, useEffect as useEffect18, useMemo as useMemo13, useRef as useRef14, useState as useState17 } from "react";
 
 // src/front/primitives/prompt-input-context.ts
 import { createContext as createContext7, useContext as useContext7 } from "react";
@@ -9119,12 +9158,12 @@ var PromptInput = ({
 }) => {
   const controller = useOptionalPromptInputController();
   const usingProvider = !!controller;
-  const providerTextValueRef = useRef15("");
+  const providerTextValueRef = useRef14("");
   if (usingProvider) {
     providerTextValueRef.current = controller.textInput.value;
   }
-  const inputRef = useRef15(null);
-  const formRef = useRef15(null);
+  const inputRef = useRef14(null);
+  const formRef = useRef14(null);
   const [items, setItems] = useState17([]);
   const setFileUrlLocal = useCallback15((id, url, status, path) => {
     setItems((prev) => prev.map((f) => {
@@ -9135,7 +9174,7 @@ var PromptInput = ({
   }, []);
   const files = usingProvider ? controller.attachments.files : items;
   const [referencedSources, setReferencedSources] = useState17([]);
-  const filesRef = useRef15(files);
+  const filesRef = useRef14(files);
   useEffect18(() => {
     filesRef.current = files;
   }, [files]);
@@ -9613,7 +9652,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 { useEffect as useEffect19, useMemo as useMemo14, useRef as useRef15, useState as useState18 } from "react";
 import { Fragment as Fragment13, jsx as jsx31, jsxs as jsxs27 } from "react/jsx-runtime";
 var ALL_PLUGINS = "__all__";
 function commandGroup(cmd) {
@@ -9625,9 +9664,9 @@ function SlashCommandPicker({ query, commands, onSelect, onDismiss }) {
   const [plugin, setPlugin] = useState18(ALL_PLUGINS);
   const [searchQuery, setSearchQuery] = useState18(query);
   const [activeIdx, setActiveIdx] = useState18(0);
-  const containerRef = useRef16(null);
-  const listRef = useRef16(null);
-  const inputRef = useRef16(null);
+  const containerRef = useRef15(null);
+  const listRef = useRef15(null);
+  const inputRef = useRef15(null);
   useEffect19(() => {
     setSearchQuery(query);
   }, [query]);
@@ -9862,6 +9901,8 @@ function PiChatComposerSurface({
   onDismissSlash,
   modelPickerOpen,
   selectedModel,
+  sessionModel,
+  modelOverride,
   modelOptions,
   modelControlled,
   hideDefaultModelOption = false,
@@ -10172,6 +10213,8 @@ function PiChatComposerSurface({
               ModelSelectTrigger,
               {
                 value: selectedModel,
+                sessionModel,
+                isOverride: modelOverride,
                 options: modelOptions,
                 disabled: isStreaming || modelControlled,
                 trigger: "slash",
@@ -10215,7 +10258,7 @@ 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";
+import { useCallback as useCallback17, useEffect as useEffect20, useMemo as useMemo15, useRef as useRef16, useState as useState19, useSyncExternalStore } from "react";
 
 // src/front/chat/piChatPanelUtils.ts
 function headersContentKey(headers) {
@@ -10336,7 +10379,7 @@ function useExternalRemotePiSession({
   enabled = true
 }) {
   const [session, setSession] = useState19();
-  const remoteSessionOptionsRef = useRef17(remoteSessionOptions);
+  const remoteSessionOptionsRef = useRef16(remoteSessionOptions);
   remoteSessionOptionsRef.current = remoteSessionOptions;
   const requestHeadersKey = headersContentKey(requestHeaders);
   const stableRequestHeaders = useMemo15(
@@ -10489,11 +10532,11 @@ function PiChatPanel({
 }) {
   const externalSessionId = sessionId?.trim() || void 0;
   const showSessionSidebar = showSessions ?? externalSessionId === void 0;
-  const onDataRef = useRef18(onData);
+  const onDataRef = useRef17(onData);
   onDataRef.current = onData;
-  const onTurnCompleteRef = useRef18(onTurnComplete);
+  const onTurnCompleteRef = useRef17(onTurnComplete);
   onTurnCompleteRef.current = onTurnComplete;
-  const sessionListRefreshRef = useRef18(void 0);
+  const sessionListRefreshRef = useRef17(void 0);
   const requestHeadersKey = useMemo16(() => headersContentKey(requestHeaders), [requestHeaders]);
   const normalizedRequestHeaders = useMemo16(() => normalizedHeadersFromContentKey(requestHeadersKey), [requestHeadersKey]);
   const remoteSessionOptionsWithEvents = useMemo16(() => ({
@@ -10557,13 +10600,21 @@ function PiChatPanel({
     agentTypeId,
     apiBaseUrl,
     defaultModel,
+    sessionId: activeSessionId,
+    sessionHydrated: selectedChatState?.hydrated ?? false,
+    sessionIsNew: Boolean(
+      selectedChatState?.hydrated && selectedChatState.history.messageCount === 0 && selectedChatState.committedMessages.length === 0 && selectedChatState.queue.followUps.length === 0 && Object.keys(selectedChatState.optimisticOutbox).length === 0 && !selectedChatState.streamingMessage
+    ),
+    sessionModel: selectedChatState?.currentModel,
     fetch: fetch2,
     requestHeaders: normalizedRequestHeaders,
     storage,
     storageScope,
     enabled: modelDiscoveryEnabled
   });
+  const sessionModel = selectedChatState?.currentModel;
   const selectedModel = model === void 0 ? modelDiscovery.model : model;
+  const modelOverride = model === void 0 ? modelDiscovery.isOverride : Boolean(model && sessionModel && (model.provider !== sessionModel.provider || model.id !== sessionModel.id));
   const modelOptions = useMemo16(
     () => modelOptionsForSelection(availableModels ?? modelDiscovery.availableModels, selectedModel),
     [availableModels, modelDiscovery.availableModels, selectedModel]
@@ -10602,13 +10653,13 @@ function PiChatPanel({
   const [modelPickerOpen, setModelPickerOpen] = useState20(false);
   const [thinkingPickerOpen, setThinkingPickerOpen] = useState20(false);
   const [draft, setDraft] = useState20(() => initialDraft ?? "");
-  const draftRef = useRef18(draft);
+  const draftRef = useRef17(draft);
   draftRef.current = draft;
-  const initialDraftGuard = useRef18(new InitialDraftAutoSubmitGuard());
-  const pendingAutoSubmitSettleRef = useRef18(void 0);
-  const acceptedAutoSubmitSettleRef = useRef18(void 0);
-  const resetInProgressRef = useRef18(false);
-  const autoCreateInFlightRef = useRef18(false);
+  const initialDraftGuard = useRef17(new InitialDraftAutoSubmitGuard());
+  const pendingAutoSubmitSettleRef = useRef17(void 0);
+  const acceptedAutoSubmitSettleRef = useRef17(void 0);
+  const resetInProgressRef = useRef17(false);
+  const autoCreateInFlightRef = useRef17(false);
   const settlePendingAutoSubmit = useCallback18((sessionId2) => {
     const pendingSessionId = pendingAutoSubmitSettleRef.current;
     if (!pendingSessionId || sessionId2 && pendingSessionId !== sessionId2) return false;
@@ -10617,19 +10668,19 @@ function PiChatPanel({
     onAutoSubmitInitialDraftSettled?.();
     return true;
   }, [onAutoSubmitInitialDraftSettled]);
-  const prevStatusRef = useRef18("idle");
-  const statusRef = useRef18("idle");
-  const scrollToBottomRef = useRef18(() => {
+  const prevStatusRef = useRef17("idle");
+  const statusRef = useRef17("idle");
+  const scrollToBottomRef = useRef17(() => {
   });
-  const textareaRef = useRef18(null);
+  const textareaRef = useRef17(null);
   const [localNotices, setLocalNotices] = useState20([]);
   const [dismissedNoticeIds, setDismissedNoticeIds] = useState20(() => /* @__PURE__ */ new Set());
   const [pluginUpdateState, setPluginUpdateState] = useState20(null);
   const [commandNotifyState, setCommandNotifyState] = useState20(null);
-  const commandRunIdRef = useRef18(0);
+  const commandRunIdRef = useRef17(0);
   const [serverSkillsRefreshKey, setServerSkillsRefreshKey] = useState20(0);
   const [localSubmittedSessionId, setLocalSubmittedSessionId] = useState20();
-  const localSubmittedSessionRef = useRef18(void 0);
+  const localSubmittedSessionRef = useRef17(void 0);
   const { attachmentNotice, setAttachmentNotice } = useAttachmentNotice();
   const composerContributions = useComposerContributions();
   const contributedCommands = useMemo16(
@@ -11261,6 +11312,8 @@ function PiChatPanel({
       onDismissSlash: dismissSlash,
       modelPickerOpen,
       selectedModel,
+      sessionModel,
+      modelOverride,
       modelOptions,
       modelControlled: model !== void 0,
       hideDefaultModelOption,