@agent-native/core 0.209.1 → 0.209.2-nightly-20261015213030

package/dist/problem-report/schema.js

@@ -0,0 +1,34 @@
+import { z } from "zod";
+export const RECORDER_EVENT_TYPES = [
+    "action",
+    "state",
+    "nav",
+    "error",
+    "toast",
+    "log",
+];
+// Loose objects: a field the recorder adds later is stored, not stripped.
+const recorderEventSchema = z.looseObject({
+    t: z.number(),
+    at: z.number(),
+    type: z.enum(RECORDER_EVENT_TYPES),
+    name: z.string().optional(),
+    ok: z.boolean().optional(),
+    status: z.number().optional(),
+    errorCode: z.string().optional(),
+    ms: z.number().optional(),
+    requestId: z.string().optional(),
+    data: z.record(z.string(), z.unknown()).optional(),
+});
+export const recorderReportSchema = z.looseObject({
+    app: z.string().max(200),
+    build: z.string(),
+    url: z.string(),
+    at: z.string(),
+    reason: z.enum(["user", "error", "test", "manual"]),
+    windowSeconds: z.number(),
+    events: z.array(recorderEventSchema),
+    watched: z.record(z.string(), z.unknown()),
+    pending: z.array(z.looseObject({ type: z.string(), name: z.string(), ageMs: z.number() })),
+    dropped: z.number(),
+});

package/dist/progress/routes.d.ts

@@ -2,6 +2,6 @@ export declare function createProgressHandler(): import("h3").EventHandlerWithFe
     error: string;
     ok?: undefined;
 } | {
-    ok: boolean;
     error?: undefined;
+    ok: boolean;
 }>>;

package/dist/provider-api/actions/custom-provider-registration.d.ts

@@ -76,7 +76,6 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
     }>>;
 }, z.core.$strip>>, {
     id?: undefined;
-    provider?: undefined;
     deleted?: undefined;
     message?: undefined;
     providers: {
@@ -89,44 +88,45 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
         updatedAt: number;
     }[];
     count: number;
+    provider?: undefined;
     found?: undefined;
     registered?: undefined;
     label?: undefined;
 } | {
     id?: undefined;
     deleted?: undefined;
+    count?: undefined;
     message?: undefined;
     providers?: undefined;
-    count?: undefined;
     found: boolean;
     provider: import("../custom-registry.js").CustomProviderConfig;
     registered?: undefined;
     label?: undefined;
 } | {
-    provider?: undefined;
     deleted?: undefined;
+    count?: undefined;
     message?: undefined;
     providers?: undefined;
-    count?: undefined;
+    provider?: undefined;
     found: boolean;
     id: string;
     registered?: undefined;
     label?: undefined;
 } | {
-    provider?: undefined;
+    count?: undefined;
     message?: undefined;
     providers?: undefined;
-    count?: undefined;
+    provider?: undefined;
     found?: undefined;
     deleted: boolean;
     id: string;
     registered?: undefined;
     label?: undefined;
 } | {
-    provider?: undefined;
     deleted?: undefined;
-    providers?: undefined;
     count?: undefined;
+    providers?: undefined;
+    provider?: undefined;
     found?: undefined;
     registered: boolean;
     id: string;

package/dist/provider-api/actions/provider-api.d.ts

@@ -317,9 +317,6 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         scope?: "org" | "user" | undefined;
     }, {
         message?: undefined;
-        id?: undefined;
-        deleted?: undefined;
-        provider?: undefined;
         providers: {
             id: string;
             label: string;
@@ -330,45 +327,48 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
             updatedAt: number;
         }[];
         count: number;
+        provider?: undefined;
         found?: undefined;
+        deleted?: undefined;
         registered?: undefined;
+        id?: undefined;
         label?: undefined;
     } | {
+        count?: undefined;
         message?: undefined;
-        id?: undefined;
-        deleted?: undefined;
         providers?: undefined;
-        count?: undefined;
         found: boolean;
         provider: import("../custom-registry.js").CustomProviderConfig;
+        deleted?: undefined;
         registered?: undefined;
+        id?: undefined;
         label?: undefined;
     } | {
+        count?: undefined;
         message?: undefined;
-        deleted?: undefined;
-        provider?: undefined;
         providers?: undefined;
-        count?: undefined;
+        provider?: undefined;
         found: boolean;
         id: string;
+        deleted?: undefined;
         registered?: undefined;
         label?: undefined;
     } | {
+        count?: undefined;
         message?: undefined;
-        provider?: undefined;
         providers?: undefined;
-        count?: undefined;
+        provider?: undefined;
         found?: undefined;
         deleted: boolean;
         id: string;
         registered?: undefined;
         label?: undefined;
     } | {
-        deleted?: undefined;
-        provider?: undefined;
-        providers?: undefined;
         count?: undefined;
+        providers?: undefined;
+        provider?: undefined;
         found?: undefined;
+        deleted?: undefined;
         registered: boolean;
         id: string;
         label: string;

package/dist/provider-api/corpus-jobs.d.ts

@@ -73,6 +73,7 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
     offset?: unknown;
     limit?: unknown;
 }, {
+    deleted?: undefined;
     jobs: {
         id: string;
         name: string;
@@ -83,7 +84,6 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
         updatedAt: string;
     }[];
     total: number;
-    deleted?: undefined;
     jobId?: undefined;
 } | {
     jobs?: undefined;
@@ -91,9 +91,9 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
     deleted: boolean;
     jobId: string;
 } | {
+    deleted?: undefined;
     jobs?: undefined;
     total?: undefined;
-    deleted?: undefined;
     jobId?: undefined;
     hits: Record<string, unknown>[];
     offset: number;

package/dist/resources/handlers.d.ts

@@ -39,8 +39,8 @@ export declare function handleUpdateResource(event: any): Promise<import("./stor
     error: string;
 }>;
 export declare function handleDeleteResource(event: any): Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/scripts/agent-engines/manage-agent-engine.js

@@ -3,7 +3,7 @@ import { CHATGPT_SUBSCRIPTION_ENGINE_NAME } from "../../agent/chatgpt-subscripti
 import { listChatGPTSubscriptionModels } from "../../agent/engine/chatgpt-subscription-engine.js";
 import { getAgentEngineEntry, isAgentEnginePackageInstalled, normalizeModelForEngine, resolveEngineAcceptsCustomModels, resolveEnginePreservesCustomModels, registerBuiltinEngines, } from "../../agent/engine/index.js";
 import { defaultModelMessagesForUser } from "../../localization/default-model-messages.js";
-import { getRequestOrgId, getRequestUserEmail, } from "../../server/request-context.js";
+import { getRequestContext, getRequestOrgId, getRequestUserEmail, } from "../../server/request-context.js";
 import { run as runList } from "./list-agent-engines.js";
 import { run as runSet, resolveDefaultModelEffective, effectiveConfigurationMessage, } from "./set-agent-engine.js";
 import { run as runTest } from "./test-agent-engine.js";
@@ -46,9 +46,11 @@ export const tool = {
 };
 function currentContext() {
     try {
+        const context = getRequestContext();
         return {
             userEmail: getRequestUserEmail(),
             orgId: getRequestOrgId(),
+            ...(context?.orgScope === "personal" ? { orgScope: "personal" } : {}),
         };
     }
     catch {
@@ -64,7 +66,7 @@ async function runGetAppDefault(args) {
         return "Error: appId is required";
     const ctx = currentContext();
     const settings = await readAgentAppModelDefaultSettings(ctx, appId);
-    const canUpdate = await canUpdateAgentAppModelDefaultSettings(ctx.userEmail, ctx.orgId);
+    const canUpdate = await canUpdateAgentAppModelDefaultSettings(ctx.userEmail, ctx.orgId, ctx.orgScope);
     return JSON.stringify({ ok: true, ...settings, canUpdate }, null, 2);
 }
 async function runSetAppDefault(args) {
@@ -79,6 +81,9 @@ async function runSetAppDefault(args) {
     if (!model)
         return "Error: model is required";
     const ctx = currentContext();
+    if (!ctx.orgId && ctx.orgScope !== "personal") {
+        return "Error: Organization scope could not be resolved.";
+    }
     if (engine === CHATGPT_SUBSCRIPTION_ENGINE_NAME) {
         if (ctx.orgId) {
             return "Error: ChatGPT plan access is personal and cannot be selected as an organization default.";
@@ -108,7 +113,7 @@ async function runSetAppDefault(args) {
         acceptsCustomModels,
         preserveCustomModels,
     });
-    const canUpdate = await canUpdateAgentAppModelDefaultSettings(ctx.userEmail, ctx.orgId);
+    const canUpdate = await canUpdateAgentAppModelDefaultSettings(ctx.userEmail, ctx.orgId, ctx.orgScope);
     if (!canUpdate) {
         return ctx.orgId
             ? "Error: Only organization owners and admins can change app model defaults."
@@ -141,7 +146,7 @@ async function runResetAppDefault(args) {
     if (!appId)
         return "Error: appId is required";
     const ctx = currentContext();
-    const canUpdate = await canUpdateAgentAppModelDefaultSettings(ctx.userEmail, ctx.orgId);
+    const canUpdate = await canUpdateAgentAppModelDefaultSettings(ctx.userEmail, ctx.orgId, ctx.orgScope);
     if (!canUpdate) {
         return ctx.orgId
             ? "Error: Only organization owners and admins can reset app model defaults."

package/dist/scripts/agent-engines/set-agent-engine.js

@@ -13,7 +13,7 @@ import { getAppConfig } from "../../app-config/index.js";
 import { CHATGPT_SUBSCRIPTION_LAB } from "../../labs/core-labs.js";
 import { getUserLabEnabled } from "../../labs/store.js";
 import { defaultModelMessagesForUser } from "../../localization/default-model-messages.js";
-import { getRequestOrgId, getRequestUserEmail, } from "../../server/request-context.js";
+import { getRequestContext, getRequestOrgId, getRequestUserEmail, } from "../../server/request-context.js";
 export const tool = {
     description: 'Set only the organization\'s default AI engine and model (or a no-organization user\'s personal default). Preserve every app override and explicit chat/automation model. For an app default, use manage-agent-engine with action="set-app-default"; inheritance requires action="reset-app-default". If the user\'s requested scope is ambiguous, clarify organization/personal versus app before changing anything. The result separates the saved default from the current app\'s effective model. Only organization owners and admins can change it. Use manage-agent-engine with action="list" first to see options and canUpdateDefault.',
     parameters: {
@@ -33,6 +33,9 @@ export const tool = {
 };
 export const DEFAULT_MODEL_ADMIN_REQUIRED_ERROR_CODE = "default_model_admin_required";
 export async function resolveDefaultModelEffective(ctx, appId, planned = {}) {
+    if (!ctx.orgId && ctx.orgScope !== "personal") {
+        throw new Error("Organization scope could not be resolved.");
+    }
     const credentialIdentity = ctx.userEmail
         ? { userEmail: ctx.userEmail, orgId: ctx.orgId }
         : undefined;
@@ -92,6 +95,9 @@ export function effectiveConfigurationMessage(effective, messages) {
 export async function selectDefaultAgentEngine(input, meta, ctx = {
     userEmail: getRequestUserEmail(),
     orgId: getRequestOrgId(),
+    ...(getRequestContext()?.orgScope === "personal"
+        ? { orgScope: "personal" }
+        : {}),
 }) {
     registerBuiltinEngines();
     const engineName = input.engine?.trim();

package/dist/server/action-discovery.js

@@ -386,6 +386,9 @@ export const ALWAYS_ON_CORE_ACTIONS = new Set([
     "set-tool-approval-policy",
     // The client's same-tick GET batching depends on it, so it cannot be gated.
     "get-actions-batch",
+    // The shared Report a problem entry calls these in every app.
+    "save-problem-report",
+    "read-problem-report",
 ]);
 export async function mergeCoreSharingActions(registry) {
     const entries = [
@@ -469,6 +472,14 @@ export async function mergeCoreSharingActions(registry) {
             () => import("../agent/actions/get-agentkit-capabilities.js"),
         ],
         ["upload-image", () => import("../file-upload/actions/upload-image.js")],
+        [
+            "save-problem-report",
+            () => import("../problem-report/actions/save-problem-report.js"),
+        ],
+        [
+            "read-problem-report",
+            () => import("../problem-report/actions/read-problem-report.js"),
+        ],
         [
             "get-file-storage",
             () => import("../file-upload/actions/get-file-storage.js"),

package/dist/server/action-routes.js

@@ -48,6 +48,7 @@ function currentBuildId() {
 }
 import { isLoopbackRequest, registerAuthPublicPaths } from "./auth.js";
 import { getH3App } from "./framework-request-handler.js";
+import { isDirectLoopbackRequest } from "./loopback.js";
 import { getVerifiedServiceIdentityFromEvent, getRequestIdentityAuthenticatedAtMs, getRequestIdentitySessionToken, hasExplicitPersonalOrgScope, markExplicitPersonalOrgScope, runWithRequestContext, } from "./request-context.js";
 const ROUTE_PREFIX = ACTION_ROUTE_PREFIX;
 const WEBMCP_ACTION_ROUTE_PREFIX = "/_agent-native/webmcp/actions";
@@ -815,6 +816,7 @@ function mountActionRoutesInternal(nitroApp, actions, options) {
                 requestOrigin: getForwardedRequestOrigin(event),
                 federationMembershipValidated: isFederationMembershipValidatedForEvent(event, userEmail, orgId),
                 isLoopbackRequest: isLoopbackRequest(event),
+                isDirectLoopbackRequest: isDirectLoopbackRequest(event),
             }, async () => {
                 if (typeof entry.maxBodyBytes === "number" && method !== "GET") {
                     const clRaw = getHeader(event, "content-length");

package/dist/server/agent-chat-ai-setup.d.ts

@@ -9,9 +9,8 @@ export declare function isBuilderChatSetupReady(input: {
 }): boolean;
 /**
  * Chat accepts the Builder gateway/OAuth lane, a usable BYOK API key, or a
- * configured OpenAI-compatible/Ollama endpoint. Engine selection by itself is
- * not readiness: ChatGPT subscription auth and untyped engine names do not
- * qualify.
+ * configured OpenAI-compatible/Ollama endpoint, or a usable personal ChatGPT
+ * subscription account. Engine selection by itself is not readiness.
  */
 export declare function isAgentChatAiSetupReady(input?: {
     status?: AgentEngineStatusResult;

package/dist/server/agent-chat-ai-setup.js

@@ -3,8 +3,9 @@ import { CHATGPT_SUBSCRIPTION_ENGINE_NAME } from "../agent/chatgpt-subscription-
 import { OLLAMA_BASE_URL_ENV_VAR, OPENAI_BASE_URL_ENV_VAR, PROVIDER_ENV_VARS, } from "../agent/engine/provider-env-vars.js";
 import { getAgentEngineEntry } from "../agent/engine/registry.js";
 import { hasUsableBuilderOAuthSessionForReadiness } from "./builder-oauth.js";
+import { hasChatGPTSubscriptionCredential } from "./chatgpt-subscription-oauth.js";
 import { assertCredentialStoreReadable, getProviderCredentialAuthFailure, prefetchSecrets, resolveBuilderGatewayCredentialsDetailed, resolveBuilderPrivateKey, resolveSecretDetailed, } from "./credential-provider.js";
-import { getRequestOrgId, getRequestUserEmail } from "./request-context.js";
+import { getRequestContext, getRequestOrgId, getRequestUserEmail, } from "./request-context.js";
 export const AGENT_CHAT_AI_SETUP_REQUIRED_CODE = "AGENT_CHAT_AI_SETUP_REQUIRED";
 export function isBuilderChatSetupReady(input) {
     return Boolean(input.oauthSessionUsable ||
@@ -13,9 +14,8 @@ export function isBuilderChatSetupReady(input) {
 }
 /**
  * Chat accepts the Builder gateway/OAuth lane, a usable BYOK API key, or a
- * configured OpenAI-compatible/Ollama endpoint. Engine selection by itself is
- * not readiness: ChatGPT subscription auth and untyped engine names do not
- * qualify.
+ * configured OpenAI-compatible/Ollama endpoint, or a usable personal ChatGPT
+ * subscription account. Engine selection by itself is not readiness.
  */
 export async function isAgentChatAiSetupReady(input) {
     if (input?.status && input.detectFromUserSecrets) {
@@ -42,6 +42,10 @@ export async function isAgentChatAiSetupReady(input) {
                 return true;
             unreadable ||= readiness.unreadable;
         }
+        const ownerEmail = getRequestUserEmail();
+        if (ownerEmail && (await hasEligibleChatGPTSubscription(ownerEmail))) {
+            return true;
+        }
         if (unreadable)
             throwAgentChatSetupReadUnavailable();
         return false;
@@ -103,8 +107,18 @@ export async function isAgentChatAiSetupReady(input) {
             assertCredentialStoreReadable(unreadable);
         throwAgentChatSetupReadUnavailable();
     }
+    if (ownerEmail && (await hasEligibleChatGPTSubscription(ownerEmail))) {
+        return true;
+    }
     return false;
 }
+async function hasEligibleChatGPTSubscription(ownerEmail) {
+    const requestContext = getRequestContext();
+    if (getRequestOrgId() || requestContext?.orgScope !== "personal") {
+        return false;
+    }
+    return hasChatGPTSubscriptionCredential(ownerEmail);
+}
 async function checkProviderEntryReadiness(entry) {
     if (!entry || !isChatSetupProviderEntry(entry)) {
         return { usable: false, unreadable: false };

package/dist/server/agent-chat-plugin.js

@@ -59,7 +59,7 @@ import { AGENT_CHAT_STREAM_PATH, AGENT_CHAT_STREAM_TOKEN_SUFFIX, AGENT_CHAT_STRE
 import { handleSharedThreadRequest, } from "./agent-chat/shared-thread.js";
 import { sortResourceSkills } from "./agent-chat/skill-frontmatter.js";
 import { discoverAgents } from "./agent-discovery.js";
-import { resolveAgentRunOrgId, resolveAgentRunOwnerContext, runWithAgentRunContext, seedAgentRunOwnerContext, seedBackgroundAgentRunOwnerContext, } from "./agent-run-context.js";
+import { resolveAgentRunOrgId, resolveAgentRunOrgScope, resolveAgentRunOwnerContext, runWithAgentRunContext, seedAgentRunOwnerContext, seedBackgroundAgentRunOwnerContext, } from "./agent-run-context.js";
 import { AGENT_TEAM_PROCESS_RUN_PATH, getCurrentDelegationDepth, processAgentTeamRun, reconcileStaleAgentTeamRuns, reconcileAgentTeamRunsForOwner, } from "./agent-teams.js";
 import { getSession, isLoopbackRequest, registerAuthPublicPaths, } from "./auth.js";
 import { captureError } from "./capture-error.js";
@@ -71,9 +71,11 @@ import { getOrigin } from "./google-oauth.js";
 import { readBody } from "./h3-helpers.js";
 import { loadHostedHarnessConfig } from "./hosted-harness-policy.js";
 import { startIntervalJob } from "./interval-job.js";
+import { isDirectLoopbackRequest } from "./loopback.js";
 import { getModelFamilyOverlay } from "./prompts/index.js";
 import { mountRealtimeVoiceRoutes } from "./realtime-voice.js";
 import { runWithRequestContext, getRequestContext, getRequestOrgId, getRequestUserEmail, getRequestRunContext, ensureRequestRunContext, } from "./request-context.js";
+import { getForwardedRequestOrigin } from "./request-origin.js";
 export { handleSharedThreadRequest };
 export function trackAgentChatRunLifecycle(event, threadId, attemptId, userId, properties = {}, appId, trackingSource) {
     if (!threadId?.trim() ||
@@ -3389,10 +3391,12 @@ export function createAgentChatPlugin(options) {
                 const owner = await getOwnerFromEvent(event);
                 const orgId = await getOrgIdFromEvent(event);
                 const { resolveOwnerEngineApiKey } = await import("../agent/production-agent.js");
-                const userApiKey = await resolveOwnerEngineApiKey({
-                    engineOption: options?.engine,
-                    ownerEmail: owner,
-                });
+                const userApiKey = owner
+                    ? await resolveOwnerEngineApiKey({
+                        engineOption: options?.engine,
+                        ownerEmail: owner,
+                    })
+                    : { apiKey: undefined, apiKeyEnvVar: undefined };
                 const runCtx = ensureRequestRunContext();
                 if (runCtx) {
                     runCtx.requestOrigin = getOrigin(event);
@@ -4150,14 +4154,27 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                 catch {
                     orgCtx = null;
                 }
-                const orgId = (options?.resolveOrgId
-                    ? await options.resolveOrgId(event)
-                    : (orgCtx?.orgId ?? session.orgId ?? null)) ?? null;
-                const canUpdate = await canUpdateAgentAppModelDefaultSettings(session.email, orgId);
+                const orgScope = await resolveAgentRunOrgScope({
+                    event,
+                    ownerContext: { owner: session.email, anonymous: false },
+                    resolveOrgId: options?.resolveOrgId,
+                });
+                if (!orgScope.orgId && orgScope.orgScope !== "personal") {
+                    return {
+                        ok: false,
+                        status: 503,
+                        error: "Organization scope is temporarily unavailable.",
+                    };
+                }
+                const orgId = orgScope.orgId ?? null;
+                const canUpdate = await canUpdateAgentAppModelDefaultSettings(session.email, orgId, orgScope.orgScope);
                 return {
                     ok: true,
                     userEmail: session.email,
                     orgId,
+                    ...(orgScope.orgScope === "personal"
+                        ? { orgScope: "personal" }
+                        : {}),
                     orgName: orgCtx?.orgId === orgId ? (orgCtx.orgName ?? null) : null,
                     role: orgCtx?.orgId === orgId ? (orgCtx.role ?? null) : null,
                     canUpdate,
@@ -4166,12 +4183,15 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
             const listModelDefaultEngineOptions = async (ctx, event) => {
                 registerBuiltinEngines();
                 const availableEngines = listAgentEngines();
-                const chatGPTEnabled = !ctx.orgId &&
+                const directLoopbackRequest = isDirectLoopbackRequest(event);
+                const chatGPTEnabled = directLoopbackRequest &&
+                    ctx.orgScope === "personal" &&
+                    !ctx.orgId &&
                     !!ctx.userEmail &&
                     availableEngines.some((entry) => entry.name === CHATGPT_SUBSCRIPTION_ENGINE_NAME) &&
                     (await getUserLabEnabled(ctx.userEmail, CHATGPT_SUBSCRIPTION_LAB));
                 // Provider model selections follow the setting scope. ChatGPT catalogs
-                // are user-scoped, so they are only available for personal defaults.
+                // are user-scoped, so organization defaults cannot use them.
                 const selectionScope = ctx.orgId ? "org" : "user";
                 const selections = new Map();
                 const modelsFor = async (entry) => {
@@ -4192,8 +4212,12 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                 return runWithRequestContext({
                     userEmail: ctx.userEmail,
                     orgId: ctx.orgId ?? undefined,
-                    requestOrigin: getOrigin(event),
+                    ...(ctx.orgScope === "personal"
+                        ? { orgScope: "personal" }
+                        : {}),
+                    requestOrigin: getForwardedRequestOrigin(event),
                     isLoopbackRequest: isLoopbackRequest(event),
+                    isDirectLoopbackRequest: isDirectLoopbackRequest(event),
                 }, async () => {
                     const chatGPTCatalog = chatGPTEnabled && ctx.userEmail
                         ? await listChatGPTSubscriptionModels(ctx.userEmail)
@@ -4224,7 +4248,11 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                 const ctx = await resolveModelDefaultsContext(event);
                 if (!ctx.ok)
                     return ctx;
-                const scope = { userEmail: ctx.userEmail, orgId: ctx.orgId };
+                const scope = {
+                    userEmail: ctx.userEmail,
+                    orgId: ctx.orgId,
+                    orgScope: ctx.orgScope,
+                };
                 const [settings, orgDefault] = await Promise.all([
                     readAgentAppModelDefaultSettings(scope, appId),
                     readDefaultAgentEngineSetting(scope),
@@ -4283,7 +4311,11 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     };
                 }
                 if (method === "DELETE") {
-                    await resetAgentAppModelDefaultSettings({ userEmail: ctx.userEmail, orgId: ctx.orgId }, appId);
+                    await resetAgentAppModelDefaultSettings({
+                        userEmail: ctx.userEmail,
+                        orgId: ctx.orgId,
+                        orgScope: ctx.orgScope,
+                    }, appId);
                     return buildModelDefaultsPayload(event, appId);
                 }
                 const body = await readBody(event).catch(() => ({}));
@@ -4322,8 +4354,12 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     const catalog = await runWithRequestContext({
                         userEmail: ctx.userEmail,
                         orgId: ctx.orgId ?? undefined,
-                        requestOrigin: getOrigin(event),
+                        ...(ctx.orgScope === "personal"
+                            ? { orgScope: "personal" }
+                            : {}),
+                        requestOrigin: getForwardedRequestOrigin(event),
                         isLoopbackRequest: isLoopbackRequest(event),
+                        isDirectLoopbackRequest: isDirectLoopbackRequest(event),
                     }, () => listChatGPTSubscriptionModels(ctx.userEmail));
                     if (!catalog.models.includes(model)) {
                         setResponseStatus(event, 400);
@@ -4339,7 +4375,11 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                         error: `Model "${model}" is not supported by Builder. Choose one of: ${entry.supportedModels.join(", ")}`,
                     };
                 }
-                await writeAgentAppModelDefaultSettings({ userEmail: ctx.userEmail, orgId: ctx.orgId }, targetAppId, { engine, model, updatedBy: ctx.userEmail });
+                await writeAgentAppModelDefaultSettings({
+                    userEmail: ctx.userEmail,
+                    orgId: ctx.orgId,
+                    orgScope: ctx.orgScope,
+                }, targetAppId, { engine, model, updatedBy: ctx.userEmail });
                 return buildModelDefaultsPayload(event, targetAppId);
             }));
             // Mount save-key BEFORE the prefix handler so it isn't shadowed.
@@ -4894,10 +4934,21 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     setResponseStatus(event, 400);
                     return { error: "message is required" };
                 }
-                const orgId = await getOrgIdFromEvent(event);
-                await runWithRequestContext({ userEmail: ownerEmail, orgId }, () => requireAgentChatAiSetup());
+                const orgScope = await resolveAgentRunOrgScope({
+                    event,
+                    ownerContext: titleOwnerContext,
+                    resolveOrgId: options?.resolveOrgId,
+                });
+                const titleRequestContext = {
+                    userEmail: ownerEmail,
+                    ...orgScope,
+                    requestOrigin: getForwardedRequestOrigin(event),
+                    isLoopbackRequest: isLoopbackRequest(event),
+                    isDirectLoopbackRequest: isDirectLoopbackRequest(event),
+                };
+                await runWithRequestContext(titleRequestContext, () => requireAgentChatAiSetup());
                 try {
-                    const title = await runWithRequestContext({ userEmail: ownerEmail, orgId }, () => generateChatTitle({ ...request, appId: options?.appId }));
+                    const title = await runWithRequestContext(titleRequestContext, () => generateChatTitle({ ...request, appId: options?.appId }));
                     return { title };
                 }
                 catch (error) {
@@ -5410,11 +5461,12 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
             const threadRouteHandler = withTransientDatabaseFallback(`${routePath}/threads`, async (event) => {
                 const ownerContext = await resolveOwnerContext(event);
                 const owner = ownerContext.owner;
-                const orgId = await resolveAgentRunOrgId({
+                const orgScope = await resolveAgentRunOrgScope({
                     event,
                     ownerContext,
                     resolveOrgId: options?.resolveOrgId,
                 });
+                const orgId = orgScope.orgId;
                 const method = getMethod(event);
                 const { threadId, tail: threadTail } = parseThreadRoute(event);
                 const isThreadSubroute = (subroute) => threadTail[0] === subroute;
@@ -5672,7 +5724,13 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                             (mutation.type === "append" ||
                                 mutation.type === "moveToTop" ||
                                 mutation.type === "claim")) {
-                            await runWithRequestContext({ userEmail: owner, orgId }, () => requireAgentChatAiSetup());
+                            await runWithRequestContext({
+                                userEmail: owner,
+                                ...orgScope,
+                                requestOrigin: getForwardedRequestOrigin(event),
+                                isLoopbackRequest: isLoopbackRequest(event),
+                                isDirectLoopbackRequest: isDirectLoopbackRequest(event),
+                            }, () => requireAgentChatAiSetup());
                         }
                         let result;
                         try {
@@ -6042,10 +6100,24 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     return { error: "Authentication required" };
                 }
                 try {
+                    const orgScope = await resolveAgentRunOrgScope({
+                        event,
+                        ownerContext: { owner: session.email, anonymous: false },
+                        resolveOrgId: options?.resolveOrgId,
+                    });
+                    if (!orgScope.orgId && orgScope.orgScope !== "personal") {
+                        setResponseStatus(event, 503);
+                        return {
+                            error: "Organization scope is temporarily unavailable.",
+                        };
+                    }
+                    const scope = orgScope.orgId
+                        ? { orgId: orgScope.orgId }
+                        : { orgId: null, orgScope: "personal" };
                     return {
                         token: await createAgentChatStreamToken({
                             ownerEmail: session.email,
-                            orgId: session.orgId ?? null,
+                            ...scope,
                             authUserId: session.authUserId,
                         }),
                         ttlSeconds: AGENT_CHAT_STREAM_TOKEN_TTL_SECONDS,
@@ -6078,6 +6150,9 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                         owner: principal.ownerEmail,
                         anonymous: false,
                         orgId: principal.orgId,
+                        ...(principal.orgScope === "personal"
+                            ? { orgScope: "personal" }
+                            : {}),
                         ...(principal.authUserId
                             ? { authUserId: principal.authUserId }
                             : {}),