@abot-ai/runtime 1.3.0 → 1.4.0

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

@@ -1,7 +1,13 @@
-import { captureComposerSubmissionScope, isCurrentComposerSubmissionScope } from "./lib/composer-submission-scope.js";
+import { createAppState } from "./app-state.js";
+import { createProjectsFeature } from "./projects-feature.js";
+import {
+  captureComposerSubmissionScope,
+  isCurrentComposerSubmissionScope,
+} from "./lib/composer-submission-scope.js";
 import { createComposerSurfaceController } from "./controllers/composer-surface-controller.js";
 import { bootstrapWebApp } from "./app-bootstrap.js";
-import { createConfigurationFeature } from "./configuration-feature.js";
+import { bindRuntimeSetupPageLifecycle } from "./runtime-setup-page-lifecycle.js";
+import { createConfigurationFeature } from "./configuration-environment-refresh.js";
 import { createDashboardFeature } from "./dashboard-feature.js";
 import { createComposerWorkspaceController } from "./controllers/composer-workspace-controller.js";
 import { createHomeComposerFeature } from "./controllers/home-composer-feature.js";
@@ -11,11 +17,11 @@ import { createSchedulesFeature } from "./schedules-feature.js";
 import { createWorkspaceShell } from "./components/workspace-shell.js";
 import { createComposerActions } from "./components/composer-actions.js";
 import { createModelSelector } from "./components/model-selector.js";
-import { createRuntimeSetupGuide } from "./components/runtime-setup-guide.js";
+import { createRuntimeOnboardingFeature } from "./runtime-onboarding-feature.js";
 import { createSessionActionsMenu } from "./components/session-actions-menu.js";
 import { createToolApprovalCard } from "./components/tool-approval-card.js";
 import { textOf } from "./lib/text-format.js";
-import { createConversationView } from "./components/conversation-view.js";
+import { createConversationViewFeature as createConversationView } from "./controllers/conversation-view-feature.js";
 import { createSessionComposerQueue } from "./lib/session-composer-queue.js";
 import { createRuntimeWebClient } from "./services/runtime-web-client.js";
 import { createClientPreferences } from "./services/client-preferences.js";
@@ -27,49 +33,13 @@ import { createComposerAttachmentsController } from "./controllers/composer-atta
 import { createComposerQueueController } from "./controllers/composer-queue-controller.js";
 import { createRealtimeEventController } from "./controllers/realtime-event-controller.js";
 import { createRuntimeSelectionController } from "./controllers/runtime-selection-controller.js";
-import { createRuntimeOnboardingController } from "./controllers/runtime-onboarding-controller.js";
 import { createAppEventBindings } from "./controllers/app-event-bindings.js";
 import { createConversationSessionController } from "./controllers/conversation-session-controller.js";
 import { createChatRequestController } from "./controllers/chat-request-controller.js";
 import { createToolApprovalController } from "./controllers/tool-approval-controller.js";
 import { createComposerSubmitController } from "./controllers/composer-submit-controller.js";
 
-const state = {
-  config: null,
-  connected: false,
-  sessions: [],
-  pinnedSessionIds: [],
-  sessionModes: {},
-  sessionModels: {},
-  lastModelByEnvironment: {},
-  agentMode: "reasoning",
-  supportedAgentModes: ["fast", "reasoning", "deep", "auto"],
-  agentModeMenuOpen: false,
-  permissionModeMenuOpen: false,
-  agentPickerOpen: false,
-  busySessionIds: new Set(),
-  messages: [],
-  events: [],
-  taskProgressByRequest: new Map(),
-  contextWindowByRequest: new Map(),
-  submittedToolApprovalIds: new Set(),
-  requestMessages: new Map(),
-  currentSessionId: "",
-  activeRequestId: "",
-  sessionViewVersion: 0,
-  lastSeqByRequest: new Map(),
-  modelProfiles: [],
-  defaultModelProfileId: "",
-  runtimeAvailability: { status: "loading" },
-  pendingAttachments: [],
-  pendingAttachmentUploadCounts: new Map(),
-  composerAttachmentGeneration: 0,
-  composerSending: false,
-  composerQueueDrainingScopes: new Set(),
-  composerQueueRecoveredReleaseTokens: new Set(),
-  activeComposerQueueRecovery: null,
-  sessionQuery: "",
-};
+const state = createAppState();
 
 const dom = findAppDom();
 
@@ -89,6 +59,7 @@ let schedulesFeature;
 let dashboardFeature;
 let homeComposer;
 let runtimeSelection;
+let projectsFeature;
 const operationsController = createOperationsController({
   dom,
   client: runtimeClient,
@@ -141,6 +112,9 @@ const shell = createWorkspaceShell({
   onWorkspaceChange: (workspace) => {
     runtimeSelection?.rememberModelSelection();
     homeComposer?.setWorkspace(workspace);
+    conversationView?.setWorkspace(workspace);
+    projectsFeature?.workspaceChanged(workspace);
+    runtimeSetupGuide.clearSecret();
     schedulesFeature?.setActive(workspace === "schedules");
     dashboardFeature?.setActive(workspace === "home");
     runtimeSelection?.applyModelSelection();
@@ -157,23 +131,21 @@ const shell = createWorkspaceShell({
     return configWorkspace.prepareDiscardChanges("leave configuration");
   },
 });
-const runtimeSetupGuide = createRuntimeSetupGuide({
-  container: dom.runtimeSetupGuide,
-  conversationRegion: dom.messagesList,
-  copyText: (value) => navigator.clipboard.writeText(value),
-  getSetupCommandMode: () => state.config?.setupCommandMode,
-});
-const runtimeOnboarding = createRuntimeOnboardingController({
-  state,
-  guide: runtimeSetupGuide,
-  reloadModels: loadModels,
-  setMessageStatus: setMessageActivityStatus,
-  onStateChange: () => {
-    updateComposerSendState();
-    renderAttachmentComposer();
-    dashboardFeature?.publish();
-  },
-});
+const { guide: runtimeSetupGuide, controller: runtimeOnboarding } =
+  createRuntimeOnboardingFeature({
+    dom,
+    runtimeClient,
+    selectedEnvironmentId,
+    state,
+    reloadModels: () => configWorkspace.reloadAppliedEnvironmentModels(),
+    reloadCatalog: loadModels,
+    setMessageStatus: setMessageActivityStatus,
+    onStateChange: () => {
+      updateComposerSendState();
+      renderAttachmentComposer();
+      dashboardFeature?.runtimeAvailabilityChanged();
+    },
+  });
 
 const composerActions = createComposerActions({
   dom,
@@ -200,6 +172,7 @@ dashboardFeature = createDashboardFeature({
   isComposerAvailable: runtimeOnboarding.isReady,
 });
 const composerWorkspace = createComposerWorkspaceController({
+  onSessionCreated: (sessionId) => runtimeSelection.initializeSessionMode(sessionId),
   state,
   dom,
   homeComposerHost: dashboardFeature.composerHost,
@@ -231,6 +204,7 @@ const sessionController = createSessionController({
   state,
   dom,
   sessionActionsMenu,
+  renderGroups: (input) => projectsFeature?.renderSessionGroups(input) ?? false,
   shell,
   preferences,
   client: runtimeClient,
@@ -276,12 +250,10 @@ const toolApprovalController = createToolApprovalController({
   createCard: createToolApprovalCard,
 });
 conversationView = createConversationView({
-  dom: {
-    messagesList: dom.messagesList,
-    jumpToLatestButton: dom.jumpToLatestButton,
-    composerContextWindow: dom.composerContextWindow,
-    composerPlan: dom.composerPlan,
-  },
+  dom,
+  filePreviewClient: runtimeClient,
+  getFileEnvironmentId: selectedEnvironmentId,
+  getFileSessionId: () => state.currentSessionId,
   getMessages: () => state.messages,
   getActiveRequestId: () => state.activeRequestId,
   isConnected: () => state.connected,
@@ -301,6 +273,7 @@ conversationView = createConversationView({
   canOpenSchedule: runtimeClient.supportsSchedules,
 });
 conversationSession = createConversationSessionController({
+  onSessionCreated: (sessionId) => runtimeSelection.initializeSessionMode(sessionId),
   state,
   dom,
   client: runtimeClient,
@@ -335,6 +308,23 @@ conversationSession = createConversationSessionController({
   isCurrentComposerScope: (scope) =>
     composerQueueController.isCurrentScope(scope),
 });
+projectsFeature = createProjectsFeature({
+  onSessionCreated: (sessionId) => runtimeSelection.initializeSessionMode(sessionId),
+  dom,
+  state,
+  client: runtimeClient,
+  shell,
+  selectedEnvironmentId,
+  conversationSession,
+  renderSessions,
+  closeFilePreview: conversationView.closeFilePreview,
+  prepareConversation: () => {
+    const activate = shell.prepareWorkspaceActivation("chat", { focus: false });
+    if (!activate) return false;
+    if (!composerQueueController.suspendRecoveryForNavigation()) return false;
+    return activate() !== false;
+  },
+});
 chatRequests = createChatRequestController({
   state,
   client: runtimeClient,
@@ -472,16 +462,24 @@ homeComposer = createHomeComposerFeature({
     updateComposerSendState,
   }),
   sendMessage: async (text) => {
-    const scope = captureComposerSubmissionScope(state, selectedEnvironmentId());
+    const scope = captureComposerSubmissionScope(
+      state,
+      selectedEnvironmentId(),
+    );
     state.composerSending = true;
     updateComposerSendState();
     try {
       await chatRequests.sendMessage(text);
     } catch (error) {
-      if (!isCurrentComposerSubmissionScope(scope, state, selectedEnvironmentId())) return;
+      if (
+        !isCurrentComposerSubmissionScope(scope, state, selectedEnvironmentId())
+      )
+        return;
       conversationSession.appendRequestError(error);
     } finally {
-      if (isCurrentComposerSubmissionScope(scope, state, selectedEnvironmentId())) {
+      if (
+        isCurrentComposerSubmissionScope(scope, state, selectedEnvironmentId())
+      ) {
         state.composerSending = false;
         updateComposerSendState();
       }
@@ -489,6 +487,7 @@ homeComposer = createHomeComposerFeature({
   },
 });
 const appEventBindings = createAppEventBindings({
+  onSessionCreated: (sessionId) => runtimeSelection.initializeSessionMode(sessionId),
   state,
   dom,
   shell,
@@ -535,6 +534,9 @@ const appEventBindings = createAppEventBindings({
 });
 
 configWorkspace = createConfigurationFeature({
+  state,
+  selection: runtimeSelection,
+  onConfigurationApplied: loadModels,
   dom,
   runtimeClient,
   selectedEnvironmentId,
@@ -726,6 +728,11 @@ async function loadSystemHealth() {
 
 function bindEvents() {
   appEventBindings.bind();
+  bindRuntimeSetupPageLifecycle({
+    page: window,
+    dispose: runtimeSetupGuide.dispose,
+    reloadModels: loadModels,
+  });
   document.addEventListener(
     "visibilitychange",
     conversationSession.markCurrentSessionReadSoon,
@@ -748,10 +755,12 @@ void bootstrapWebApp({
   homeComposer,
   dashboard: dashboardFeature,
   schedules: schedulesFeature,
+  projects: projectsFeature,
   selection: runtimeSelection,
   client: runtimeClient,
   bindables: [
     sessionActionsMenu,
+    projectsFeature,
     conversationView,
     configWorkspace,
     composerActions,

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

@@ -1,6 +1,17 @@
+import {
+  malformedConfigRaw,
+  configRequiresRawRepair,
+} from "./raw-config-repair.js";
 import { textOf } from "../../lib/text-format.js";
 
-export const CONFIG_CATEGORIES = ["memory", "pipeline", "models", "advanced"];
+export const CONFIG_CATEGORIES = [
+  "memory",
+  "pipeline",
+  "models",
+  "plugins",
+  "computer",
+  "advanced",
+];
 
 const DEFAULT_MODEL_EXECUTION_POLICY = "supervisor-worker-v1";
 
@@ -120,6 +131,7 @@ export function createConfigWorkspaceModel() {
     configDashboard: null,
     baselinesByKey: new Map(),
     rawDraftsByKey: new Map(),
+    appliedJsonRepairKeys: new Set(),
     savingKeys: new Set(),
     savedKeys: new Set(),
     expandedCalibrationKeys: new Set(),
@@ -165,11 +177,15 @@ export function createConfigWorkspaceModel() {
   function captureBaselines() {
     state.baselinesByKey.clear();
     state.rawDraftsByKey.clear();
+    state.appliedJsonRepairKeys.clear();
     state.savedKeys.clear();
     for (const file of configFileEntries()) {
       const key = configFileKey(file);
       state.baselinesByKey.set(key, cloneConfig(file.config));
-      state.rawDraftsByKey.set(key, formattedConfig(file.config));
+      state.rawDraftsByKey.set(
+        key,
+        malformedConfigRaw(file) ?? formattedConfig(file.config),
+      );
     }
   }
 
@@ -178,6 +194,7 @@ export function createConfigWorkspaceModel() {
   }
 
   function isFileDirty(file) {
+    if (state.appliedJsonRepairKeys.has(configFileKey(file))) return true;
     const baseline = baselineFor(file);
     return baseline ? !configValuesEqual(file.config, baseline) : false;
   }
@@ -186,10 +203,13 @@ export function createConfigWorkspaceModel() {
     const key = configFileKey(file);
     return state.rawDraftsByKey.has(key)
       ? state.rawDraftsByKey.get(key)
-      : formattedConfig(file.config);
+      : (malformedConfigRaw(file) ?? formattedConfig(file.config));
   }
 
   function hasRawDraftChanges(file) {
+    const appliedRepair = state.appliedJsonRepairKeys.has(configFileKey(file));
+    if (configRequiresRawRepair(file, appliedRepair))
+      return rawDraftFor(file) !== malformedConfigRaw(file);
     return rawConfigDraftHasChanges(rawDraftFor(file), file.config);
   }
 

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"

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-rendering.js

@@ -1,3 +1,4 @@
+import { configRequiresRawRepair } from "./raw-config-repair.js";
 import { escapeAttribute, escapeHtml, textOf } from "../../lib/text-format.js";
 import { isConfigObject } from "./config-model.js";
 
@@ -152,6 +153,11 @@ 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 '<p class="error-text">Repair this linked file in Advanced → Raw JSON before editing model settings.</p>';
     const calibration = isConfigObject(model.config?.calibration)
       ? model.config.calibration
       : {};

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

@@ -0,0 +1,27 @@
+import { escapeAttribute, 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;
+      return `<article class="config-provider-card">
+        <div><h3>${escapeHtml(id)}</h3><span>${escapeHtml(provider.type || "Provider")}</span></div>
+        <footer><span>${count} ${count === 1 ? "model" : "models"}</span>
+          <button type="button" data-config-action="add-model" data-provider-id="${escapeAttribute(id)}" aria-label="${escapeAttribute(`Add model to ${id}`)}">Add model</button>
+        </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 = "advanced";
+  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

@@ -8,6 +8,7 @@ export function createConfigWorkspaceEvents({
   state,
   dom,
   eventTarget,
+  onAddModel,
   activateCategory,
   applyRawDraft,
   changeRawFile,
@@ -194,6 +195,10 @@ export function createConfigWorkspaceEvents({
       activateCategory(element.dataset.configCategory || "memory");
       return;
     }
+    if (action === "add-model") {
+      onAddModel?.({ providerId: element.dataset.providerId || undefined });
+      return;
+    }
     if (action === "select-model") {
       state.selectedConfigModelId = element.dataset.modelId || "";
       renderConfigDashboard();

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 Advanced → Raw JSON 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,8 @@ export function createConfigWorkspacePersistence({
   saveFile,
   memorySetup,
   memoryManagement,
+  pluginManagement,
+  hostConnection,
   recordControlEvent,
   applyRawDraft,
   baselineFor,
@@ -39,12 +42,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 +92,8 @@ export function createConfigWorkspacePersistence({
       if (configLoadIsStale(loadGeneration)) return false;
       replaceDashboard(payload);
       const memoryLoads = [memoryManagement.load()];
+      if (pluginManagement) memoryLoads.push(pluginManagement.load());
+      if (hostConnection) memoryLoads.push(hostConnection.load());
       if (options.loadMemorySetup !== false) {
         memoryLoads.unshift(memorySetup.load());
       }
@@ -127,8 +132,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 +143,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 +201,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({