@abot-ai/runtime 1.7.0 → 1.8.0

package/dist/src/web-ui/app/components/runtime-setup/optional-steps.js

@@ -2,6 +2,7 @@ import { createEmbeddingSetupStep } from "./embedding.js";
 import { createSetupPluginStep } from "./plugins.js";
 import { createSystemHostConnectionManager } from "../system-host/manager.js";
 import { hostSetupIsReady } from "../system-host/rendering.js";
+import { isNativeWindowsLocalAccess } from "../system-host/native-windows-access.js";
 
 /** Optional setup steps retain their owning services and never apply the Runtime. */
 export function createSetupOptionalSteps({
@@ -57,9 +58,10 @@ export function createSetupOptionalSteps({
       })
     : null;
   const readyStep = computer ? 5 : 4;
-  function hasFreshComputerReadiness() {
+  function hasFreshComputerSetup() {
     if (!computer) return false;
     if (computer.state.busy || computer.state.statusUnavailable) return false;
+    if (isNativeWindowsLocalAccess(computer.state.snapshot)) return true;
     return hostSetupIsReady(computer.state.snapshot);
   }
   function projection(step) {
@@ -71,7 +73,8 @@ export function createSetupOptionalSteps({
       plugins: plugins.state.snapshot,
       hasComputerStep: Boolean(computer),
       readyStep,
-      computer: hasFreshComputerReadiness() ? computer.state.snapshot : null,
+      computer: hasFreshComputerSetup() ? computer.state.snapshot : null,
+      nativeWindowsAccess: hasFreshComputerSetup() && isNativeWindowsLocalAccess(computer.state.snapshot),
     };
     if (step === 2)
       return {
@@ -90,7 +93,7 @@ export function createSetupOptionalSteps({
       return {
         ...common,
         content: `<div data-onboarding-computer>${computer.markup()}</div>`,
-        canContinue: hasFreshComputerReadiness(),
+        canContinue: hasFreshComputerSetup(),
       };
     return common;
   }
@@ -111,7 +114,7 @@ export function createSetupOptionalSteps({
   }
   function canContinueComputer(step) {
     if (step !== 4) return false;
-    return hasFreshComputerReadiness();
+    return hasFreshComputerSetup();
   }
   return {
     embedding,

package/dist/src/web-ui/app/components/runtime-setup/plugins.js

@@ -1,3 +1,4 @@
+import { renderPluginPlatformNotice } from "../plugins/compatibility.js";
 import { escapeAttribute, escapeHtml } from "../../lib/text-format.js";
 
 function blockReason(plugin, capability) {
@@ -33,6 +34,7 @@ function renderPluginCard(plugin, busy) {
   return `<li class="runtime-plugin-card">
     ${checkbox(plugin, null, busy)}
     <p class="runtime-plugin-summary" title="${escapeAttribute(plugin.description || "")}">${escapeHtml(plugin.description || "Installed Runtime plugin.")}</p>
+    ${renderPluginPlatformNotice(plugin.compatibility)}
     <div class="runtime-plugin-tools-heading"><span>Tools</span><span>${plugin.selectedCapabilityCount} of ${capabilities.length} selected</span></div>
     <ul class="runtime-plugin-capabilities" aria-label="${escapeAttribute(`Tools in ${plugin.id}`)}">${capabilities.map((capability) => `<li>${checkbox(plugin, capability, busy)}</li>`).join("")}</ul>
   </li>`;
@@ -144,7 +146,7 @@ export function createSetupPluginStep({
       state.snapshot?.selection?.enabled === false ||
       state.snapshot?.selection?.deny?.includes("*");
     return `<div class="runtime-setup-plugins">
-      <p class="runtime-setup-feedback">All installed plugins start enabled in a new setup. Turn off anything you do not need.</p>
+      <p class="runtime-setup-feedback">All installed plugins start selected in a new setup. Host compatibility determines which plugins can load. Turn off anything you do not need.</p>
       ${globalBlocked ? '<p class="runtime-setup-feedback">An existing global policy blocks plugins. Your saved policy is preserved.</p>' : ""}
       ${state.error ? `<p class="runtime-setup-feedback error" role="alert">${escapeHtml(state.error)}</p><button type="button" class="runtime-setup-inline-action" data-runtime-setup-action="plugins-reload">Reload selection</button>` : state.message ? `<p class="runtime-setup-feedback" role="status">${escapeHtml(state.message)}</p>` : ""}
       ${state.busy ? '<p class="runtime-setup-feedback" role="status">Saving or loading plugin selection…</p>' : ""}

package/dist/src/web-ui/app/components/runtime-setup/rendering.js

@@ -28,7 +28,7 @@ function readyMarkup(state, optional) {
     <div><dt>Model</dt><dd>${escapeHtml(state.modelId)}</dd></div>
     <div><dt>Context window</dt><dd>${escapeHtml(formatContextWindowTokens(state.contextWindowTokens))}</dd></div>
     <div><dt>Embedding</dt><dd>${escapeHtml(optional.memory?.enabled ? optional.memory.model || "Configured" : "Set up later")}</dd></div>
-    <div><dt>Plugins</dt><dd>${selectedPlugins} enabled</dd></div>
+    <div><dt>Plugins</dt><dd>${selectedPlugins} selected</dd></div>
   </dl></div>`;
 }
 
@@ -79,7 +79,7 @@ function footerMarkup(state, availability, optional) {
   if (state.step === 3)
     return `<button type="button" class="runtime-setup-secondary" data-runtime-setup-action="back" ${disabled}>Back</button><button type="submit" class="runtime-setup-action" ${busy || !optional.canContinue ? "disabled" : ""}>Continue</button>`;
   if (state.step === 4 && optional.hasComputerStep)
-    return `<button type="button" class="runtime-setup-secondary" data-runtime-setup-action="back">Back</button><div class="runtime-setup-footer-actions"><button type="button" class="runtime-setup-secondary" data-runtime-setup-action="skip-computer">Skip for now</button><button type="submit" class="runtime-setup-action" ${!optional.canContinue ? "disabled" : ""}>Continue</button></div>`;
+    return `<button type="button" class="runtime-setup-secondary" data-runtime-setup-action="back">Back</button><div class="runtime-setup-footer-actions">${optional.nativeWindowsAccess ? "" : '<button type="button" class="runtime-setup-secondary" data-runtime-setup-action="skip-computer">Skip for now</button>'}<button type="submit" class="runtime-setup-action" ${!optional.canContinue ? "disabled" : ""}>Continue</button></div>`;
   const secondary =
     state.step === 1 && canEditSetupConnection(state)
       ? `<button type="button" class="runtime-setup-secondary" data-runtime-setup-action="back" ${disabled}>Back</button>`
@@ -112,11 +112,13 @@ export function renderRuntimeSetup(state, availability, optional = {}) {
   const steps = [...STEP_LABELS];
   if (optional.hasComputerStep) {
     steps.splice(4, 0, "Computer");
-    titles.splice(4, 0, "Set up computer access");
+    titles.splice(4, 0, optional.nativeWindowsAccess ? "Your Windows computer" : "Set up computer access");
     descriptions.splice(
       4,
       0,
-      "Optional. Use applications on your computer, or set up access later in Settings.",
+      optional.nativeWindowsAccess
+        ? ""
+        : "Optional. Use applications on your computer, or set up access later in Settings.",
     );
   }
   const content =

package/dist/src/web-ui/app/components/runtime-setup-guide.d.ts

@@ -73,6 +73,7 @@ export interface RuntimeSetupGuideDependencies {
   readonly loadHostConnection?: () => Promise<Record<string, unknown>>;
   readonly connectLocalHost?: () => Promise<Record<string, unknown>>;
   readonly createHostPairing?: () => Promise<Record<string, unknown>>;
+  readonly requestHostStoreConnection?: () => Promise<Record<string, unknown>>;
   readonly requestHostPermissions?: (input: Record<string, unknown>) => Promise<Record<string, unknown>>;
   readonly downloadHostSetup?: (
     platform: "windows" | "macos" | "linux",

package/dist/src/web-ui/app/components/schedules/form.js

@@ -1,3 +1,4 @@
+import { renderReasoningModeField, syncReasoningModeField, retainedReasoningMode } from "../../lib/reasoning-controls.js";
 import { escapeHtml } from "../../lib/text-format.js";
 import { SCHEDULE_WEEKDAYS } from "../../lib/schedule-presentation.js";
 import { scheduleErrorMessage } from "../../lib/schedule-errors.js";
@@ -88,12 +89,7 @@ export function createScheduleForm({
     <label>Task prompt<textarea name="prompt" rows="5" required dir="auto" placeholder="What should ABot do when this schedule runs?">${escapeHtml(values.prompt || "")}</textarea></label>
     <div class="schedule-form-grid">${scheduleFields(values)}</div>
     <div class="schedule-form-grid"><label>Model<select name="modelProfileId" required><option value="">Choose a model</option>${options(modelOptions, values.modelProfileId)}</select></label>
-    <label>Mode<select name="agentMode">${options(
-      modes
-        .filter((mode) => mode !== "auto")
-        .map((mode) => ({ value: mode, label: mode })),
-      values.agentMode || "reasoning",
-    )}</select></label></div>
+    ${renderReasoningModeField(values.agentMode || "reasoning", models.find((model) => model.id === values.modelProfileId), modes.filter((mode) => mode !== "auto"))}</div>
     <label>Tool access<select name="toolPermissionMode">${options(
       [
         { value: "full_access", label: "Full" },
@@ -116,6 +112,12 @@ export function createScheduleForm({
     }
   }
 
+  const readInput = () => {
+    const data = new FormData(form);
+    data.set("agentMode", retainedReasoningMode(form, values.agentMode || "reasoning"));
+    return scheduleFormInput(data, job?.schedule);
+  };
+  fields.namedItem("modelProfileId").addEventListener("change", () => syncReasoningModeField(form, models, modes.filter((mode) => mode !== "auto")));
   let initialInput;
   form.querySelector("[data-cancel]").addEventListener("click", onCancel);
   fields.namedItem("kind").addEventListener("change", syncKind);
@@ -125,7 +127,7 @@ export function createScheduleForm({
     submit.disabled = true;
     feedback.hidden = true;
     try {
-      const currentInput = scheduleFormInput(new FormData(form), job?.schedule);
+      const currentInput = readInput();
       const input = job
         ? scheduleUpdateInput(currentInput, initialInput)
         : currentInput;
@@ -137,7 +139,7 @@ export function createScheduleForm({
     }
   });
   syncKind();
-  if (job) initialInput = scheduleFormInput(new FormData(form), job.schedule);
+  if (job) initialInput = readInput();
   const initialFields = JSON.stringify([...new FormData(form)]);
   function trackScheduleDraft() {
     form.dataset.dirty = String(

package/dist/src/web-ui/app/components/schedules/workspace.js

@@ -48,12 +48,31 @@ export function createSchedulesWorkspace({
   });
 
   function prepareLeave() {
-    if (!actions.snapshot().editor) return true;
-    if (!canDiscardScheduleDraft()) return false;
-    actions.cancelEdit();
+    const prepared = prepareEnvironmentChange();
+    if (!prepared) return false;
+    prepared();
     return true;
   }
 
+  function prepareEnvironmentChange() {
+    const editor = actions.snapshot().editor;
+    if (editor && !canDiscardScheduleDraft()) return null;
+    const form = details.querySelector(".schedule-editor");
+    const fingerprint = scheduleDraftFingerprint(form);
+    const commit = () => { if (editor) actions.cancelEdit(); };
+    commit.canCommit = () => {
+      if (actions.snapshot().mutation) return false;
+      if (actions.snapshot().editor !== editor) return false;
+      if (details.querySelector(".schedule-editor") !== form) return false;
+      return scheduleDraftFingerprint(form) === fingerprint;
+    };
+    return commit;
+  }
+
+  function scheduleDraftFingerprint(form) {
+    return form ? JSON.stringify([...new FormData(form)]) : "";
+  }
+
   function canDiscardScheduleDraft() {
     const form = details.querySelector(".schedule-editor");
     if (form?.dataset.dirty !== "true") return true;
@@ -156,5 +175,5 @@ export function createSchedulesWorkspace({
     editorIdentity = null;
     renderScheduleDetails({ root: details, snapshot, actions });
   }
-  return { render, prepareLeave };
+  return { render, prepareLeave, prepareEnvironmentChange };
 }

package/dist/src/web-ui/app/components/session-sidebar-sections.js

@@ -7,7 +7,7 @@ export function renderSessionSidebarSections({
   if (showingArchived) {
     const notice = document.createElement("p");
     notice.className = "session-archive-notice";
-    notice.textContent = "Archived in this browser and environment. Restore a conversation from its menu.";
+    notice.textContent = "Archived in this ABot installation and environment. Restore a conversation from its menu.";
     root.appendChild(notice);
   }
   const pinned = sessions.filter((session) => isPinned(session.id));
@@ -35,7 +35,7 @@ export function renderSessionSidebarSections({
   const toggle = document.createElement("button");
   toggle.type = "button";
   toggle.className = "session-archive-toggle";
-  toggle.title = "Conversations archived in this browser and environment";
+  toggle.title = "Conversations archived in this ABot installation and environment";
   toggle.textContent = showingArchived ? "Back to conversations" : `Archived (${archivedCount})`;
   toggle.setAttribute("aria-pressed", String(showingArchived));
   toggle.addEventListener("click", onToggleArchived);

package/dist/src/web-ui/app/components/spark-chat/handoff-actions.js

@@ -12,7 +12,7 @@ function sameSourceMessage(current, source) {
 
 export function createSparkHandoffActions({
   getScope, getMessages, client, captureNavigation, onOpened, onChange = () => {},
-  notify, documentRoot = document,
+  notify, documentRoot = document, canOpen = () => true,
 }) {
   const pending = new Set();
   function createNode(message) {
@@ -25,7 +25,12 @@ export function createSparkHandoffActions({
     button.type = "button";
     button.className = "spark-handoff-button";
     button.textContent = "Open a session about this";
-    button.disabled = !message.sparkHandoffAvailable || pending.has(identity);
+    function canStartHandoff() {
+      if (!canOpen()) return false;
+      if (!message.sparkHandoffAvailable) return false;
+      return !pending.has(identity);
+    }
+    button.disabled = !canStartHandoff();
     row.appendChild(button);
     if (!message.sparkHandoffAvailable) {
       const explanation = documentRoot.createElement("p");
@@ -39,7 +44,8 @@ export function createSparkHandoffActions({
       return getMessages().some((candidate) => sameSourceMessage(candidate, message));
     }
     async function open() {
-      if (button.disabled || pending.has(identity) || !sourceIsCurrent()) return;
+      if (!canStartHandoff()) return;
+      if (!sourceIsCurrent()) return;
       const navigate = captureNavigation();
       pending.add(identity); button.disabled = true;
       try {

package/dist/src/web-ui/app/components/spark-chat/placement.js

@@ -1,14 +1,11 @@
 import { createSparkPlacementMotion } from "./motion.js";
+import { workspaceStorage } from "../../services/workspace-state.js";
 
 const storageKey = "abot.spark.launcher.position.v1";
 const margin = 12;
 const dragThreshold = 5;
 const positionGrid = 16;
 
-function readBrowserStorage(windowRoot) {
-  try { return windowRoot.localStorage; } catch { return null; }
-}
-
 function readPosition(storage) {
   try {
     const value = JSON.parse(storage?.getItem(storageKey) ?? "null");
@@ -31,9 +28,9 @@ function hasMovedPastDragThreshold(pointer, event) {
   return Math.hypot(event.clientX - pointer.x, event.clientY - pointer.y) >= dragThreshold;
 }
 
-/** Browser-only launcher placement; conversation and environment state stay untouched. */
+/** Installation-owned launcher placement, clamped to the current screen. */
 export function createSparkChatPlacement({ root, launcher, panel, notice, dockAnchor, storage, windowRoot = window }) {
-  const positionStorage = storage === undefined ? readBrowserStorage(windowRoot) : storage;
+  const positionStorage = storage === undefined ? workspaceStorage() : storage;
   let position = readPosition(positionStorage);
   let pointer = null;
   let suppressClick = false;
@@ -45,7 +42,7 @@ export function createSparkChatPlacement({ root, launcher, panel, notice, dockAn
     try {
       if (position) positionStorage?.setItem(storageKey, JSON.stringify(position));
       else positionStorage?.removeItem(storageKey);
-    } catch { /* Placement remains usable when browser storage is unavailable. */ }
+    } catch { /* The shared storage owner reports persistence failures. */ }
   }
 
   function placePopup(node, anchor) {

package/dist/src/web-ui/app/components/spark-chat/settings.js

@@ -1,3 +1,4 @@
+import { canChooseReasoning, reasoningModeOptions } from "../../lib/reasoning-controls.js";
 import { supportsFullPlus } from "../../lib/tool-permission-mode.js";
 
 export function createSparkChatSettings({ root, onSave, onClear, onOpen, onResetPosition, onOpenModelSettings, getAgentMode, onAgentModeChange, getWebConfig, documentRoot = document }) {
@@ -29,11 +30,12 @@ export function createSparkChatSettings({ root, onSave, onClear, onOpen, onReset
   const feedback = card.querySelector("[data-spark-settings-feedback]");
   let saved = "ask";
   let ready = false;
+  let reasoningEnabled = false;
   let busy = false;
   let environmentId;
   function controls() {
     select.disabled = busy || !ready;
-    agentModeSelect.disabled = !ready;
+    agentModeSelect.disabled = !ready || !reasoningEnabled;
     save.disabled = busy || !ready || select.value === saved;
     clear.disabled = busy || !ready;
   }
@@ -52,7 +54,7 @@ export function createSparkChatSettings({ root, onSave, onClear, onOpen, onReset
     finally { if (environment === environmentId) { busy = false; controls(); } }
   }
   select.addEventListener("change", controls);
-  agentModeSelect.addEventListener("change", () => onAgentModeChange(agentModeSelect.value));
+  agentModeSelect.addEventListener("change", () => { if (reasoningEnabled) onAgentModeChange(agentModeSelect.value); });
   card.querySelector("form").addEventListener("submit", (event) => {
     event.preventDefault();
     if (save.disabled) return;
@@ -73,7 +75,9 @@ export function createSparkChatSettings({ root, onSave, onClear, onOpen, onReset
         environmentId = nextEnvironmentId; busy = false; ready = false; feedback.textContent = "";
         select.value = configuration?.toolPermissionMode || "ask";
       }
-      agentModeSelect.value = getAgentMode();
+      reasoningEnabled = canChooseReasoning(configuration);
+      agentModeSelect.innerHTML = reasoningModeOptions(getAgentMode(), reasoningEnabled);
+      agentModeSelect.title = reasoningEnabled ? "Reasoning depth" : "Enable reasoning controls for this model in Models.";
       const next = configuration?.toolPermissionMode || "ask";
       if (!ready || select.value === saved || busy) select.value = next;
       saved = next; ready = Boolean(configuration?.sessionId);

package/dist/src/web-ui/app/components/system-host/macos-permissions.js

@@ -6,6 +6,7 @@ function hasManagedMacPermissionRuntime(version) {
 }
 
 export function macCompanionPermissionPath(snapshot) {
+  if (snapshot?.collectionSource?.mode === "native") return "";
   if (!snapshot?.paired) return "";
   if (snapshot.identity?.os !== "macos") return "";
   if (!hasManagedMacPermissionRuntime(snapshot.companion?.installedVersion))
@@ -20,6 +21,7 @@ export function macCompanionPermissionPath(snapshot) {
 
 /** The managed companion keeps its macOS permission subject at one private path. */
 export function renderMacPermissionGuide(snapshot) {
+  if (snapshot?.collectionSource?.mode === "native") return "";
   if (!snapshot?.paired) return "";
   if (snapshot.identity?.os !== "macos") return "";
   const version = snapshot.companion?.installedVersion;

package/dist/src/web-ui/app/components/system-host/native-windows-access.js

@@ -0,0 +1,50 @@
+import { renderConnectionCard } from "./connection-card.js";
+
+/** The server's native Windows facts identify local access, independently of tool readiness. */
+export function isNativeWindowsLocalAccess(snapshot) {
+  if (snapshot?.collectionSource?.mode !== "native") return false;
+  return snapshot.collectionSource.platform === "windows";
+}
+
+export function shouldRenderNativeWindowsAccess(input) {
+  if (!input.supported) return false;
+  return isNativeWindowsLocalAccess(input.snapshot);
+}
+
+function nativeWindowsAccessPresentation(input) {
+  if (input.statusUnavailable) return {
+    title: "Check Windows access", status: "Status unavailable",
+    description: "The current local access status could not be checked. Refresh to try again.",
+  };
+  if (input.busy) return {
+    title: "Checking Windows access…", status: "Checking",
+    description: "Waiting for the current local access status…",
+  };
+  if (input.snapshot?.readiness?.directAccessReady === false) return {
+    title: "Check local Windows access", status: "Check needed",
+    description: "ABot runs directly on Windows, but direct commands could not be verified. Refresh to check again. Companion pairing is not required for local tools.",
+  };
+  return {
+    title: "Windows access is local", status: "Local",
+    description: "ABot runs directly on this Windows computer. Local tools do not need Companion pairing. Compatible plugins and your permission settings determine which actions are available.",
+  };
+}
+
+function canCompactNativeWindowsAccess(input) {
+  if (!input.compact) return false;
+  if (input.statusUnavailable || input.busy) return false;
+  if (input.error || input.message) return false;
+  return input.snapshot?.readiness?.directAccessReady !== false;
+}
+
+export function renderNativeWindowsAccess(input) {
+  const presentation = nativeWindowsAccessPresentation(input);
+  const compact = canCompactNativeWindowsAccess(input);
+  return renderConnectionCard({
+    ...presentation, ready: false, compact, disabled: input.busy,
+    actions: '<button type="button" class="system-host-card-secondary" data-system-host-refresh' +
+      (input.busy ? " disabled" : "") + '>Refresh status</button>',
+    error: input.error, message: input.message,
+    attributes: "data-system-host-native-windows",
+  });
+}

package/dist/src/web-ui/app/components/system-host/rendering.js

@@ -1,6 +1,7 @@
 import { escapeHtml } from "../../lib/text-format.js";
 import { renderWindowsStoreSetup, windowsStorePanelIsAvailable } from "./windows-store-setup.js";
 import { renderConnectionCard, renderComputerMetadata } from "./connection-card.js";
+import { shouldRenderNativeWindowsAccess, renderNativeWindowsAccess } from "./native-windows-access.js";
 import { macPermissionSummary, renderMacPermissionPreparation } from "./macos-permission-rendering.js";
 import {
   renderMacSetupAction,
@@ -123,6 +124,8 @@ function canRenderCompactConnection(input) {
   return true;
 }
 export function renderSystemHostConnection(input) {
+  if (shouldRenderNativeWindowsAccess(input))
+    return renderNativeWindowsAccess(input);
   if (input.supported && windowsStorePanelIsAvailable(input.snapshot)) {
     return renderWindowsStoreSetup({
       snapshot: input.snapshot, invitation: input.windowsStoreInvitation,

package/dist/src/web-ui/app/components/workspace-storage-notice.js

@@ -0,0 +1,37 @@
+export async function acknowledgeWorkspaceStorage(storage, documentRoot = document) {
+  if (storage.snapshot().introductionSeen) return;
+  const dialog = documentRoot.createElement("dialog");
+  dialog.className = "workspace-storage-notice";
+  dialog.innerHTML = `<h2>Your workspace settings stay with ABot</h2>
+    <p>Settings and queued messages are now saved with this ABot installation, across browsers and app restarts.</p>
+    <p>This is a one-time fresh start. Previous browser-only pins, archives, model choices, memory review markers and queued messages are not imported.</p>
+    <p>Your conversations, memories, configuration and read status are kept. Tool permissions start in <strong>Ask</strong>; you can change them in the composer.</p>
+    <p role="alert" hidden></p><button type="button" class="primary">Continue</button>`;
+  documentRoot.body.append(dialog);
+  dialog.addEventListener("cancel", (event) => event.preventDefault());
+  dialog.showModal();
+  await new Promise((resolve) => {
+    const button = dialog.querySelector("button");
+    button.addEventListener("click", async () => {
+      button.disabled = true;
+      try { await storage.execute({ kind: "introduction" }); dialog.close(); dialog.remove(); resolve(); }
+      catch (error) {
+        const notice = dialog.querySelector('[role="alert"]');
+        notice.textContent = `${error.message} Reload to try again.`;
+        notice.hidden = false;
+      }
+    });
+  });
+}
+
+export function showWorkspaceStorageFailure(error, documentRoot = document) {
+  let notice = documentRoot.querySelector("[data-workspace-storage-error]");
+  if (!notice) {
+    notice = documentRoot.createElement("div");
+    notice.dataset.workspaceStorageError = "";
+    notice.setAttribute("role", "alert");
+    notice.className = "workspace-storage-failure";
+    documentRoot.body.append(notice);
+  }
+  notice.textContent = `${error.message} Changes are not confirmed. Reload before sending more messages.`;
+}

package/dist/src/web-ui/app/configuration-environment-refresh.js

@@ -6,6 +6,7 @@ export function createAppliedEnvironmentProjection({
   dom,
   selection,
   loadWebConfig,
+  changeEnvironment,
 }) {
   let generation = 0;
   let pending = null;
@@ -23,11 +24,10 @@ export function createAppliedEnvironmentProjection({
     );
   }
 
-  function restoreProjection(config, selected) {
+  function applyProjection(config, selected) {
     state.config = config;
     selection.renderEnvironmentOptions();
     dom.environmentSelect.value = selected;
-    selection.renderAgentPicker();
   }
 
   function preferredEnvironmentId(options, selected, defaultId) {
@@ -36,45 +36,36 @@ export function createAppliedEnvironmentProjection({
     return options[0]?.value || "";
   }
 
-  function changeProjectedEnvironment(
-    next,
-    previousConfig,
-    previousEnvironment,
-  ) {
-    const ChangeEvent = dom.environmentSelect.ownerDocument.defaultView.Event;
-    dom.environmentSelect.dispatchEvent(new ChangeEvent("change"));
-    if (dom.environmentSelect.value === next) return true;
-    restoreProjection(previousConfig, previousEnvironment);
-    // Existing listeners also own composer/environment presentation after a refusal.
-    dom.environmentSelect.dispatchEvent(new ChangeEvent("change"));
-    return false;
-  }
-
-  function flush() {
+  async function flush() {
     if (!pending) return "unchanged";
-    const previousConfig = state.config;
     const previousEnvironment = selection.selectedEnvironmentId();
-    state.config = pending;
-    selection.renderEnvironmentOptions();
+    const projected = pending;
+    const revision = generation;
     const next = preferredEnvironmentId(
-      selection.environmentOptions(),
+      selection.configuredEnvironmentOptions(projected),
       previousEnvironment,
-      textOf(pending.defaultEnvironmentId).trim(),
+      textOf(projected.defaultEnvironmentId).trim(),
     );
-    if (!next) {
-      restoreProjection(previousConfig, previousEnvironment);
-      return "blocked";
-    }
-    dom.environmentSelect.value = next;
-    const unchanged = next === previousEnvironment;
-    if (unchanged) {
+    if (!next) return "blocked";
+    if (next === previousEnvironment) {
+      applyProjection(projected, next);
       pending = null;
       selection.renderAgentPicker();
       return "unchanged";
     }
-    if (!changeProjectedEnvironment(next, previousConfig, previousEnvironment))
-      return "blocked";
-    pending = null;
+    // Keep the old catalog and selected option until draft preparation commits.
+    const commitEnvironmentOptions = () => {
+      applyProjection(projected, next);
+      pending = null;
+    };
+    commitEnvironmentOptions.canCommit = () => {
+      if (revision !== generation) return false;
+      return pending === projected;
+    };
+    let accepted = false;
+    try { accepted = await changeEnvironment(next, { commitEnvironmentOptions }); }
+    catch { /* The old catalog remains active when draft persistence fails. */ }
+    if (!accepted) return "blocked";
     selection.renderAgentPicker();
     return "changed";
   }
@@ -87,6 +78,7 @@ export function createConfigurationFeature({
   state,
   selection,
   onConfigurationApplied,
+  changeEnvironment,
   ...options
 }) {
   const projection = createAppliedEnvironmentProjection({
@@ -94,6 +86,7 @@ export function createConfigurationFeature({
     dom: options.dom,
     selection,
     loadWebConfig: () => options.runtimeClient.loadWebConfig(),
+    changeEnvironment,
   });
   const workspace = createWorkspaceFeature({
     ...options,
@@ -101,13 +94,13 @@ export function createConfigurationFeature({
       const currentStillConfigured = await projection.prepare();
       if (currentStillConfigured) await onConfigurationApplied();
     },
-    onConfigurationSettled: () => projection.flush() !== "blocked",
+    onConfigurationSettled: async () => await projection.flush() !== "blocked",
   });
   return {
     ...workspace,
     async reloadAppliedEnvironmentModels() {
       await projection.prepare();
-      const result = projection.flush();
+      const result = await projection.flush();
       if (result === "blocked") return false;
       if (result === "changed") return true;
       const refreshed = await workspace.load();

package/dist/src/web-ui/app/configuration-feature.js

@@ -278,7 +278,15 @@ export function createConfigurationFeature({
           "Finish or cancel model setup before leaving configuration.";
         return null;
       }
-      return prepareDiscardChanges(...args);
+      const prepared = prepareDiscardChanges(...args);
+      if (typeof prepared !== "function") return prepared;
+      const commit = () => prepared();
+      commit.canCommit = () => {
+        if (pluginManager.hasConfigurationDraft()) return false;
+        if (modelSetup.isOpen()) return false;
+        return prepared.canCommit?.() !== false;
+      };
+      return commit;
     },
   };
 }