@agent-native/core 0.198.2 → 0.198.3-nightly-20260930154911

package/dist/catalog.json

@@ -62,6 +62,6 @@
   "vite": "8.1.0",
   "vitest": "^4.1.5",
   "y-protocols": "^1.0.7",
-  "yjs": "^13.6.32",
+  "yjs": "^13.6.33",
   "zod": "^4.3.6"
 }

package/dist/cli/create-tui.js

@@ -253,18 +253,37 @@ function fitRows(items, activeIndex, rows) {
     const start = Math.max(0, Math.min(activeIndex - rows + 1, items.length - rows));
     return items.slice(start, start + rows);
 }
+// Ink hands every key in one stdin chunk to the same input handler before
+// React re-renders, so an input handler must read `latest` and update through
+// the setter: the rendered value is stale from the chunk's second key on.
+function useKeypressState(initial) {
+    const [rendered, setRendered] = React.useState(initial);
+    const latest = React.useRef(rendered);
+    const update = (next) => {
+        latest.current = next(latest.current);
+        setRendered(latest.current);
+    };
+    return [rendered, update, latest];
+}
+function wizardChoices(state, installedApps) {
+    const apps = availableTemplates(state.kind, installedApps);
+    const choices = state.step === "start" ? START_CHOICES : apps;
+    return {
+        multiSelect: state.kind === "chat-workspace" ||
+            state.kind === "first-party" ||
+            state.kind === "workspace-add",
+        apps,
+        required: new Set(requiredTemplateNames(state.kind)),
+        choices,
+    };
+}
 export function CreateWizard({ options, onFinish, }) {
     const { exit } = useApp();
     const { stdout } = useStdout();
-    const [state, setState] = React.useState(() => initialWizardState(options));
+    const [state, setState, latest] = useKeypressState(() => initialWizardState(options));
     const terminalColumns = Math.max(16, stdout.columns ?? 80);
     const terminalRows = Math.max(14, stdout.rows ?? 24);
-    const multiSelect = state.kind === "chat-workspace" ||
-        state.kind === "first-party" ||
-        state.kind === "workspace-add";
-    const apps = availableTemplates(state.kind, options.installedApps ?? []);
-    const required = new Set(requiredTemplateNames(state.kind));
-    const choices = state.step === "start" ? START_CHOICES : apps;
+    const { multiSelect, required, choices } = wizardChoices(state, options.installedApps ?? []);
     const listRows = Math.max(3, Math.min(choices.length, Math.floor((terminalRows - 13) / 2)));
     const visibleChoices = fitRows(choices, state.activeIndex, listRows);
     const visibleOffset = Math.max(0, choices.indexOf(visibleChoices[0]));
@@ -280,6 +299,7 @@ export function CreateWizard({ options, onFinish, }) {
         exit();
     };
     const complete = () => {
+        const state = latest.current;
         const answer = {
             kind: state.kind ?? "chat-workspace",
             name: state.name,
@@ -291,6 +311,8 @@ export function CreateWizard({ options, onFinish, }) {
         exit();
     };
     useInput((input, key) => {
+        const state = latest.current;
+        const { multiSelect, apps, required, choices } = wizardChoices(state, options.installedApps ?? []);
         if (state.step === "cancelled")
             return;
         if ((key.ctrl && input.toLowerCase() === "c") || key.escape) {
@@ -569,7 +591,7 @@ export async function runCreateWizard(options) {
 }
 function InkChoicePrompt({ message, choices, onFinish, }) {
     const { exit } = useApp();
-    const [activeIndex, setActiveIndex] = React.useState(0);
+    const [activeIndex, setActiveIndex, latestIndex] = useKeypressState(() => 0);
     useInput((input, key) => {
         if (key.escape || (key.ctrl && input.toLowerCase() === "c")) {
             onFinish(null);
@@ -581,7 +603,7 @@ function InkChoicePrompt({ message, choices, onFinish, }) {
         else if (key.downArrow)
             setActiveIndex((index) => Math.min(choices.length - 1, index + 1));
         else if (key.return) {
-            onFinish(choices[activeIndex]?.value ?? null);
+            onFinish(choices[latestIndex.current]?.value ?? null);
             exit();
         }
     });

package/dist/cli/design-connect.js

@@ -645,6 +645,13 @@ function isLoopbackOrigin(parsed) {
         hostname === "::1" ||
         /^127(?:\.\d{1,3}){3}$/.test(hostname));
 }
+function sameDevServerOrigin(a, b) {
+    return (a.origin === b.origin ||
+        (a.protocol === b.protocol &&
+            a.port === b.port &&
+            isLoopbackOrigin(a) &&
+            isLoopbackOrigin(b)));
+}
 function isApprovedDesignOrigin(rawOrigin, configuredOrigins, opaquePreviewAuthorized = false) {
     // Sandboxed loopback preview documents have an opaque `null` origin. It is
     // only approved when this request carries the non-cookie preview token;
@@ -976,16 +983,17 @@ class PreviewSessionCookieJar {
 }
 function resolvePreviewSnapshotUrl(devServerUrl, rawUrl) {
     const base = normalizeHttpUrl(devServerUrl);
+    const baseUrl = new URL(base);
     const parsed = new URL(rawUrl?.trim() || "/", `${base}/`);
     parsed.hash = "";
     if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
         throw new Error("Snapshot URL must use http(s).");
     }
-    if (!sameOrigin(parsed.toString(), base)) {
+    if (!sameDevServerOrigin(parsed, baseUrl)) {
         throw new Error("Snapshot URL must stay on the connected dev server.");
     }
     const search = stripQueryPair(parsed.search, FRAME_BRIDGE_KEY_PARAM);
-    return `${parsed.origin}${parsed.pathname}${search}`;
+    return `${baseUrl.origin}${parsed.pathname}${search}`;
 }
 function stripPreviewTokenQueryParam(search) {
     if (!search.includes("previewToken"))

package/dist/client/chat/agentkit-protocol.js

@@ -1528,7 +1528,10 @@ export function createAgentKitProtocolAdapter(runtime, options = {}) {
                     {
                         type: "suggestions.updated",
                         ...base,
-                        suggestions: event.suggestions,
+                        suggestions: event.suggestions.map((suggestion) => ({
+                            ...suggestion,
+                            runId: run.runId,
+                        })),
                     },
                 ];
             case "annotation": {

package/dist/collab/awareness.d.ts

@@ -38,19 +38,19 @@ export declare const postAwareness: import("h3").EventHandlerWithFetch<import("h
     error: string;
     states?: undefined;
 } | {
+    error?: undefined;
     states: {
         clientId: number;
         state: string;
     }[];
-    error?: undefined;
 }>>;
 export declare const getActiveUsers: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     error: string;
     users?: undefined;
 } | {
+    error?: undefined;
     users: {
         clientId: number;
         lastSeen: number;
     }[];
-    error?: undefined;
 }>>;

package/dist/collab/routes.d.ts

@@ -8,8 +8,8 @@ export declare const getCollabState: import("h3").EventHandlerWithFetch<import("
     state: string;
 }>>;
 export declare const postCollabUpdate: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/collab/struct-routes.d.ts

@@ -1,6 +1,6 @@
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/deploy/workspace-deploy.js

@@ -18,6 +18,12 @@ import { collectImmutableAssetPaths, IMMUTABLE_ASSET_CACHE_HEADERS, } from "./im
 function workspaceFrameworkRoutePrefixEnv() {
     return (process.env.AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX?.trim() || "");
 }
+function workspaceFrameworkRoutePrefixEnvSnippet() {
+    const frameworkRoutePrefix = workspaceFrameworkRoutePrefixEnv();
+    return frameworkRoutePrefix
+        ? `  processRef.env.AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX = ${JSON.stringify(frameworkRoutePrefix)};\n`
+        : "  delete processRef.env.AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX;\n";
+}
 function workspaceFrameworkRoutePrefix() {
     return normalizeFrameworkRoutePrefix(workspaceFrameworkRoutePrefixEnv() || undefined, "AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX");
 }
@@ -167,6 +173,7 @@ function buildOneApp(workspaceRoot, appsDir, app, preset, execFile, workspaceApp
             ? workspaceGatewayUrl
             : null);
     const workspaceOAuthUrl = workspaceOAuthOrigin(workspaceGatewayUrl);
+    const frameworkRoutePrefix = workspaceFrameworkRoutePrefixEnv();
     const env = {
         ...process.env,
         NITRO_PRESET: preset,
@@ -184,7 +191,6 @@ function buildOneApp(workspaceRoot, appsDir, app, preset, execFile, workspaceApp
             : {}),
         APP_BASE_PATH: `/${app}`,
         VITE_APP_BASE_PATH: `/${app}`,
-        AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX: workspaceFrameworkRoutePrefixEnv(),
         AGENT_NATIVE_WORKSPACE_APP_AUDIENCE: workspaceAppAudience,
         AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS: JSON.stringify(workspaceAppRouteAccess.publicPaths),
         AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS: JSON.stringify(workspaceAppRouteAccess.protectedPaths),
@@ -206,6 +212,13 @@ function buildOneApp(workspaceRoot, appsDir, app, preset, execFile, workspaceApp
             : {}),
         [WORKSPACE_APPS_ENV_KEY]: JSON.stringify(workspaceApps),
     };
+    if (frameworkRoutePrefix) {
+        env.AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX =
+            frameworkRoutePrefix;
+    }
+    else {
+        delete env.AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX;
+    }
     if (preset === "netlify" && appUsesNetlifyUnpooledDatabaseUrl(appDir)) {
         env.DATABASE_URL =
             process.env.NETLIFY_DATABASE_URL_UNPOOLED ??
@@ -641,13 +654,13 @@ ${workspaceDirectoryEnvSnippet(workspaceApps)}
     VITE_AGENT_NATIVE_WORKSPACE_AUTH_MODE: ${JSON.stringify(workspaceAuthMode)},
     VITE_AGENT_NATIVE_WORKSPACE_APP_ID: ${JSON.stringify(app)},
     VITE_APP_BASE_PATH: basePath,
-    AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX: ${JSON.stringify(workspaceFrameworkRoutePrefixEnv())},
     VITE_AGENT_NATIVE_WORKSPACE_APP_AUDIENCE: ${JSON.stringify(workspaceAppAudience)},
     VITE_AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS: ${JSON.stringify(JSON.stringify(workspaceAppRouteAccess.publicPaths))},
     VITE_AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS: ${JSON.stringify(JSON.stringify(workspaceAppRouteAccess.protectedPaths))},
     VITE_AGENT_NATIVE_WORKSPACE_APPS_JSON: ${JSON.stringify(JSON.stringify(workspaceApps))},
     ${JSON.stringify(WORKSPACE_APPS_ENV_KEY)}: ${JSON.stringify(JSON.stringify(workspaceApps))},
   });
+${workspaceFrameworkRoutePrefixEnvSnippet()}
 }
 
 setBasePathEnv();
@@ -734,13 +747,13 @@ ${workspaceDirectoryEnvSnippet(workspaceApps)}
     VITE_AGENT_NATIVE_WORKSPACE_AUTH_MODE: ${JSON.stringify(workspaceAuthMode)},
     VITE_AGENT_NATIVE_WORKSPACE_APP_ID: ${JSON.stringify(app)},
     VITE_APP_BASE_PATH: basePath,
-    AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX: ${JSON.stringify(workspaceFrameworkRoutePrefixEnv())},
     VITE_AGENT_NATIVE_WORKSPACE_APP_AUDIENCE: ${JSON.stringify(workspaceAppAudience)},
     VITE_AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS: ${JSON.stringify(JSON.stringify(workspaceAppRouteAccess.publicPaths))},
     VITE_AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS: ${JSON.stringify(JSON.stringify(workspaceAppRouteAccess.protectedPaths))},
     VITE_AGENT_NATIVE_WORKSPACE_APPS_JSON: ${JSON.stringify(JSON.stringify(workspaceApps))},
     ${JSON.stringify(WORKSPACE_APPS_ENV_KEY)}: ${JSON.stringify(JSON.stringify(workspaceApps))},
   });
+${workspaceFrameworkRoutePrefixEnvSnippet()}
 }
 
 function enabled() {
@@ -865,13 +878,13 @@ ${workspaceDirectoryEnvSnippet(workspaceApps)}
     VITE_AGENT_NATIVE_WORKSPACE_AUTH_MODE: ${JSON.stringify(workspaceAuthMode)},
     VITE_AGENT_NATIVE_WORKSPACE_APP_ID: ${JSON.stringify(app)},
     VITE_APP_BASE_PATH: basePath,
-    AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX: ${JSON.stringify(workspaceFrameworkRoutePrefixEnv())},
     VITE_AGENT_NATIVE_WORKSPACE_APP_AUDIENCE: ${JSON.stringify(workspaceAppAudience)},
     VITE_AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS: ${JSON.stringify(JSON.stringify(workspaceAppRouteAccess.publicPaths))},
     VITE_AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS: ${JSON.stringify(JSON.stringify(workspaceAppRouteAccess.protectedPaths))},
     VITE_AGENT_NATIVE_WORKSPACE_APPS_JSON: ${JSON.stringify(JSON.stringify(workspaceApps))},
     ${JSON.stringify(WORKSPACE_APPS_ENV_KEY)}: ${JSON.stringify(JSON.stringify(workspaceApps))},
   });
+${workspaceFrameworkRoutePrefixEnvSnippet()}
 }
 
 setBasePathEnv();
@@ -928,13 +941,13 @@ ${workspaceDirectoryEnvSnippet(workspaceApps)}
     VITE_AGENT_NATIVE_WORKSPACE_AUTH_MODE: ${JSON.stringify(workspaceAuthMode)},
     VITE_AGENT_NATIVE_WORKSPACE_APP_ID: ${JSON.stringify(app)},
     VITE_APP_BASE_PATH: basePath,
-    AGENT_NATIVE_CONFIG_RUNTIME_FRAMEWORK_ROUTE_PREFIX: ${JSON.stringify(workspaceFrameworkRoutePrefixEnv())},
     VITE_AGENT_NATIVE_WORKSPACE_APP_AUDIENCE: ${JSON.stringify(workspaceAppAudience)},
     VITE_AGENT_NATIVE_WORKSPACE_APP_PUBLIC_PATHS: ${JSON.stringify(JSON.stringify(workspaceAppRouteAccess.publicPaths))},
     VITE_AGENT_NATIVE_WORKSPACE_APP_PROTECTED_PATHS: ${JSON.stringify(JSON.stringify(workspaceAppRouteAccess.protectedPaths))},
     VITE_AGENT_NATIVE_WORKSPACE_APPS_JSON: ${JSON.stringify(JSON.stringify(workspaceApps))},
     ${JSON.stringify(WORKSPACE_APPS_ENV_KEY)}: ${JSON.stringify(JSON.stringify(workspaceApps))},
   });
+${workspaceFrameworkRoutePrefixEnvSnippet()}
 }
 
 function normalizeBasePathArgs(args) {

package/dist/file-upload/actions/upload-image.d.ts

@@ -35,9 +35,9 @@ declare const _default: import("../../action.js").ActionDefinition<{
 } | {
     error: string;
     url?: undefined;
-    id?: undefined;
     provider?: undefined;
     configured?: undefined;
+    id?: undefined;
 } | {
     url: string;
     id: string;
@@ -46,9 +46,9 @@ declare const _default: import("../../action.js").ActionDefinition<{
     error?: undefined;
 } | {
     url?: undefined;
-    id?: undefined;
     provider?: undefined;
     error: string;
     configured: boolean;
+    id?: undefined;
 }>;
 export default _default;

package/dist/framework-tools.js

@@ -132,6 +132,8 @@ export const CORE_ACTION_GROUPS = {
     "get-usage-alerts": "automation",
     "manage-usage-alert": "automation",
     "get-usage-metrics": "automation",
+    "get-usage-insights": "automation",
+    "get-usage-run": "automation",
     "get-builder-credit-usage": "automation",
     "get-builder-credit-status": "automation",
     "get-builder-referral-info": "automation",

package/dist/localization/core-messages/supplemental/ar-SA.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "إلغاء",
     couldNotRevoke: "تعذر إلغاء الرمز.",
     authorizeDevice: "تخويل الجهاز",
+    organization: "المؤسسة",
+    invalidOrganization: "اختر مؤسسة أنت عضو فيها.",
     fullCatalogRequested: "يطلب هذا الجهاز الوصول إلى كتالوج الإجراءات الكامل.",
     createToken: "إنشاء رمز اتصال",
     authorizingDevice: "جارٍ تخويل الجهاز...",

package/dist/localization/core-messages/supplemental/de-DE.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "Widerrufen",
     couldNotRevoke: "Token konnte nicht widerrufen werden.",
     authorizeDevice: "Gerät autorisieren",
+    organization: "Organisation",
+    invalidOrganization: "Wähle eine Organisation, der du angehörst.",
     fullCatalogRequested: "Dieses Gerät fordert Zugriff auf den vollständigen Aktionskatalog an.",
     createToken: "Verbindungstoken erstellen",
     authorizingDevice: "Gerät wird autorisiert...",

package/dist/localization/core-messages/supplemental/en-US.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "Revoke",
     couldNotRevoke: "Could not revoke token.",
     authorizeDevice: "Authorize device",
+    organization: "Organization",
+    invalidOrganization: "Choose an organization you belong to.",
     fullCatalogRequested: "This device is requesting access to the full action catalog.",
     createToken: "Create connection token",
     authorizingDevice: "Authorizing device...",

package/dist/localization/core-messages/supplemental/es-ES.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "Revocar",
     couldNotRevoke: "No se pudo revocar el token.",
     authorizeDevice: "Autorizar dispositivo",
+    organization: "Organización",
+    invalidOrganization: "Elige una organización a la que pertenezcas.",
     fullCatalogRequested: "Este dispositivo solicita acceso al catálogo completo de acciones.",
     createToken: "Crear token de conexión",
     authorizingDevice: "Autorizando dispositivo...",

package/dist/localization/core-messages/supplemental/fr-FR.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "Révoquer",
     couldNotRevoke: "Impossible de révoquer le jeton.",
     authorizeDevice: "Autoriser l’appareil",
+    organization: "Organisation",
+    invalidOrganization: "Choisissez une organisation dont vous êtes membre.",
     fullCatalogRequested: "Cet appareil demande l’accès au catalogue complet des actions.",
     createToken: "Créer un jeton de connexion",
     authorizingDevice: "Autorisation de l’appareil...",

package/dist/localization/core-messages/supplemental/hi-IN.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "Revoke करें",
     couldNotRevoke: "Token revoke नहीं किया जा सका।",
     authorizeDevice: "डिवाइस को अनुमति दें",
+    organization: "संगठन",
+    invalidOrganization: "ऐसा संगठन चुनें जिसके आप सदस्य हैं।",
     fullCatalogRequested: "यह डिवाइस पूरे एक्शन कैटलॉग तक पहुंच का अनुरोध कर रहा है।",
     createToken: "कनेक्शन token बनाएँ",
     authorizingDevice: "डिवाइस को अनुमति दी जा रही है...",

package/dist/localization/core-messages/supplemental/ja-JP.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "取り消す",
     couldNotRevoke: "トークンを取り消せませんでした。",
     authorizeDevice: "デバイスを承認",
+    organization: "組織",
+    invalidOrganization: "所属している組織を選択してください。",
     fullCatalogRequested: "このデバイスは、すべてのアクションカタログへのアクセスを要求しています。",
     createToken: "接続トークンを作成",
     authorizingDevice: "デバイスを承認中...",

package/dist/localization/core-messages/supplemental/ko-KR.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "취소",
     couldNotRevoke: "토큰을 취소할 수 없습니다.",
     authorizeDevice: "기기 승인",
+    organization: "조직",
+    invalidOrganization: "소속된 조직을 선택하세요.",
     fullCatalogRequested: "이 기기는 전체 작업 카탈로그에 대한 액세스를 요청하고 있습니다.",
     createToken: "연결 토큰 생성",
     authorizingDevice: "기기 승인 중...",

package/dist/localization/core-messages/supplemental/pt-BR.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "Revogar",
     couldNotRevoke: "Não foi possível revogar o token.",
     authorizeDevice: "Autorizar dispositivo",
+    organization: "Organização",
+    invalidOrganization: "Escolha uma organização da qual você faz parte.",
     fullCatalogRequested: "Este dispositivo está solicitando acesso ao catálogo completo de ações.",
     createToken: "Criar token de conexão",
     authorizingDevice: "Autorizando dispositivo...",

package/dist/localization/core-messages/supplemental/zh-CN.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "撤销",
     couldNotRevoke: "无法撤销令牌。",
     authorizeDevice: "授权设备",
+    organization: "组织",
+    invalidOrganization: "请选择你所属的组织。",
     fullCatalogRequested: "此设备正在请求访问完整的操作目录。",
     createToken: "创建连接令牌",
     authorizingDevice: "正在授权设备...",

package/dist/localization/core-messages/supplemental/zh-TW.js

@@ -37,6 +37,8 @@ export const mcpConnectMessages = {
     revoke: "撤銷",
     couldNotRevoke: "無法撤銷權杖。",
     authorizeDevice: "授權裝置",
+    organization: "組織",
+    invalidOrganization: "請選擇你所屬的組織。",
     fullCatalogRequested: "此裝置正在要求存取完整的動作目錄。",
     createToken: "建立連線權杖",
     authorizingDevice: "正在授權裝置...",

package/dist/localization/mcp-settings-messages.d.ts

@@ -24,6 +24,8 @@ export interface McpConnectMessages {
     revoke: string;
     couldNotRevoke: string;
     authorizeDevice: string;
+    organization: string;
+    invalidOrganization: string;
     fullCatalogRequested: string;
     createToken: string;
     authorizingDevice: string;

package/dist/mcp/connect-route.js

@@ -11,6 +11,7 @@ import { readBody } from "../server/h3-helpers.js";
 import { MCP_CONNECT_MCP_URL_TEMPLATE, getMcpConnectGuides, getMcpStaticTokenFallback, interpolateMcpConnectTemplate, resolveMcpConnectGuideId, } from "../shared/mcp-connect-content.js";
 import { recordMintedToken, listTokens, revokeToken, normalizeServiceName, serviceIdentityEmail, createDeviceCode, getDeviceCode, getDeviceCodeByUserCode, approveDeviceCode, consumeDeviceCode, claimDeviceCodeForMint, finishDeviceCodeMint, releaseDeviceCodeMint, expireDeviceCode, MCP_CONNECT_OAUTH_CLIENT_ID, MCP_CONNECT_SCOPE, DEFAULT_TOKEN_TTL_DAYS, MIN_TOKEN_TTL_DAYS, MAX_TOKEN_TTL_DAYS, DEVICE_CODE_TTL_MS, } from "./connect-store.js";
 import { MCP_OAUTH_DEFAULT_SCOPE, signMcpOAuthAccessToken, } from "./oauth-token.js";
+import { resolveMcpOrgChoices } from "./org-choice.js";
 import { MCP_PUBLIC_ROUTE_PREFIX } from "./route-paths.js";
 const DEVICE_POLL_INTERVAL_S = 3;
 const USER_CODE_RE = /^[A-Z2-7]{4}-[A-Z2-7]{4}$/;
@@ -287,7 +288,7 @@ function renderConnectGuide(guide, activeGuideId, values, copyLabel) {
     return `<div class="tab-panel${guide.id === activeGuideId ? " is-active" : ""}" role="tabpanel" id="mcp-guide-panel-${guideId}" aria-labelledby="mcp-guide-tab-${guideId}" data-panel="${guideId}">${content}</div>`;
 }
 function renderConnectPage(params) {
-    const { connectBasePath, email, appName, appUrl, serverId, userCode, catalogScope, locale, requestedGuide, } = params;
+    const { connectBasePath, email, appName, appUrl, serverId, userCode, catalogScope, locale, requestedGuide, organizations, defaultOrganizationId, } = params;
     const direction = localeDirection(locale);
     const messages = mcpSettingsMessagesForLocale(locale);
     const connectMessages = messages.mcpConnect;
@@ -316,6 +317,19 @@ function renderConnectPage(params) {
     const guidePanelsHtml = guides
         .map((guide) => renderConnectGuide(guide, activeGuideId, connectTemplateValues, messages.mcpCopy))
         .join("\n");
+    const organizationSelectorHtml = safeUserCode && organizations.length > 1
+        ? `<div class="field">
+        <label for="organizationId">${localize(connectMessages.organization)}</label>
+        <div class="select-wrap">
+        <select id="organizationId">
+          ${organizations
+            .map((organization) => `<option value="${escapeHtml(organization.id)}"${organization.id === defaultOrganizationId ? " selected" : ""}>${escapeHtml(organization.name)}${organization.domain ? ` (${escapeHtml(organization.domain)})` : ""}</option>`)
+            .join("")}
+        </select>
+        <span class="chev" aria-hidden="true"></span>
+        </div>
+      </div>`
+        : "";
     const setupHtml = safeUserCode
         ? ""
         : `
@@ -426,7 +440,7 @@ function renderConnectPage(params) {
     display: flex; align-items: center; justify-content: space-between;
     gap: 0.75rem; border: 1px solid var(--border);
     border-radius: 8px; padding: 0.5rem 0.65rem; margin: 0 0 0.9rem;
-    background: var(--panel-soft); color: var(--muted);
+    background: var(--panel-soft); color: var(--muted); line-height: 1.2rem;
   }
   .device-strip .label {
     font-size: 0.76rem; font-weight: 560; color: var(--subtle);
@@ -503,12 +517,25 @@ function renderConnectPage(params) {
   .field:last-child { margin-bottom: 0; }
   .field label { display: block; font-size: 0.78rem; color: var(--muted);
     margin-bottom: 0.35rem; }
-  .field input {
+  .field input, .field select {
     width: 100%; padding: 0.6rem 0.7rem; font: inherit; color: var(--text);
     background: var(--panel-2); border: 1px solid var(--border-strong);
     border-radius: 8px;
   }
-  .field input:focus-visible {
+  .select-wrap { position: relative; }
+  .select-wrap select {
+    appearance: none; -webkit-appearance: none;
+    padding: 0.5rem 2.4rem 0.5rem 0.65rem; font-size: 0.78rem;
+    line-height: 1.2rem; cursor: pointer;
+  }
+  .select-wrap .chev {
+    position: absolute; top: 50%; right: 1rem; width: 7px; height: 7px;
+    border-right: 1.5px solid var(--muted); border-bottom: 1.5px solid var(--muted);
+    transform: translateY(-70%) rotate(45deg); pointer-events: none;
+    transition: transform 0.15s ease;
+  }
+  .select-wrap:has(select:open) .chev { transform: translateY(-30%) rotate(225deg); }
+  .field input:focus-visible, .field select:focus-visible {
     outline: none; border-color: var(--ring);
     box-shadow: 0 0 0 3px rgba(250,250,250,0.12);
   }
@@ -718,6 +745,7 @@ function renderConnectPage(params) {
         ? `<div id="staticTokenMint">
     <div id="msg" class="msg" role="status" aria-live="polite"></div>
     <div id="mintForm">
+      ${organizationSelectorHtml}
       <button id="authorizeBtn" class="primary">${localize(connectMessages.authorizeDevice)}</button>
     </div>
   </div>`
@@ -864,6 +892,7 @@ function renderConnectPage(params) {
     if (response.status === 404) return COPY.unknownDeviceCode;
     if (response.status === 410) return COPY.expiredDeviceCode;
     if (response.status === 409) return COPY.alreadyUsedDeviceCode;
+    if (response.status === 403) return COPY.invalidOrganization;
     return COPY.couldNotAuthorize;
   }
 
@@ -930,7 +959,13 @@ function renderConnectPage(params) {
     clearMsg();
     try {
       if (USER_CODE) {
-        var a = await postJson("/device/authorize", { user_code: USER_CODE });
+        var orgSelect = document.getElementById("organizationId");
+        var a = await postJson(
+          "/device/authorize",
+          orgSelect
+            ? { user_code: USER_CODE, org_id: orgSelect.value }
+            : { user_code: USER_CODE },
+        );
         if (!a.ok) {
           resetButtonLoading(btn);
           showMsg(deviceAuthorizationError(a));
@@ -1050,6 +1085,8 @@ export async function handleMcpConnect(event, subpath, options = {}) {
                 catalogScope: null,
                 locale,
                 requestedGuide: requestUrl?.searchParams.get("guide") ?? null,
+                organizations: [],
+                defaultOrganizationId: undefined,
             }));
         }
         let userCode = null;
@@ -1064,6 +1101,9 @@ export async function handleMcpConnect(event, subpath, options = {}) {
             deviceCode.expiresAt >= Date.now()
             ? deviceCode.catalogScope
             : null;
+        const { organizations, defaultOrganizationId } = userCode
+            ? await resolveMcpOrgChoices(event, session)
+            : { organizations: [], defaultOrganizationId: undefined };
         return html(renderConnectPage({
             connectBasePath: basePath,
             email: session.email,
@@ -1074,6 +1114,8 @@ export async function handleMcpConnect(event, subpath, options = {}) {
             catalogScope,
             locale,
             requestedGuide: requestUrl?.searchParams.get("guide") ?? null,
+            organizations,
+            defaultOrganizationId,
         }));
     }
     if (sub === "/token") {
@@ -1094,9 +1136,10 @@ export async function handleMcpConnect(event, subpath, options = {}) {
             ? "full"
             : undefined;
         try {
+            const { defaultOrganizationId } = await resolveMcpOrgChoices(event, session);
             const { token } = await mintConnectToken({
                 email: session.email,
-                orgId: session.orgId,
+                orgId: defaultOrganizationId,
                 label,
                 ttlDays,
                 appUrl,
@@ -1157,10 +1200,14 @@ export async function handleMcpConnect(event, subpath, options = {}) {
         if (!USER_CODE_RE.test(userCode)) {
             return json({ error: "Invalid user code." }, 400);
         }
-        const orgId = typeof session.orgId === "string" && session.orgId.trim()
-            ? session.orgId.trim()
-            : null;
-        const result = await approveDeviceCode(userCode, session.email, orgId);
+        const requestedOrgId = typeof body.org_id === "string" && body.org_id ? body.org_id : undefined;
+        const { organizations, defaultOrganizationId } = await resolveMcpOrgChoices(event, session, requestedOrgId);
+        if (requestedOrgId !== undefined &&
+            !organizations.some(({ id }) => id === requestedOrgId)) {
+            return json({ error: "Choose an organization you belong to." }, 403);
+        }
+        const selectedOrgId = requestedOrgId ?? defaultOrganizationId ?? null;
+        const result = await approveDeviceCode(userCode, session.email, selectedOrgId);
         if (result === "not_found") {
             return json({ error: "Unknown device code." }, 404);
         }

package/dist/mcp/oauth-route.js

@@ -1,12 +1,13 @@
 import { createHash, createHmac, timingSafeEqual } from "node:crypto";
 import { getHeader, getMethod, getQuery, setResponseStatus } from "h3";
-import { getActiveOrgSettingForEvent, getOrgContext, getOrgDomain, listOrgMembershipsForEvent, } from "../org/context.js";
+import { getOrgDomain } from "../org/context.js";
 import { getConfiguredLoginHtml, getSession } from "../server/auth.js";
 import { getAuthSecret } from "../server/better-auth-instance.js";
 import { readBody } from "../server/h3-helpers.js";
 import { applicationTypeForRedirectUris, isAllowedOAuthRedirectUri, isUrlBasedOAuthClientId, matchesRegisteredRedirectUri, resolveOAuthClientMetadataDocument, } from "./oauth-client-metadata.js";
 import { createOAuthCode, createOAuthRefreshToken, consumeOAuthCode, generateOpaqueToken, getOAuthClient, getOAuthCode, getOAuthRefreshToken, registerOAuthClient, touchOAuthRefreshToken, } from "./oauth-store.js";
 import { MCP_OAUTH_ACCESS_TOKEN_TTL_SECONDS, MCP_OAUTH_SCOPES, normalizeOAuthScope, signMcpOAuthAccessToken, } from "./oauth-token.js";
+import { resolveMcpOrgChoices } from "./org-choice.js";
 import { MCP_LEGACY_ROUTE_PREFIX, MCP_PUBLIC_ROUTE_PREFIX, MCP_ROUTE_PREFIXES, } from "./route-paths.js";
 const MCP_OAUTH_RESOURCE_SCOPES = MCP_OAUTH_SCOPES.filter((scope) => scope !== "offline_access");
 const MCP_OAUTH_RESOURCE_SCOPE = MCP_OAUTH_RESOURCE_SCOPES.join(" ");
@@ -597,27 +598,9 @@ async function handleAuthorize(event, options) {
             error: "invalid_scope",
         });
     }
-    const activeOrgSetting = await getActiveOrgSettingForEvent(event, session.email);
-    const requestedOrganizationId = method === "POST" && params.organization_id !== undefined
+    const { organizations, defaultOrganizationId } = await resolveMcpOrgChoices(event, session, method === "POST" && params.organization_id !== undefined
         ? params.organization_id || null
-        : (activeOrgSetting?.orgId ?? session.orgId ?? null);
-    let memberships = await listOrgMembershipsForEvent(event, session.email, requestedOrganizationId);
-    // A token issued with no org stays org-less for its whole life, even after
-    // the app later creates the org, so resolve an account without one to its
-    // domain or default org before offering the choice.
-    const ensuredOrgId = memberships?.length === 0 ? (await getOrgContext(event)).orgId : null;
-    if (ensuredOrgId) {
-        memberships = await listOrgMembershipsForEvent(event, session.email, ensuredOrgId);
-    }
-    const organizations = memberships?.map((membership) => ({
-        id: membership.orgId,
-        name: membership.orgName,
-        domain: membership.allowedDomain,
-    })) ??
-        (session.orgId
-            ? [{ id: session.orgId, name: "Organization", domain: null }]
-            : []);
-    const defaultOrganizationId = [activeOrgSetting?.orgId, ensuredOrgId, session.orgId].find((id) => id && organizations.some((org) => org.id === id)) ?? organizations[0]?.id;
+        : undefined);
     if (method === "GET") {
         return html(renderConsentPage({
             appName: options.appName || options.appId || "Agent-Native",