@arbidocs/react 0.5.49 → 0.5.50

package/dist/index.d.cts

@@ -2321,9 +2321,15 @@ declare function useDeleteConfig(): _tanstack_react_query.UseMutationResult<{
  *
  *   save(instrument, field, value, title?)  one field (a switch)
  *   saveDelta(changes, title?)               several at once: { Agents: { ENABLED: true, … } }
- */
-declare function useSaveConfigField(): {
-    save: (instrument: string, field: string, value: unknown, title?: string) => void;
+ *
+ * `baseConfigId`: the config a host shows (it can differ from the chat's), which saves build on
+ * instead. Each save reads it first, so one made while it loads keeps its overrides, and builds on
+ * the config the previous save made, so quick edits keep each other, also once the host shows a
+ * config one of them made. The config a save makes becomes the chat's (`session.chatModel`), so
+ * the host shows and uses it. A base that cannot be read is reported like a refused save.
+ */
+declare function useSaveConfigField(baseConfigId?: string | null): {
+    save: (instrument: string, field: string, value: unknown, title?: string) => undefined;
     saveDelta: (changes: Record<string, Record<string, unknown>>, title?: string) => Promise<{
         external_id: string;
         title: string | null;

package/dist/index.d.ts

@@ -2321,9 +2321,15 @@ declare function useDeleteConfig(): _tanstack_react_query.UseMutationResult<{
  *
  *   save(instrument, field, value, title?)  one field (a switch)
  *   saveDelta(changes, title?)               several at once: { Agents: { ENABLED: true, … } }
- */
-declare function useSaveConfigField(): {
-    save: (instrument: string, field: string, value: unknown, title?: string) => void;
+ *
+ * `baseConfigId`: the config a host shows (it can differ from the chat's), which saves build on
+ * instead. Each save reads it first, so one made while it loads keeps its overrides, and builds on
+ * the config the previous save made, so quick edits keep each other, also once the host shows a
+ * config one of them made. The config a save makes becomes the chat's (`session.chatModel`), so
+ * the host shows and uses it. A base that cannot be read is reported like a refused save.
+ */
+declare function useSaveConfigField(baseConfigId?: string | null): {
+    save: (instrument: string, field: string, value: unknown, title?: string) => undefined;
     saveDelta: (changes: Record<string, Record<string, unknown>>, title?: string) => Promise<{
         external_id: string;
         title: string | null;

package/dist/index.js

@@ -1459,41 +1459,94 @@ function configDelta(active, defaults) {
   }
   return delta;
 }
-function useSaveConfigField() {
+function deltaOnto(changes, active, defaults) {
+  const delta = configDelta(active, defaults);
+  for (const [instrument, fields] of Object.entries(changes)) {
+    delta[instrument] = { ...delta[instrument] ?? {}, ...fields };
+    const defaultInstrument = defaults[instrument];
+    if (defaultInstrument) {
+      const instrumentDelta = delta[instrument];
+      for (const [field, value] of Object.entries(fields)) {
+        if (JSON.stringify(value) === JSON.stringify(defaultInstrument[field])) {
+          delete instrumentDelta[field];
+        }
+      }
+      if (Object.keys(instrumentDelta).length === 0) delete delta[instrument];
+    }
+  }
+  return delta;
+}
+function useSaveConfigField(baseConfigId) {
+  const arbi = useArbi();
+  const queryClient = useQueryClient();
   const saveConfig = useSaveConfig();
   const { data: defaultConfig } = useConfig("default");
   const chatModel = useArbiSessionState((state) => state.chatModel);
   const { data: userSettings } = useUserSettings();
-  const activeConfigId = chatModel || userSettings?.last_config || "default";
+  const activeConfigId = baseConfigId || chatModel || userSettings?.last_config || "default";
   const { data: activeConfigData } = useConfig(activeConfigId);
-  const buildDelta = (changes) => {
-    const defaults = defaultConfig ?? {};
-    const active = activeConfigData ?? {};
-    const delta = configDelta(active, defaults);
-    for (const [instrument, fields] of Object.entries(changes)) {
-      delta[instrument] = { ...delta[instrument] ?? {}, ...fields };
-      const defaultInstrument = defaults[instrument];
-      if (defaultInstrument) {
-        const instrumentDelta = delta[instrument];
-        for (const [field, value] of Object.entries(fields)) {
-          if (JSON.stringify(value) === JSON.stringify(defaultInstrument[field])) {
-            delete instrumentDelta[field];
-          }
+  const session = useArbiSessionStore();
+  const chain = useRef(null);
+  const buildDelta = (changes) => deltaOnto(
+    changes,
+    activeConfigData ?? {},
+    defaultConfig ?? {}
+  );
+  const readConfig = (configId) => queryClient.fetchQuery({
+    queryKey: arbiQueryKeys.config(configId),
+    queryFn: () => arbi.agentConfig.get(configId),
+    staleTime: 10 * 60 * 1e3
+  });
+  const saveOnBase = (base, changes, title) => {
+    const current = chain.current?.ids.has(base) ? chain.current : null;
+    const ids = current?.ids ?? /* @__PURE__ */ new Set([base]);
+    const from = current?.latest ?? Promise.resolve(base);
+    const saved = from.then(async (configId) => {
+      const [defaults, active] = await Promise.all([
+        readConfig("default"),
+        readConfig(configId)
+      ]).catch((error) => {
+        notify.error(formatConfigValidationError(error), {
+          description: "Configuration not saved \u2014 the settings it builds on could not be read."
+        });
+        throw error;
+      });
+      const response = await saveConfig.mutateAsync({
+        ...deltaOnto(changes, active ?? {}, defaults ?? {}),
+        title
+      });
+      if (response?.external_id) {
+        ids.add(response.external_id);
+        const { chatModel: chatModel2 } = session.getState();
+        const followsSettings = !chatModel2 && base === userSettings?.last_config;
+        if (chain.current?.ids === ids && !followsSettings) {
+          session.setChatModel(response.external_id);
         }
-        if (Object.keys(instrumentDelta).length === 0) delete delta[instrument];
       }
-    }
-    return delta;
+      return { response, configId: response?.external_id ?? configId };
+    });
+    chain.current = {
+      ids,
+      latest: Promise.all([from, saved]).then(
+        ([, done]) => done.configId,
+        () => from
+      )
+    };
+    return saved.then(({ response }) => response);
   };
   return {
-    save: (instrument, field, value, title) => saveConfig.mutate({
-      ...buildDelta({ [instrument]: { [field]: value } }),
-      title: title ?? `prefs-${Date.now()}`
-    }),
-    saveDelta: (changes, title) => saveConfig.mutateAsync({
-      ...buildDelta(changes),
-      title: title ?? `prefs-${Date.now()}`
-    }),
+    save: (instrument, field, value, title) => {
+      const changes = { [instrument]: { [field]: value } };
+      const name = title ?? `prefs-${Date.now()}`;
+      if (baseConfigId) return void saveOnBase(baseConfigId, changes, name).catch(() => {
+      });
+      saveConfig.mutate({ ...buildDelta(changes), title: name });
+    },
+    saveDelta: (changes, title) => {
+      const name = title ?? `prefs-${Date.now()}`;
+      if (baseConfigId) return saveOnBase(baseConfigId, changes, name);
+      return saveConfig.mutateAsync({ ...buildDelta(changes), title: name });
+    },
     isPending: saveConfig.isPending
   };
 }