@abot-ai/runtime 1.3.1 → 1.5.0

package/dist/src/web-ui/app/components/config-workspace/dashboard-rendering.js

@@ -1,3 +1,4 @@
+import { configRepairGuidance } from "./raw-config-repair.js";
 import { escapeAttribute, escapeHtml } from "../../lib/text-format.js";
 
 export function createConfigDashboardRendering({
@@ -78,6 +79,7 @@ export function createConfigDashboardRendering({
             >Save file</button>
           </div>
         </div>
+        <p id="configRawRepairGuidance" class="error-text" ${configRepairGuidance(file) ? "" : "hidden"}>${escapeHtml(configRepairGuidance(file))}</p>
         <textarea
           id="configRawEditor"
           class="config-view"
@@ -115,32 +117,16 @@ export function createConfigDashboardRendering({
     `;
   }
 
-  function renderCategoryTab(category, label) {
-    const active = state.activeCategory === category;
-    return `
-      <button
-        id="configCategory${category[0].toUpperCase()}${category.slice(1)}"
-        class="config-category-tab ${active ? "active" : ""}"
-        type="button"
-        role="tab"
-        data-config-action="select-category"
-        data-config-category="${escapeAttribute(category)}"
-        aria-controls="config${category[0].toUpperCase()}${category.slice(1)}Panel"
-        aria-selected="${active ? "true" : "false"}"
-        tabindex="${active ? "0" : "-1"}"
-      >${escapeHtml(label)}</button>
-    `;
-  }
-
   function renderCategoryPanel(category, content) {
     const capitalized = `${category[0].toUpperCase()}${category.slice(1)}`;
+    const label = category === "operations" ? "System" : capitalized;
     const active = state.activeCategory === category;
     return `
       <section
         id="config${capitalized}Panel"
         class="config-category-panel ${active ? "active" : ""}"
-        role="tabpanel"
-        aria-labelledby="configCategory${capitalized}"
+        role="region"
+        aria-label="${escapeAttribute(label)}"
         data-config-category-panel="${escapeAttribute(category)}"
         ${active ? "" : "hidden"}
       >${content}</section>
@@ -149,7 +135,6 @@ export function createConfigDashboardRendering({
 
   return {
     renderCategoryPanel,
-    renderCategoryTab,
     renderConfigMap,
   };
 }

package/dist/src/web-ui/app/components/config-workspace/field-rendering.js

@@ -1,3 +1,4 @@
+import { malformedConfigRaw } from "./raw-config-repair.js";
 import { escapeAttribute, escapeHtml, textOf } from "../../lib/text-format.js";
 import {
   isConfigObject,
@@ -224,6 +225,7 @@ export function createConfigFieldRendering({
     if (hasRawDraftChanges(file)) return "Raw draft not applied";
     if (isFileDirty(file)) return "Unsaved changes";
     if (state.savedKeys.has(key)) return "Saved";
+    if (malformedConfigRaw(file) !== undefined) return "Invalid JSON";
     return "Clean";
   }
 

package/dist/src/web-ui/app/components/config-workspace/model-removal.js

@@ -0,0 +1,105 @@
+function isDefinitiveModelRemovalRejection(error) {
+  const status = error?.status;
+  if (!Number.isInteger(status)) return false;
+  if (status < 400 || status >= 500) return false;
+  return typeof error.payload?.error === "string";
+}
+
+function modelIsStillRegistered(payload, profileId) {
+  const profiles = payload?.dashboard?.files?.runtime?.config?.models?.profiles;
+  if (!profiles || typeof profiles !== "object")
+    throw new Error("The Runtime model declarations could not be read.");
+  if (Array.isArray(profiles))
+    throw new Error("The Runtime model declarations could not be read.");
+  return Object.hasOwn(profiles, profileId);
+}
+
+/** Declaration removal shares Configuration's dirty-state and mutation guards. */
+export function createModelRemovalController({
+  removeModel,
+  loadDashboard,
+  getEnvironmentId,
+  beginRuntimeMutation,
+  endRuntimeMutation,
+  refreshRuntimeConfig,
+  onSaved,
+  setStatus,
+  confirmRemoval = (message) => window.confirm(message),
+}) {
+  let pending = false;
+
+  async function finishConfirmedRemoval(environmentId) {
+    try {
+      if (environmentId !== getEnvironmentId()) {
+        setStatus(
+          "Model removed in the previous environment. Reopen it to apply the saved change.",
+        );
+        return true;
+      }
+      onSaved();
+      const refreshed = await refreshRuntimeConfig(
+        "Model removed; refresh required",
+      );
+      if (refreshed)
+        setStatus("Model removed. Apply changes when your agent is idle.");
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      setStatus(`Model removed; refresh required: ${message}`, "error-text");
+    }
+    return true;
+  }
+
+  async function reconcileUncertainRemoval(profileId, environmentId, error) {
+    let stillRegistered;
+    try {
+      stillRegistered = modelIsStillRegistered(
+        await loadDashboard(environmentId),
+        profileId,
+      );
+    } catch {
+      setStatus(
+        "Model removal could not be confirmed. Refresh Configuration before trying again.",
+        "error-text",
+      );
+      return false;
+    }
+    if (!stillRegistered) return finishConfirmedRemoval(environmentId);
+    setStatus(
+      error instanceof Error ? error.message : String(error),
+      "error-text",
+    );
+    return false;
+  }
+
+  async function remove({ profileId, label, expectedRevision }) {
+    if (pending) return false;
+    if (!beginRuntimeMutation("model removal")) return false;
+    const environmentId = getEnvironmentId();
+    pending = true;
+    try {
+      if (
+        !confirmRemoval(
+          `Remove ${label || profileId} from configured models? Its model file, provider and credentials will be kept.`,
+        )
+      )
+        return false;
+      try {
+        await removeModel({ profileId, expectedRevision }, environmentId);
+      } catch (error) {
+        if (!isDefinitiveModelRemovalRejection(error))
+          return await reconcileUncertainRemoval(profileId, environmentId, error);
+        setStatus(
+          error instanceof Error ? error.message : String(error),
+          "error-text",
+        );
+        return false;
+      }
+      return await finishConfirmedRemoval(environmentId);
+    } finally {
+      pending = false;
+      endRuntimeMutation();
+    }
+  }
+
+  return { remove };
+}

package/dist/src/web-ui/app/components/config-workspace/model-rendering.js

@@ -1,6 +1,19 @@
+import { configRequiresRawRepair } from "./raw-config-repair.js";
 import { escapeAttribute, escapeHtml, textOf } from "../../lib/text-format.js";
 import { isConfigObject } from "./config-model.js";
 
+function modelListStatus(model, hasImage) {
+  if (model.registered === false) return "Not registered";
+  return hasImage ? "image input" : "text input";
+}
+
+function renderModelRegistrationAction(model) {
+  if (model.registered === false)
+    return '<p class="muted">Not registered in the saved configuration. This file is kept for reference.</p>';
+  if (model.registered !== true) return "";
+  return `<button type="button" data-config-action="remove-model" data-id="${escapeAttribute(model.id)}">Remove model</button>`;
+}
+
 export function createConfigModelRendering({
   state,
   calibrationProfileLabel,
@@ -39,7 +52,7 @@ export function createConfigModelRendering({
                 <span>${escapeHtml(model.config?.label || model.id)}</span>
                 <small>
                   <span>${escapeHtml(model.config?.provider || "-")}</span>
-                  <span>${escapeHtml(hasImage ? "image input" : "text input")}</span>
+                  <span>${escapeHtml(modelListStatus(model, hasImage))}</span>
                 </small>
               </button>
             `;
@@ -152,6 +165,13 @@ export function createConfigModelRendering({
       return '<div class="empty-state compact">No model configs found</div>';
     }
     state.selectedConfigModelId = model.id;
+    if (
+      configRequiresRawRepair(
+        model,
+        state.appliedJsonRepairKeys.has(configFileKey(model)),
+      )
+    )
+      return `${renderModelRegistrationAction(model)}<p class="error-text">Repair this linked file in the configuration repair section before editing model settings.</p>`;
     const calibration = isConfigObject(model.config?.calibration)
       ? model.config.calibration
       : {};
@@ -159,6 +179,10 @@ export function createConfigModelRendering({
       .sort(([left], [right]) => left.localeCompare(right))
       .map(([stepId, profile]) => renderCalibrationCard(model, stepId, profile))
       .join("");
+    const calibrationSectionKey = configFileKey(model);
+    const calibrationSectionExpanded = state.expandedCalibrationSections.has(
+      calibrationSectionKey,
+    );
     const availableCalibrationProfiles = configStepOptions().filter(
       (step) => !Object.prototype.hasOwnProperty.call(calibration, step),
     );
@@ -174,11 +198,20 @@ export function createConfigModelRendering({
             )}</p>
             <code>${escapeHtml(model.path)}</code>
           </div>
-          ${renderFileActions(model)}
+          <div class="config-file-actions">
+            ${renderFileActions(model)}
+            ${renderModelRegistrationAction(model)}
+          </div>
         </div>
         <div class="config-form-panel">
-          <div class="config-form-panel-title">
-            <strong>Model defaults</strong>
+          <div class="config-form-panel-title config-model-defaults-title">
+            <div class="config-model-defaults-heading">
+              <strong>Model defaults</strong>
+              ${renderConfigInput(model, ["supportsThinking"], {
+                type: "boolean",
+                label: "Thinking",
+              })}
+            </div>
             <span>Provider, generation, and base context limits.</span>
           </div>
           <div class="config-field-grid model-basics">
@@ -189,10 +222,6 @@ export function createConfigModelRendering({
               { type: "select", values: configProviderOptions() },
             )}</label>
             <label><span>Model</span>${renderConfigInput(model, ["model"])}</label>
-            ${renderConfigInput(model, ["supportsThinking"], {
-              type: "boolean",
-              label: "Thinking",
-            })}
             <label><span>Temperature</span>${renderConfigInput(
               model,
               ["generation", "temperature"],
@@ -211,38 +240,44 @@ export function createConfigModelRendering({
           </div>
           ${renderExecutionRoute(model)}
         </div>
-        <div class="config-subheader">
-          <div>
+        <details
+          class="config-calibration-section"
+          data-calibration-section-key="${escapeAttribute(calibrationSectionKey)}"
+          ${calibrationSectionExpanded ? "open" : ""}
+        >
+          <summary class="config-calibration-section-title">
             <span>Invocation calibration</span>
             <small>${escapeHtml(
               Object.keys(calibration).length === 1
                 ? "1 profile"
                 : `${Object.keys(calibration).length} profiles`,
             )}</small>
+          </summary>
+          <div class="config-calibration-section-body">
+            <div class="config-add-row compact">
+              <label>
+                <span>Add profile</span>
+                <select data-new-calibration-key>
+                  <option value="">Choose invocation profile</option>
+                  ${renderSelectOptions(availableCalibrationProfiles)}
+                </select>
+              </label>
+              <button
+                type="button"
+                data-config-action="add-calibration"
+                data-kind="model"
+                data-id="${escapeAttribute(model.id)}"
+                ${availableCalibrationProfiles.length ? "" : "disabled"}
+              >Add</button>
+            </div>
+            <div class="config-calibration-grid">
+              ${
+                calibrationCards ||
+                '<div class="empty-state compact">No calibration entries</div>'
+              }
+            </div>
           </div>
-          <div class="config-add-row compact">
-            <label>
-              <span>Add profile</span>
-              <select data-new-calibration-key>
-                <option value="">Choose invocation profile</option>
-                ${renderSelectOptions(availableCalibrationProfiles)}
-              </select>
-            </label>
-            <button
-              type="button"
-              data-config-action="add-calibration"
-              data-kind="model"
-              data-id="${escapeAttribute(model.id)}"
-              ${availableCalibrationProfiles.length ? "" : "disabled"}
-            >Add</button>
-          </div>
-        </div>
-        <div class="config-calibration-grid">
-          ${
-            calibrationCards ||
-            '<div class="empty-state compact">No calibration entries</div>'
-          }
-        </div>
+        </details>
       </section>
     `;
   }

package/dist/src/web-ui/app/components/config-workspace/model-setup-entry.js

@@ -0,0 +1,30 @@
+import { escapeHtml } from "../../lib/text-format.js";
+import { isConfigObject } from "./config-model.js";
+
+export function renderModelSetupEntry(runtime, models) {
+  const config = runtime?.config?.models?.providers;
+  const providers = isConfigObject(config) ? Object.entries(config) : [];
+  const cards = providers
+    .filter(([, provider]) => isConfigObject(provider))
+    .map(([id, provider]) => {
+      const count = models.filter(
+        (model) => model.config?.provider === id,
+      ).length;
+      const providerType = String(provider.type || "");
+      const hasDistinctProviderType =
+        providerType.length > 0 &&
+        providerType.toLowerCase() !== id.toLowerCase();
+      return `<article class="config-provider-card">
+        <div class="config-provider-identity"><h3>${escapeHtml(id)}</h3>${hasDistinctProviderType ? `<span>${escapeHtml(providerType)}</span>` : ""}</div>
+        <footer><span>${count} ${count === 1 ? "model" : "models"}</span>
+        </footer>
+      </article>`;
+    })
+    .join("");
+  return `<div class="config-model-setup-entry">
+    <header><div><h2>Models and providers</h2><p>Add a model using a saved connection or connect a new provider.</p></div>
+      <button type="button" data-config-action="add-model">Add model</button>
+    </header>
+    ${cards ? `<div class="config-provider-grid" aria-label="Configured providers">${cards}</div>` : ""}
+  </div>`;
+}

package/dist/src/web-ui/app/components/config-workspace/raw-config-repair.js

@@ -0,0 +1,28 @@
+export function malformedConfigRaw(file) {
+  if (file?.kind !== "model" && file?.kind !== "requestRunner") return undefined;
+  const raw = file.invalidJson?.raw;
+  return typeof raw === "string" ? raw : undefined;
+}
+
+export function configRequiresRawRepair(file, appliedRepair = false) {
+  if (appliedRepair) return false;
+  return malformedConfigRaw(file) !== undefined;
+}
+
+export function configRepairGuidance(file) {
+  if (malformedConfigRaw(file) === undefined) return "";
+  return "This saved file contains invalid JSON. Correct the JSON, then save the file. Reset restores the original text; other configuration files are preserved.";
+}
+
+export function selectMalformedConfigForRepair(state, files, configFileKey) {
+  const file = files.find((entry) => configRequiresRawRepair(entry));
+  if (!file) return;
+  state.selectedRawConfigKey = configFileKey(file);
+  state.activeCategory = "models";
+  state.rawPanelOpen = true;
+}
+
+export function configRepairSaveIsConfirmed(result) {
+  if (!result?.file) return false;
+  return !result.file.invalidJson;
+}

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

@@ -1,14 +1,13 @@
+import { rememberCalibrationDisclosure } from "./calibration-disclosure.js";
 import { textOf } from "../../lib/text-format.js";
-import {
-  CONFIG_CATEGORIES,
-  resolveModelExecutionRoute,
-} from "./config-model.js";
+import { resolveModelExecutionRoute } from "./config-model.js";
 
 export function createConfigWorkspaceEvents({
   state,
   dom,
   eventTarget,
-  activateCategory,
+  onAddModel,
+  onRemoveModel,
   applyRawDraft,
   changeRawFile,
   configFileKey,
@@ -101,43 +100,13 @@ export function createConfigWorkspaceEvents({
     }
   }
 
-  function handleCategoryKeydown(event, element) {
-    const keys = ["ArrowLeft", "ArrowRight", "Home", "End"];
-    if (!keys.includes(event.key)) return;
-    event.preventDefault();
-    const currentIndex = CONFIG_CATEGORIES.indexOf(
-      element.dataset.configCategory,
-    );
-    let nextIndex = currentIndex;
-    if (event.key === "Home") nextIndex = 0;
-    if (event.key === "End") nextIndex = CONFIG_CATEGORIES.length - 1;
-    if (event.key === "ArrowLeft") {
-      nextIndex =
-        (currentIndex - 1 + CONFIG_CATEGORIES.length) %
-        CONFIG_CATEGORIES.length;
-    }
-    if (event.key === "ArrowRight") {
-      nextIndex = (currentIndex + 1) % CONFIG_CATEGORIES.length;
-    }
-    activateCategory(CONFIG_CATEGORIES[nextIndex], { focus: true });
-  }
-
-  function handleDashboardKeydown(event) {
-    if (dashboardIsBusy()) return;
-    const element = event.target?.closest?.("[data-config-category]");
-    if (element) handleCategoryKeydown(event, element);
-  }
-
   function handleDashboardToggle(event) {
     const details = event.target;
     if (details?.id === "configRawPanel") {
       state.rawPanelOpen = details.open;
       return;
     }
-    const key = details?.dataset?.calibrationKey;
-    if (!key) return;
-    if (details.open) state.expandedCalibrationKeys.add(key);
-    else state.expandedCalibrationKeys.delete(key);
+    rememberCalibrationDisclosure(state, details);
   }
 
   function stepMappingIsComplete(step, profile) {
@@ -183,15 +152,29 @@ export function createConfigWorkspaceEvents({
     );
   }
 
+  function handleRemoveModelAction(id) {
+    const file = findConfigFile("model", id);
+    if (file?.registered !== true) return;
+    onRemoveModel?.({
+      profileId: file.id,
+      label: file.config?.label || file.id,
+      expectedRevision: state.configDashboard?.files?.runtime?.revision,
+    });
+  }
+
   function handleDashboardClick(event) {
-    if (dashboardIsBusy()) return;
     const element = event.target?.closest?.("[data-config-action]");
     if (!element) return;
     const action = element.dataset.configAction;
     const kind = element.dataset.kind;
     const id = element.dataset.id;
-    if (action === "select-category") {
-      activateCategory(element.dataset.configCategory || "memory");
+    if (dashboardIsBusy()) return;
+    if (action === "add-model") {
+      onAddModel?.({ providerId: element.dataset.providerId || undefined });
+      return;
+    }
+    if (action === "remove-model") {
+      handleRemoveModelAction(id);
       return;
     }
     if (action === "select-model") {
@@ -262,7 +245,6 @@ export function createConfigWorkspaceEvents({
     dom.configDashboard.addEventListener("input", handleDashboardInput);
     dom.configDashboard.addEventListener("input", handleRawEditorInput);
     dom.configDashboard.addEventListener("change", handleDashboardChange);
-    dom.configDashboard.addEventListener("keydown", handleDashboardKeydown);
     dom.configDashboard.addEventListener("toggle", handleDashboardToggle, true);
     eventTarget.addEventListener?.("beforeunload", handleBeforeUnload);
   }

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

@@ -1,3 +1,8 @@
+import {
+  malformedConfigRaw,
+  configRequiresRawRepair,
+  selectMalformedConfigForRepair,
+} from "./raw-config-repair.js";
 import { textOf } from "../../lib/text-format.js";
 import {
   cloneConfig,
@@ -27,6 +32,13 @@ export function createConfigWorkspaceMutations({
     const file = findConfigFile(kind, id);
     if (!file) return;
     const key = configFileKey(file);
+    if (configRequiresRawRepair(file, state.appliedJsonRepairKeys.has(key))) {
+      setWorkspaceStatus(
+        "Repair this file in the configuration repair section before editing its fields.",
+        "error-text",
+      );
+      return;
+    }
     const shouldFollowStructuredConfig = !hasRawDraftChanges(file);
     mutator(file.config);
     state.savedKeys.delete(key);
@@ -47,7 +59,8 @@ export function createConfigWorkspaceMutations({
     const baseline = state.baselinesByKey.get(key);
     if (!baseline) return;
     file.config = cloneConfig(baseline);
-    state.rawDraftsByKey.set(key, formattedConfig(baseline));
+    state.appliedJsonRepairKeys.delete(key);
+    state.rawDraftsByKey.set(key, malformedConfigRaw(file) ?? formattedConfig(baseline));
     state.savedKeys.delete(key);
     renderConfigDashboard();
   }
@@ -58,7 +71,8 @@ export function createConfigWorkspaceMutations({
       const baseline = state.baselinesByKey.get(key);
       if (!baseline) continue;
       file.config = cloneConfig(baseline);
-      state.rawDraftsByKey.set(key, formattedConfig(baseline));
+      state.appliedJsonRepairKeys.delete(key);
+      state.rawDraftsByKey.set(key, malformedConfigRaw(file) ?? formattedConfig(baseline));
     }
     state.savedKeys.clear();
     renderConfigDashboard();
@@ -105,6 +119,7 @@ export function createConfigWorkspaceMutations({
     if (!models.some((model) => model.id === state.selectedConfigModelId)) {
       state.selectedConfigModelId = models[0]?.id || "";
     }
+    selectMalformedConfigForRepair(state, configFileEntries(), configFileKey);
     ensureRawSelection();
     renderConfigDashboard();
   }
@@ -113,6 +128,7 @@ export function createConfigWorkspaceMutations({
     state.configDashboard = null;
     state.baselinesByKey.clear();
     state.rawDraftsByKey.clear();
+    state.appliedJsonRepairKeys.clear();
     state.savedKeys.clear();
     state.selectedRawConfigKey = "";
     dom.configDashboard.innerHTML = "";
@@ -146,6 +162,8 @@ export function createConfigWorkspaceMutations({
       const parsed = parseRawDraft(file);
       file.config = parsed;
       const key = configFileKey(file);
+      if (malformedConfigRaw(file) !== undefined)
+        state.appliedJsonRepairKeys.add(key);
       state.rawDraftsByKey.set(key, formattedConfig(parsed));
       state.savedKeys.delete(key);
       setWorkspaceStatus("");
@@ -170,7 +188,9 @@ export function createConfigWorkspaceMutations({
     }
     state.rawDraftsByKey.set(
       configFileKey(currentFile),
-      formattedConfig(currentFile.config),
+      configRequiresRawRepair(currentFile, state.appliedJsonRepairKeys.has(configFileKey(currentFile)))
+        ? malformedConfigRaw(currentFile)
+        : formattedConfig(currentFile.config),
     );
     return true;
   }

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

@@ -1,3 +1,4 @@
+import { configRepairSaveIsConfirmed } from "./raw-config-repair.js";
 import { textOf } from "../../lib/text-format.js";
 import {
   cloneConfig,
@@ -12,6 +13,7 @@ export function createConfigWorkspacePersistence({
   saveFile,
   memorySetup,
   memoryManagement,
+  pluginManagement,
   recordControlEvent,
   applyRawDraft,
   baselineFor,
@@ -39,12 +41,12 @@ export function createConfigWorkspacePersistence({
     syncDashboardInteractivity();
   }
 
-  function externalRuntimeMutationBlockReason() {
+  function externalRuntimeMutationBlockReason(subject) {
     if (hasUnsavedChanges()) {
-      return "Save or reset configuration changes before changing Runtime memory settings.";
+      return `Save or reset configuration changes before changing Runtime ${subject}.`;
     }
     if (dashboardIsBusy() || state.savingKeys.size > 0) {
-      return "Wait for the current configuration operation before changing Runtime memory settings.";
+      return `Wait for the current configuration operation before changing Runtime ${subject}.`;
     }
     return "";
   }
@@ -89,6 +91,7 @@ export function createConfigWorkspacePersistence({
       if (configLoadIsStale(loadGeneration)) return false;
       replaceDashboard(payload);
       const memoryLoads = [memoryManagement.load()];
+      if (pluginManagement) memoryLoads.push(pluginManagement.load());
       if (options.loadMemorySetup !== false) {
         memoryLoads.unshift(memorySetup.load());
       }
@@ -127,8 +130,8 @@ export function createConfigWorkspacePersistence({
     }
   }
 
-  function beginExternalRuntimeMutation() {
-    const blockReason = externalRuntimeMutationBlockReason();
+  function beginExternalRuntimeMutation(subject = "memory settings") {
+    const blockReason = externalRuntimeMutationBlockReason(subject);
     if (blockReason) {
       setWorkspaceStatus(blockReason, "error-text");
       return false;
@@ -138,13 +141,15 @@ export function createConfigWorkspacePersistence({
     return true;
   }
 
-  async function refreshAfterExternalRuntimeMutation() {
+  async function refreshAfterExternalRuntimeMutation(
+    failurePrefix = "Memory updated; refresh required",
+  ) {
     if (!state.externalRuntimeMutationInFlight) return false;
     return loadRuntimeConfig({
       protectUnsaved: false,
       clearBeforeLoad: true,
       loadMemorySetup: false,
-      failurePrefix: "Memory updated; refresh required",
+      failurePrefix,
     });
   }
 
@@ -194,7 +199,18 @@ export function createConfigWorkspacePersistence({
     syncDashboardInteractivity();
     syncDirtyPresentation();
     try {
-      const result = await saveFile({ kind, id, config: configToSave });
+      const result = await saveFile({
+        kind,
+        id,
+        config: configToSave,
+        expectedRevision: file.revision,
+      });
+      if (typeof result?.file?.revision === "string")
+        file.revision = result.file.revision;
+      if (configRepairSaveIsConfirmed(result)) {
+        delete file.invalidJson;
+        state.appliedJsonRepairKeys?.delete(key);
+      }
       state.baselinesByKey.set(key, cloneConfig(configToSave));
       state.savedKeys.add(key);
       recordControlEvent({