@agent-native/core 0.12.17 → 0.12.19

package/dist/server/core-routes-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core-routes-plugin.d.ts","sourceRoot":"","sources":["../../src/server/core-routes-plugin.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAKlC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AA4EvD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,mBAAmB,CAAC;AA8EvD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,MAAM,GAAG,IAAI,CAWf;AAUD,KAAK,cAAc,GAAG,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9D,MAAM,WAAW,uBAAuB;IACtC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oDAAoD;IACpD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2DAA2D;IAC3D,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qEAAqE;IACrE,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC7E;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,GAAE,uBAA4B,GACpC,cAAc,CAqyDhB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,EAAE,cAAyC,CAAC"}
+{"version":3,"file":"core-routes-plugin.d.ts","sourceRoot":"","sources":["../../src/server/core-routes-plugin.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAKlC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AA4EvD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,mBAAmB,CAAC;AAoFvD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,MAAM,GAAG,IAAI,CAWf;AAUD,KAAK,cAAc,GAAG,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9D,MAAM,WAAW,uBAAuB;IACtC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oDAAoD;IACpD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2DAA2D;IAC3D,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qEAAqE;IACrE,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC7E;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,GAAE,uBAA4B,GACpC,cAAc,CA2zDhB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,EAAE,cAAyC,CAAC"}

package/dist/server/core-routes-plugin.js

@@ -29,7 +29,7 @@ import { runWithRequestContext } from "./request-context.js";
 import { createVoiceProvidersStatusHandler } from "./voice-providers-status.js";
 import { PROVIDER_ENV_META } from "../agent/engine/provider-env-vars.js";
 import { canUpdateAgentLoopSettings, readAgentLoopSettings, resetAgentLoopSettings, validateMaxIterationsInput, writeAgentLoopSettings, } from "../agent/loop-settings.js";
-import { isAgentEngineSettingConfigured, getAgentEngineEntry, detectEngineFromEnv, detectEngineFromUserSecrets, isStoredEngineUsable, } from "../agent/engine/registry.js";
+import { isAgentEngineSettingConfigured, getAgentEngineEntry, detectEngineFromEnv, detectEngineFromUserSecrets, isStoredEngineUsableForRequest, } from "../agent/engine/registry.js";
 import { registerBuiltinEngines } from "../agent/engine/builtin.js";
 import { getOrgContext } from "../org/context.js";
 import { isEnvVarWriteAllowed } from "./env-var-writes.js";
@@ -46,12 +46,6 @@ async function detectUsageEngineName(event, userEmail) {
         if (isAgentEngineSettingConfigured(stored)) {
             return stored.engine;
         }
-        if (stored && typeof stored.engine === "string") {
-            const entry = getAgentEngineEntry(stored.engine);
-            if (entry && isStoredEngineUsable(stored, entry)) {
-                return stored.engine;
-            }
-        }
         let orgId;
         if (userEmail) {
             try {
@@ -63,6 +57,15 @@ async function detectUsageEngineName(event, userEmail) {
             }
         }
         const detectedFromUser = await runWithRequestContext({ userEmail, orgId }, () => detectEngineFromUserSecrets());
+        if (detectedFromUser?.name === "builder")
+            return detectedFromUser.name;
+        if (stored && typeof stored.engine === "string") {
+            const entry = getAgentEngineEntry(stored.engine);
+            if (entry &&
+                (await runWithRequestContext({ userEmail, orgId }, () => isStoredEngineUsableForRequest(stored, entry)))) {
+                return stored.engine;
+            }
+        }
         if (detectedFromUser)
             return detectedFromUser.name;
         return detectEngineFromEnv()?.name ?? null;
@@ -1091,6 +1094,16 @@ export function createCoreRoutesPlugin(options = {}) {
             try {
                 const session = await getSession(event).catch(() => null);
                 const userEmail = session?.email;
+                let orgId;
+                if (userEmail) {
+                    try {
+                        const orgCtx = await getOrgContext(event);
+                        orgId = orgCtx.orgId ?? undefined;
+                    }
+                    catch {
+                        /* org module not present in this template */
+                    }
+                }
                 const stored = (await getSetting("agent-engine"));
                 if (isAgentEngineSettingConfigured(stored)) {
                     return {
@@ -1099,9 +1112,23 @@ export function createCoreRoutesPlugin(options = {}) {
                         source: "settings",
                     };
                 }
+                // Per-user app_secrets — a user who connected Builder (or pasted
+                // their own provider key) may not have any deploy-level env vars
+                // set, so check their per-user secret store before reporting "no
+                // engine configured" and re-showing the onboarding gate.
+                const detectedFromUser = await runWithRequestContext({ userEmail, orgId }, () => detectEngineFromUserSecrets());
+                if (detectedFromUser?.name === "builder") {
+                    return {
+                        configured: true,
+                        engine: detectedFromUser.name,
+                        source: "app_secrets",
+                        envVar: detectedFromUser.requiredEnvVars[0],
+                    };
+                }
                 if (stored && typeof stored.engine === "string") {
                     const entry = getAgentEngineEntry(stored.engine);
-                    if (entry && isStoredEngineUsable(stored, entry)) {
+                    if (entry &&
+                        (await runWithRequestContext({ userEmail, orgId }, () => isStoredEngineUsableForRequest(stored, entry)))) {
                         return {
                             configured: true,
                             engine: stored.engine,
@@ -1110,11 +1137,6 @@ export function createCoreRoutesPlugin(options = {}) {
                         };
                     }
                 }
-                // Per-user app_secrets — a user who connected Builder (or pasted
-                // their own provider key) may not have any deploy-level env vars
-                // set, so check their per-user secret store before reporting "no
-                // engine configured" and re-showing the onboarding gate.
-                const detectedFromUser = await runWithRequestContext({ userEmail }, () => detectEngineFromUserSecrets());
                 if (detectedFromUser) {
                     return {
                         configured: true,