@mastra/factory 0.1.0-alpha.3 → 0.1.0-alpha.5

package/dist/routes/surface.d.ts

@@ -11,8 +11,10 @@ import type { SandboxFleet } from '../sandbox/fleet.js';
 import type { StateSigner } from '../state-signing.js';
 import type { AuditEmitter } from '../storage/domains/audit/domain.js';
 import type { ModelCredentialsStorage } from '../storage/domains/credentials/base.js';
+import type { CustomProvidersStorage } from '../storage/domains/custom-providers/base.js';
 import type { IntakeStorage } from '../storage/domains/intake/base.js';
 import type { IntegrationStorage } from '../storage/domains/integrations/base.js';
+import type { MemorySettingsStorage } from '../storage/domains/memory-settings/base.js';
 import type { ModelPacksStorage } from '../storage/domains/model-packs/base.js';
 import type { FactoryProjectsStorage } from '../storage/domains/projects/base.js';
 import type { QueueHealthStorage } from '../storage/domains/queue-health/base.js';
@@ -44,6 +46,8 @@ export interface FactoryApiRoutesDeps {
     domains: {
         intake: IntakeStorage;
         modelCredentials: ModelCredentialsStorage;
+        memorySettings: MemorySettingsStorage;
+        customProviders: CustomProvidersStorage;
         modelPacks: ModelPacksStorage;
         projects: FactoryProjectsStorage;
         queueHealth: QueueHealthStorage;

package/dist/routes/surface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"surface.d.ts","sourceRoot":"","sources":["../../src/routes/surface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"surface.d.ts","sourceRoot":"","sources":["../../src/routes/surface.ts"],"names":[],"mappings":"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"}

package/dist/routes/surface.js

@@ -11163,8 +11163,10 @@ function assertIdentifier(kind, name) {
   }
 }
 function isUniqueViolation(error) {
+  const code = typeof error === "object" && error !== null ? error.code : void 0;
+  if (code === "SQLITE_CONSTRAINT_UNIQUE" || code === "SQLITE_CONSTRAINT_PRIMARYKEY") return true;
   const message = error instanceof Error ? error.message : String(error);
-  return message.includes("UNIQUE constraint failed") || message.includes("SQLITE_CONSTRAINT");
+  return message.includes("UNIQUE constraint failed") || message.includes("SQLITE_CONSTRAINT_UNIQUE") || message.includes("SQLITE_CONSTRAINT_PRIMARYKEY");
 }
 function primaryKeyOf(schema) {
   const pks = Object.entries(schema.columns).filter(([, spec]) => spec.type === "uuid-pk" || spec.primaryKey);
@@ -24103,6 +24105,35 @@ ${unreflectedContent}` : bufferedReflection;
         if (spec.default !== void 0) ddl += ` DEFAULT ${serializeDefault(spec.default)}`;
         return ddl;
       }
+      /**
+       * A table created by an older schema may still say NOT NULL on a column the
+       * current schema declares nullable — inserts of null then fail on databases
+       * that predate the change. SQLite has no `ALTER COLUMN DROP NOT NULL`, so
+       * relaxation swaps in a table rebuilt from the current schema (create shadow
+       * → copy → drop → rename) atomically.
+       */
+      async #relaxDriftedNotNulls(schema) {
+        const info = await this.#client.execute(`PRAGMA table_info("${schema.name}")`);
+        const hasDrift = info.rows.some((row) => {
+          const spec = schema.columns[String(row.name)];
+          if (!spec || spec.type === "uuid-pk" || spec.primaryKey) return false;
+          return spec.nullable === true && Number(row.notnull) === 1;
+        });
+        if (!hasDrift) return;
+        const ddl = Object.entries(schema.columns).map(([name, spec]) => this.#columnDdl(name, spec));
+        const shadow = `${schema.name}__nullable_rebuild`;
+        const cols = Object.keys(schema.columns).map((name) => `"${name}"`).join(", ");
+        await this.#client.batch(
+          [
+            `DROP TABLE IF EXISTS "${shadow}"`,
+            `CREATE TABLE "${shadow}" (${ddl.join(", ")})`,
+            `INSERT INTO "${shadow}" (${cols}) SELECT ${cols} FROM "${schema.name}"`,
+            `DROP TABLE "${schema.name}"`,
+            `ALTER TABLE "${shadow}" RENAME TO "${schema.name}"`
+          ],
+          "write"
+        );
+      }
       async #ensureCollection(schema) {
         assertIdentifier("collection", schema.name);
         primaryKeyOf(schema);
@@ -24114,6 +24145,7 @@ ${unreflectedContent}` : bufferedReflection;
           if (existing.has(name)) continue;
           await this.#client.execute(`ALTER TABLE "${schema.name}" ADD COLUMN ${this.#columnDdl(name, spec)}`);
         }
+        await this.#relaxDriftedNotNulls(schema);
         for (const index of schema.uniqueIndexes ?? []) {
           assertIdentifier("index", index.name);
           index.columns.forEach((column) => assertIdentifier("column", column));
@@ -25410,19 +25442,9 @@ var FactoryTransitionService = class {
 };
 
 // src/routes/config.ts
-import { removeCustomPackFromSettings } from "@mastra/code-sdk/onboarding/custom-packs";
-import {
-  removeCustomProviderFromSettings,
-  upsertCustomProviderInSettings
-} from "@mastra/code-sdk/onboarding/custom-providers";
-import { applyOmRoleOverride, persistOmObserveAttachments } from "@mastra/code-sdk/onboarding/om-settings";
+import { DEFAULT_OM_MODEL_ID } from "@mastra/code-sdk/constants";
 import { getAvailableModePacks } from "@mastra/code-sdk/onboarding/packs";
-import {
-  getCustomProviderId,
-  loadSettings,
-  saveSettings,
-  THREAD_ACTIVE_MODEL_PACK_ID_KEY
-} from "@mastra/code-sdk/onboarding/settings";
+import { getCustomProviderId, THREAD_ACTIVE_MODEL_PACK_ID_KEY } from "@mastra/code-sdk/onboarding/settings";
 import { registerApiRoute } from "@mastra/core/server";
 
 // src/routes/provider-credentials.ts
@@ -25537,15 +25559,39 @@ async function listProviders({
   }
   return Array.from(seen.values()).sort((a, b) => a.provider.localeCompare(b.provider));
 }
-function listCustomProviders() {
-  const settings = loadSettings();
-  return settings.customProviders.map((p) => ({
-    id: getCustomProviderId(p.name),
-    name: p.name,
-    url: p.url,
-    hasApiKey: Boolean(p.apiKey),
-    models: p.models
-  }));
+function toCustomProviderInfo(record) {
+  return {
+    id: record.providerId,
+    name: record.name,
+    url: record.url,
+    hasApiKey: Boolean(record.apiKey),
+    models: record.models
+  };
+}
+async function resolveCustomProvidersContext({
+  c,
+  auth,
+  customProviders
+}) {
+  await auth.ensureUser(c);
+  const tenant = auth.tenant(c);
+  if (!tenant && auth.enabled()) return { response: c.json({ error: "unauthorized" }, 401) };
+  if (customProviders) {
+    try {
+      await customProviders.ensureReady();
+      return tenant ? { storage: customProviders, orgId: tenantOrgId(tenant), userId: tenant.userId } : { storage: customProviders, orgId: "local", userId: "local" };
+    } catch {
+    }
+  }
+  return {
+    response: c.json(
+      {
+        error: "custom_providers_unavailable",
+        message: "Custom provider storage is unavailable \u2014 the app database is not configured or failed to start."
+      },
+      503
+    )
+  };
 }
 function parseCustomProviderBody(body) {
   if (!body || typeof body !== "object") return { error: "Invalid JSON body" };
@@ -25610,15 +25656,6 @@ async function buildProviderAccess({
 function canUseModelProvider(access, provider) {
   return Boolean(access[provider]);
 }
-async function getTenantModelPacksStorage(modelPacks) {
-  if (!modelPacks) return void 0;
-  try {
-    await modelPacks.ensureReady();
-  } catch {
-    return void 0;
-  }
-  return modelPacks;
-}
 async function resolvePackContext({
   c,
   auth,
@@ -25626,23 +25663,23 @@ async function resolvePackContext({
 }) {
   await auth.ensureUser(c);
   const tenant = auth.tenant(c);
-  if (!tenant) {
-    if (auth.enabled()) return { response: c.json({ error: "unauthorized" }, 401) };
-    return { mode: "local" };
-  }
-  const storage = await getTenantModelPacksStorage(modelPacks);
-  if (!storage) {
-    return {
-      response: c.json(
-        {
-          error: "model_packs_unavailable",
-          message: "Model pack storage is unavailable \u2014 the app database is not configured or failed to start."
-        },
-        503
-      )
-    };
+  if (!tenant && auth.enabled()) return { response: c.json({ error: "unauthorized" }, 401) };
+  if (modelPacks) {
+    try {
+      await modelPacks.ensureReady();
+      return tenant ? { storage: modelPacks, orgId: tenantOrgId(tenant), userId: tenant.userId } : { storage: modelPacks, orgId: "local", userId: "local" };
+    } catch {
+    }
   }
-  return { mode: "tenant", storage, orgId: tenantOrgId(tenant), userId: tenant.userId };
+  return {
+    response: c.json(
+      {
+        error: "model_packs_unavailable",
+        message: "Model pack storage is unavailable \u2014 the app database is not configured or failed to start."
+      },
+      503
+    )
+  };
 }
 function recordToModePack(record) {
   return { id: `custom:${record.id}`, name: record.name, description: "Saved custom pack", models: record.models };
@@ -25655,7 +25692,7 @@ async function listModelPacks({
   activePackId
 }) {
   const access = await buildProviderAccess({ controller, authStorage, tenantCredentials });
-  const packs = packContext.mode === "local" ? getAvailableModePacks(access, loadSettings().customModelPacks) : [
+  const packs = [
     ...getAvailableModePacks(access),
     ...(await packContext.storage.list({ orgId: packContext.orgId })).map(recordToModePack)
   ];
@@ -25713,20 +25750,57 @@ function readOMConfig(session) {
     observeAttachments: observeAttachments === true || observeAttachments === false ? observeAttachments : "auto"
   };
 }
-function persistOmThreshold({ role, value }) {
-  const settings = loadSettings();
-  if (role === "observation") settings.models.omObservationThreshold = value;
-  else settings.models.omReflectionThreshold = value;
-  saveSettings(settings);
-}
-function persistOmRoleOverride({
-  role,
-  modelId,
-  otherRoleCurrentModelId
+async function resolveMemorySettingsContext({
+  c,
+  auth,
+  memorySettings
 }) {
-  const settings = loadSettings();
-  applyOmRoleOverride(settings, role, modelId, otherRoleCurrentModelId);
-  saveSettings(settings);
+  await auth.ensureUser(c);
+  const tenant = auth.tenant(c);
+  if (!tenant && auth.enabled()) return { response: c.json({ error: "unauthorized" }, 401) };
+  if (memorySettings) {
+    try {
+      await memorySettings.ensureReady();
+      return tenant ? { storage: memorySettings, orgId: tenantOrgId(tenant), userId: tenant.userId } : { storage: memorySettings, orgId: "local", userId: "local" };
+    } catch {
+    }
+  }
+  return {
+    response: c.json(
+      {
+        error: "memory_settings_unavailable",
+        message: "Memory settings storage is unavailable \u2014 the app database is not configured or failed to start."
+      },
+      503
+    )
+  };
+}
+async function persistMemorySettings(context, patch, fillIfUnset) {
+  await context.storage.patch({ orgId: context.orgId, userId: context.userId, patch, fillIfUnset });
+}
+async function hydrateSessionMemorySettings(session, record) {
+  for (const role of ["observer", "reflector"]) {
+    const stored = role === "observer" ? record?.observerModelId : record?.reflectorModelId;
+    const target = stored ?? DEFAULT_OM_MODEL_ID;
+    if (session.om[role].modelId() !== target) {
+      await session.om[role].switchModel({ modelId: target });
+    }
+  }
+  const state = session.state.get() ?? {};
+  const updates = {};
+  const observationThreshold = record?.observationThreshold ?? DEFAULT_OBSERVATION_THRESHOLD;
+  if (state.observationThreshold !== observationThreshold) {
+    updates.observationThreshold = observationThreshold;
+  }
+  const reflectionThreshold = record?.reflectionThreshold ?? DEFAULT_REFLECTION_THRESHOLD;
+  if (state.reflectionThreshold !== reflectionThreshold) {
+    updates.reflectionThreshold = reflectionThreshold;
+  }
+  const observeAttachments = record?.observeAttachments ?? "auto";
+  if ((state.observeAttachments ?? "auto") !== observeAttachments) {
+    updates.observeAttachments = observeAttachments;
+  }
+  if (Object.keys(updates).length > 0) await session.state.set(updates);
 }
 var ConfigRoutes = class extends Route {
   routes() {
@@ -25734,6 +25808,8 @@ var ConfigRoutes = class extends Route {
     const { controller, authStorage, auth } = options;
     const onCredentialsChanged = options.onCredentialsChanged ?? (() => {
     });
+    const onCustomProvidersChanged = options.onCustomProvidersChanged ?? (() => {
+    });
     return [
       registerApiRoute("/web/config/providers", {
         method: "GET",
@@ -25825,14 +25901,22 @@ var ConfigRoutes = class extends Route {
         }
       }),
       // ── Custom providers (OpenAI-compatible endpoints) ──────────────────────
-      // Mirrors the TUI's /custom-providers command. Backed by GlobalSettings
-      // (settings.json), not session state — these are user-global definitions.
+      // Mirrors the TUI's /custom-providers command, but backed by the
+      // `custom-providers` domain (org rows in tenant mode, a sentinel `local`
+      // org in no-auth mode) — the server never reads settings.json for these.
       registerApiRoute("/web/config/custom-providers", {
         method: "GET",
         requiresAuth: false,
-        handler: (c) => {
+        handler: async (c) => {
+          const ctx = await resolveCustomProvidersContext({
+            c: loose(c),
+            auth,
+            customProviders: options.customProviders
+          });
+          if ("response" in ctx) return ctx.response;
           try {
-            return c.json({ providers: listCustomProviders() });
+            const records = await ctx.storage.list({ orgId: ctx.orgId });
+            return c.json({ providers: records.map(toCustomProviderInfo) });
           } catch (error) {
             return c.json({ error: error instanceof Error ? error.message : String(error) }, 500);
           }
@@ -25842,6 +25926,12 @@ var ConfigRoutes = class extends Route {
         method: "POST",
         requiresAuth: false,
         handler: async (c) => {
+          const ctx = await resolveCustomProvidersContext({
+            c: loose(c),
+            auth,
+            customProviders: options.customProviders
+          });
+          if ("response" in ctx) return ctx.response;
           let body;
           try {
             body = await c.req.json();
@@ -25852,11 +25942,20 @@ var ConfigRoutes = class extends Route {
           if ("error" in parsed) return c.json({ error: parsed.error }, 400);
           const previousId = body && typeof body === "object" && typeof body.previousId === "string" ? body.previousId : void 0;
           try {
-            const settings = loadSettings();
-            upsertCustomProviderInSettings(settings, parsed, previousId);
-            saveSettings(settings);
-            const id = getCustomProviderId(parsed.name);
-            return c.json({ ok: true, provider: listCustomProviders().find((p) => p.id === id) });
+            const record = await ctx.storage.upsert({
+              orgId: ctx.orgId,
+              userId: ctx.userId,
+              input: {
+                providerId: getCustomProviderId(parsed.name),
+                name: parsed.name,
+                url: parsed.url,
+                apiKey: parsed.apiKey,
+                models: parsed.models
+              },
+              previousProviderId: previousId
+            });
+            onCustomProvidersChanged({ orgId: ctx.orgId });
+            return c.json({ ok: true, provider: toCustomProviderInfo(record) });
           } catch (error) {
             return c.json({ error: error instanceof Error ? error.message : String(error) }, 500);
           }
@@ -25865,12 +25964,17 @@ var ConfigRoutes = class extends Route {
       registerApiRoute("/web/config/custom-providers/:id", {
         method: "DELETE",
         requiresAuth: false,
-        handler: (c) => {
+        handler: async (c) => {
+          const ctx = await resolveCustomProvidersContext({
+            c: loose(c),
+            auth,
+            customProviders: options.customProviders
+          });
+          if ("response" in ctx) return ctx.response;
           const id = c.req.param("id");
           try {
-            const settings = loadSettings();
-            removeCustomProviderFromSettings(settings, id);
-            saveSettings(settings);
+            await ctx.storage.delete({ orgId: ctx.orgId, providerId: id });
+            onCustomProvidersChanged({ orgId: ctx.orgId });
             return c.json({ ok: true });
           } catch (error) {
             return c.json({ error: error instanceof Error ? error.message : String(error) }, 500);
@@ -25899,8 +26003,30 @@ var ConfigRoutes = class extends Route {
                 tenantCredentials
               })
             ]);
+            const catalog = models.filter((m) => canUseModelProvider(access, m.provider) && typeof m.id === "string").map((m) => ({ id: m.id, provider: m.provider, modelName: m.modelName, hasApiKey: true }));
+            if (options.customProviders) {
+              try {
+                const ctx = await resolveCustomProvidersContext({
+                  c: loose(c),
+                  auth,
+                  customProviders: options.customProviders
+                });
+                if (!("response" in ctx)) {
+                  const known = new Set(catalog.map((m) => m.id));
+                  for (const record of await ctx.storage.list({ orgId: ctx.orgId })) {
+                    for (const model of record.models) {
+                      const id = `${record.providerId}/${model}`;
+                      if (known.has(id)) continue;
+                      known.add(id);
+                      catalog.push({ id, provider: record.providerId, modelName: model, hasApiKey: true });
+                    }
+                  }
+                }
+              } catch {
+              }
+            }
             return c.json({
-              models: models.filter((m) => canUseModelProvider(access, m.provider) && typeof m.id === "string").map((m) => ({ id: m.id, provider: m.provider, modelName: m.modelName, hasApiKey: true })).sort(
+              models: catalog.sort(
                 (a, b) => a.provider === b.provider ? a.id.localeCompare(b.id) : a.provider.localeCompare(b.provider)
               )
             });
@@ -25910,10 +26036,10 @@ var ConfigRoutes = class extends Route {
         }
       }),
       // ── Model packs ─────────────────────────────────────────────────────────
-      // Mirrors the TUI's /models-pack command. Custom-pack CRUD is DB-backed in
-      // tenant mode (model-packs storage domain, org-scoped) and settings.json in
-      // local mode; activation is session-scoped and resolves the session from
-      // the controller registry by resourceId.
+      // Mirrors the TUI's /models-pack command. Custom-pack CRUD lives in the
+      // model-packs storage domain (org-scoped, sentinel `local` org in no-auth
+      // mode — never settings.json); activation is session-scoped and resolves
+      // the session from the controller registry by resourceId.
       registerApiRoute("/web/config/model-packs", {
         method: "GET",
         requiresAuth: false,
@@ -25967,21 +26093,12 @@ var ConfigRoutes = class extends Route {
             return c.json({ error: "models.build, models.plan and models.fast are required" }, 400);
           }
           try {
-            if (packContext.mode === "tenant") {
-              const record = await packContext.storage.upsert({
-                orgId: packContext.orgId,
-                userId: packContext.userId,
-                input: { name, models: { build, plan, fast } }
-              });
-              return c.json({ ok: true, pack: recordToModePack(record) });
-            }
-            const settings = loadSettings();
-            const entry = { name, models: { build, plan, fast }, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
-            const idx = settings.customModelPacks.findIndex((p) => p.name === name);
-            if (idx >= 0) settings.customModelPacks[idx] = entry;
-            else settings.customModelPacks.push(entry);
-            saveSettings(settings);
-            return c.json({ ok: true, pack: { id: `custom:${name}`, name, models: { build, plan, fast } } });
+            const record = await packContext.storage.upsert({
+              orgId: packContext.orgId,
+              userId: packContext.userId,
+              input: { name, models: { build, plan, fast } }
+            });
+            return c.json({ ok: true, pack: recordToModePack(record) });
           } catch (error) {
             return c.json({ error: error instanceof Error ? error.message : String(error) }, 500);
           }
@@ -25995,15 +26112,9 @@ var ConfigRoutes = class extends Route {
           if ("response" in packContext) return packContext.response;
           const id = decodeURIComponent(c.req.param("id"));
           try {
-            if (packContext.mode === "tenant") {
-              const recordId = id.startsWith("custom:") ? id.slice("custom:".length) : id;
-              const deleted = await packContext.storage.delete({ orgId: packContext.orgId, id: recordId });
-              return deleted ? c.json({ ok: true }) : c.json({ error: `Unknown pack "${id}"` }, 404);
-            }
-            const settings = loadSettings();
-            removeCustomPackFromSettings(settings, id);
-            saveSettings(settings);
-            return c.json({ ok: true });
+            const recordId = id.startsWith("custom:") ? id.slice("custom:".length) : id;
+            const deleted = await packContext.storage.delete({ orgId: packContext.orgId, id: recordId });
+            return deleted ? c.json({ ok: true }) : c.json({ error: `Unknown pack "${id}"` }, 404);
           } catch (error) {
             return c.json({ error: error instanceof Error ? error.message : String(error) }, 500);
           }
@@ -26050,8 +26161,10 @@ var ConfigRoutes = class extends Route {
       }),
       // ── Observational memory ──────────────────────────────────────────────────
       // Mirrors the TUI's /om command. All five knobs are session-scoped (resolved
-      // from the session, persisted to its state + thread setting) plus written to
-      // GlobalSettings so the choice survives restarts and stays in sync with the TUI.
+      // from the session, persisted to its state + thread setting) and durably
+      // stored in the per-(org, user) `memory-settings` app table — never
+      // settings.json. GET hydrates the session from the stored row first so the
+      // DB, not the SDK's boot-time seed, is the source of truth.
       registerApiRoute("/web/config/om", {
         method: "GET",
         requiresAuth: false,
@@ -26059,9 +26172,17 @@ var ConfigRoutes = class extends Route {
           const resourceId = c.req.query("resourceId");
           const scope = c.req.query("scope") || void 0;
           if (!resourceId) return c.json({ error: "Missing required query param: resourceId" }, 400);
+          const context = await resolveMemorySettingsContext({
+            c: loose(c),
+            auth,
+            memorySettings: options.memorySettings
+          });
+          if ("response" in context) return context.response;
           try {
             const session = await controller.getSessionByResource?.(resourceId, scope);
             if (!session) return c.json({ error: `No session for resourceId "${resourceId}"` }, 404);
+            const record = await context.storage.get({ orgId: context.orgId, userId: context.userId });
+            await hydrateSessionMemorySettings(session, record);
             return c.json({ config: readOMConfig(session) });
           } catch (error) {
             return c.json({ error: error instanceof Error ? error.message : String(error) }, 500);
@@ -26087,13 +26208,24 @@ var ConfigRoutes = class extends Route {
           const modelId = typeof body.modelId === "string" ? body.modelId.trim() : "";
           if (!resourceId) return c.json({ error: "Missing required field: resourceId" }, 400);
           if (!modelId) return c.json({ error: "Missing required field: modelId" }, 400);
+          const context = await resolveMemorySettingsContext({
+            c: loose(c),
+            auth,
+            memorySettings: options.memorySettings
+          });
+          if ("response" in context) return context.response;
           try {
             const session = await controller.getSessionByResource?.(resourceId, scope);
             if (!session) return c.json({ error: `No session for resourceId "${resourceId}"` }, 404);
             const otherRole = role === "observer" ? session.om.reflector : session.om.observer;
             const otherRoleCurrentModelId = otherRole.modelId() ?? null;
             await session.om[role].switchModel({ modelId });
-            persistOmRoleOverride({ role, modelId, otherRoleCurrentModelId });
+            const otherKey = role === "observer" ? "reflectorModelId" : "observerModelId";
+            await persistMemorySettings(
+              context,
+              { [role === "observer" ? "observerModelId" : "reflectorModelId"]: modelId },
+              otherRoleCurrentModelId ? { [otherKey]: otherRoleCurrentModelId } : void 0
+            );
             return c.json({ ok: true, config: readOMConfig(session) });
           } catch (error) {
             return c.json({ error: error instanceof Error ? error.message : String(error) }, 500);
@@ -26118,19 +26250,27 @@ var ConfigRoutes = class extends Route {
           if (observation === void 0 && reflection === void 0) {
             return c.json({ error: "Provide observationThreshold and/or reflectionThreshold (positive numbers)" }, 400);
           }
+          const context = await resolveMemorySettingsContext({
+            c: loose(c),
+            auth,
+            memorySettings: options.memorySettings
+          });
+          if ("response" in context) return context.response;
           try {
             const session = await controller.getSessionByResource?.(resourceId, scope);
             if (!session) return c.json({ error: `No session for resourceId "${resourceId}"` }, 404);
             if (observation !== void 0) {
               await session.state.set({ observationThreshold: observation });
               await session.thread.setSetting({ key: "observationThreshold", value: observation });
-              persistOmThreshold({ role: "observation", value: observation });
             }
             if (reflection !== void 0) {
               await session.state.set({ reflectionThreshold: reflection });
               await session.thread.setSetting({ key: "reflectionThreshold", value: reflection });
-              persistOmThreshold({ role: "reflection", value: reflection });
             }
+            await persistMemorySettings(context, {
+              ...observation !== void 0 ? { observationThreshold: observation } : {},
+              ...reflection !== void 0 ? { reflectionThreshold: reflection } : {}
+            });
             return c.json({ ok: true, config: readOMConfig(session) });
           } catch (error) {
             return c.json({ error: error instanceof Error ? error.message : String(error) }, 500);
@@ -26155,12 +26295,18 @@ var ConfigRoutes = class extends Route {
           if (raw !== "auto" && raw !== true && raw !== false) {
             return c.json({ error: "value must be 'auto', true, or false" }, 400);
           }
+          const context = await resolveMemorySettingsContext({
+            c: loose(c),
+            auth,
+            memorySettings: options.memorySettings
+          });
+          if ("response" in context) return context.response;
           try {
             const session = await controller.getSessionByResource?.(resourceId, scope);
             if (!session) return c.json({ error: `No session for resourceId "${resourceId}"` }, 404);
             await session.state.set({ observeAttachments: value });
             await session.thread.setSetting({ key: "observeAttachments", value });
-            persistOmObserveAttachments(value);
+            await persistMemorySettings(context, { observeAttachments: value });
             return c.json({ ok: true, config: readOMConfig(session) });
           } catch (error) {
             return c.json({ error: error instanceof Error ? error.message : String(error) }, 500);
@@ -26171,6 +26317,13 @@ var ConfigRoutes = class extends Route {
   }
 };
 
+// src/routes/custom-provider-source.ts
+import { setCustomProvidersSource } from "@mastra/code-sdk/agents/custom-provider-source";
+var orgSnapshots = /* @__PURE__ */ new Map();
+function invalidateCustomProvidersSnapshots(tenant) {
+  orgSnapshots.delete(tenant.orgId);
+}
+
 // src/routes/fs.ts
 import { lstat, open, readdir, realpath, stat } from "fs/promises";
 import { homedir } from "os";
@@ -28475,7 +28628,10 @@ function assembleFactoryApiRoutes(deps) {
       authStorage: deps.authStorage,
       modelCredentials: deps.domains.modelCredentials,
       modelPacks: deps.domains.modelPacks,
-      onCredentialsChanged: invalidateTenantCredentialSnapshots
+      memorySettings: deps.domains.memorySettings,
+      customProviders: deps.domains.customProviders,
+      onCredentialsChanged: invalidateTenantCredentialSnapshots,
+      onCustomProvidersChanged: invalidateCustomProvidersSnapshots
     }).routes(),
     ...new OAuthRoutes({
       auth: deps.auth,