@stackbone/cli 0.9.4 → 0.9.5

package/main.js

@@ -919,17 +919,17 @@ function approvalMetadataOf(input) {
 	}
 	const keyOrder = payloadKeyOrderOf(input.payload);
 	if (keyOrder) labels[PAYLOAD_KEY_ORDER_KEY] = keyOrder;
-	const metadata = isRecord$6(input.metadata) ? input.metadata : void 0;
+	const metadata = isRecord$7(input.metadata) ? input.metadata : void 0;
 	if (!metadata && Object.keys(labels).length === 0) return void 0;
 	return {
 		...metadata,
 		...labels
 	};
 }
-var PAYLOAD_KEY_ORDER_KEY, isRecord$6;
+var PAYLOAD_KEY_ORDER_KEY, isRecord$7;
 var init_approval_key_order = __esmMin((() => {
 	PAYLOAD_KEY_ORDER_KEY = "payloadKeyOrder";
-	isRecord$6 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+	isRecord$7 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 }));
 //#endregion
 //#region ../../libs/shared/validators/src/lib/agents/contract.ts
@@ -1850,6 +1850,10 @@ function makeBrokerError(code, message, retryable) {
 function isBrokerError(err) {
 	return typeof err === "object" && err !== null && "code" in err && typeof err.code === "string" && BROKER_ERROR_CODES.safeParse(err.code).success;
 }
+/** Type guard: an `account_required` refusal that carries its accounts. */
+function isAccountRequiredError(err) {
+	return isBrokerError(err) && err.code === "account_required" && Array.isArray(err.accounts);
+}
 /**
 * Type guard: is this a broker "needs authorization" error (`no_token` or
 * `user_authorization_required`)? These are the codes the adapter maps onto
@@ -1894,7 +1898,8 @@ var init_errors$1 = __esmMin((() => {
 		"access_denied",
 		"invalid_grant",
 		"precondition_failed",
-		"cardinality_mismatch"
+		"cardinality_mismatch",
+		"account_required"
 	];
 	BROKER_ERROR_CODES = z.enum([...CONNECTOR_EXECUTION_ERROR_CODES, ...BROKER_SPECIFIC_ERROR_CODES]);
 	z.object({
@@ -1940,6 +1945,11 @@ var init_errors$1 = __esmMin((() => {
 		precondition_failed: false,
 		/** A narrower target is needed; repeating the same write exceeds the same limit. */
 		cardinality_mismatch: false,
+		/**
+		* Several accounts and no account named. The same call meets the same accounts;
+		* it has to name one of the ids {@link AccountRequiredError} lists.
+		*/
+		account_required: false,
 		/** Transport, or the provider answering 5xx. */
 		execute_failed: true,
 		/** The deadline passed. The next attempt may fit inside it. */
@@ -2257,6 +2267,11 @@ var init_requests = __esmMin((() => {
 		connector: z.string(),
 		/** WHO the token is for — the cache/grant-key dimension. */
 		principal: principalSchema,
+		/**
+		* Which connected account, by its `connection_grant` id (STA3-123). Picks the
+		* grant on a connector that holds several; `account_required` lists the ids.
+		*/
+		account: z.string().min(1).optional(),
 		/** Scoping claim: which install. HMAC-authenticated but separately asserted. */
 		installationId: z.string().optional(),
 		/** Scoping claim: which agent (folder) name. */
@@ -2309,7 +2324,9 @@ challenge: authorizationChallengeSchema });
 		/** Connector id whose cached token to evict. */
 		connector: z.string(),
 		/** WHO to evict the cached token for. */
-		principal: principalSchema
+		principal: principalSchema,
+		/** Which connected account, by its `connection_grant` id, as on the token request. */
+		account: z.string().min(1).optional()
 	});
 }));
 //#endregion
@@ -2721,7 +2738,15 @@ type: fieldsAuthMethodTypeSchema }), catalogAuthMethodBaseSchema.extend({
 			* "not classified" rather than "retryable" — the SDK leaves such a failure
 			* retryable, which is the safe direction for a transient outage.
 			*/
-			retryable: z.boolean().optional()
+			retryable: z.boolean().optional(),
+			/**
+			* On `account_required` (STA3-123): each account the connector holds, by the
+			* id a call names to pick it. `email` is null for a legacy account.
+			*/
+			details: z.object({ accounts: z.array(z.object({
+				id: z.string(),
+				email: z.string().nullable()
+			})) }).optional()
 		})
 	});
 	connectEvictResponseSchema = z.object({
@@ -5569,6 +5594,10 @@ var init_studio_triggers = __esmMin((() => {
 		trigger: z.string().min(1),
 		/** Which broker grant to poll with. `app` is the integration's own credential. */
 		principalKey: z.string().min(1).default("app"),
+		/** The connected account to poll with, by its grant id (STA3-123). Beside the
+		*  default `app` it picks that account; on a connector with several, the link
+		*  names one or is refused `account_required`. */
+		account: z.string().min(1).optional(),
 		...targetRequestShape,
 		mapping: z.string().nullish(),
 		/** The visual editor's authoring graph, persisted opaquely — no interpretation. */
@@ -5596,6 +5625,10 @@ var init_studio_triggers = __esmMin((() => {
 		});
 	});
 	patchTriggerSubscriptionRequestSchema = z.object({
+		/** The connected account to poll with, by its grant id (STA3-123). Beside the
+		*  default `app` it picks that account; on a connector with several, the link
+		*  names one or is refused `account_required`. */
+		account: z.string().min(1).optional(),
 		enabled: z.boolean().optional(),
 		mapping: z.string().nullish(),
 		mappingGraph: z.unknown().optional(),
@@ -5625,7 +5658,7 @@ var init_studio_triggers = __esmMin((() => {
 		* same reason.
 		*/
 		resumeFrom: z.enum(["cursor", "now"]).optional()
-	}).refine((v) => v.enabled !== void 0 || v.mapping !== void 0 || v.mappingGraph !== void 0 || v.correlationKey !== void 0 || v.conversationKey !== void 0 || v.debounceMs !== void 0 || v.scope !== void 0, { message: "Provide at least one of \"enabled\", \"mapping\", \"mappingGraph\", \"correlationKey\", \"conversationKey\", \"debounceMs\" or \"scope\"." });
+	}).refine((v) => v.enabled !== void 0 || v.mapping !== void 0 || v.mappingGraph !== void 0 || v.correlationKey !== void 0 || v.conversationKey !== void 0 || v.debounceMs !== void 0 || v.scope !== void 0 || v.account !== void 0, { message: "Provide at least one of \"enabled\", \"mapping\", \"mappingGraph\", \"correlationKey\", \"conversationKey\", \"debounceMs\", \"scope\" or \"account\"." });
 	previewTriggerMappingRequestSchema = z.object({
 		connector: z.string().min(1),
 		trigger: z.string().min(1),
@@ -5659,6 +5692,8 @@ var init_studio_triggers = __esmMin((() => {
 		param: z.string().min(1),
 		/** Whose credential loads them, as on register. No default: each account has its own. */
 		principalKey: z.string().min(1),
+		/** The connected account whose credential loads them, by its grant id, as on register. */
+		account: z.string().min(1).optional(),
 		/** The values the draft holds so far. */
 		scope: z.record(z.string(), z.string()).optional()
 	});
@@ -5766,14 +5801,20 @@ var init_studio_destinations = __esmMin((() => {
 		outputName: z.string().min(1),
 		connector: z.string().min(1),
 		principalKey: z.string().min(1).default("app"),
+		/** The connected account to write with, by its grant id (STA3-123). Beside the
+		*  default `app` it picks that account; on a connector with several, the binding
+		*  names one or is refused `account_required`. */
+		account: z.string().min(1).optional(),
 		/** Empty for an action, and DEFAULTED so an action binding need not send the key at all. */
 		destination: destinationSchema.default({})
 	});
 	patchDestinationBindingRequestSchema = z.object({
 		connector: z.string().min(1).optional(),
 		principalKey: z.string().min(1).optional(),
+		/** The connected account to write with, by its grant id, as on the upsert. */
+		account: z.string().min(1).optional(),
 		destination: destinationSchema.optional()
-	}).refine((patch) => patch.connector !== void 0 || patch.principalKey !== void 0 || patch.destination !== void 0, { message: "At least one of connector, principalKey or destination is required." });
+	}).refine((patch) => patch.connector !== void 0 || patch.principalKey !== void 0 || patch.account !== void 0 || patch.destination !== void 0, { message: "At least one of connector, principalKey, account or destination is required." });
 	parkedOutputReasonSchema = z.enum([
 		"unbound",
 		"write_failed",
@@ -17444,8 +17485,9 @@ var init_connector_invoker = __esmMin((() => {
 * @param connector The connect connector id registered in Studio.
 * @param operation The operation / tool id to run on that connector.
 * @param args      The operation arguments (path/query/body params). Defaults `{}`.
-* @param opts      Optional `{ principal, idempotent, echoPath }`. `principal`
-*                  defaults to `{ type: 'app' }`; `idempotent` is UNSET by
+* @param opts      Optional `{ principal, account, idempotent, echoPath }`.
+*                  `principal` defaults to `{ type: 'app' }`; `account` picks one
+*                  of the connector's accounts by id; `idempotent` is UNSET by
 *                  default and only an explicit `false` changes how a failure is
 *                  retried; `echoPath` records what this write returned so a
 *                  later delivery of it can be recognised as our own.
@@ -17456,6 +17498,7 @@ async function callConnector(connector, operation, args, opts) {
 		operation,
 		...args !== void 0 ? { args } : {},
 		...opts?.principal !== void 0 ? { principal: opts.principal } : {},
+		...opts?.account !== void 0 ? { account: opts.account } : {},
 		...opts?.idempotent !== void 0 ? { idempotent: opts.idempotent } : {},
 		...opts?.echoPath !== void 0 ? { echoPath: opts.echoPath } : {}
 	})).output;
@@ -17463,12 +17506,22 @@ async function callConnector(connector, operation, args, opts) {
 var connectorHandle, connection;
 var init_call_connector = __esmMin((() => {
 	init_connector_invoker();
-	connectorHandle = (id) => new Proxy(Object.create(null), { get(_target, prop) {
-		if (typeof prop !== "string" || prop === "then") return void 0;
-		if (prop === "call") return (operation, args, opts) => callConnector(id, operation, args, opts);
-		return (args, opts) => callConnector(id, prop, args, opts);
-	} });
-	connection = ((id) => connectorHandle(id));
+	connectorHandle = (id, defaults = {}) => {
+		const run = (operation, args, opts) => {
+			const ownPrincipal = opts?.principal !== void 0 && opts.principal.type !== "app";
+			const account = opts?.account ?? (ownPrincipal ? void 0 : defaults.account);
+			return callConnector(id, operation, args, {
+				...opts,
+				...account !== void 0 ? { account } : {}
+			});
+		};
+		return new Proxy(Object.create(null), { get(_target, prop) {
+			if (typeof prop !== "string" || prop === "then") return void 0;
+			if (prop === "call") return run;
+			return (args, opts) => run(prop, args, opts);
+		} });
+	};
+	connection = ((id, opts) => connectorHandle(id, opts));
 }));
 //#endregion
 //#region ../../libs/sdk/src/surfaces/external/connect/connect-transport.ts
@@ -18448,10 +18501,11 @@ async function resolveBrowserMode(input) {
 	const storedMode = field(BROWSER_MODE_ENV);
 	const mode = parseMode(storedMode);
 	if (mode === void 0 && storedMode !== void 0) return unknownModeFailure(storedMode);
-	if (mode === "local") return {
+	const local = () => input.allowLocalBrowser === false ? localBrowserNotAllowedFailure() : {
 		ok: true,
 		mode: "local"
 	};
+	if (mode === "local") return local();
 	if (mode === "cdp") {
 		if (!cdpUrl) return missingFieldFailure(mode, [CDP_URL_ENV]);
 		return {
@@ -18480,10 +18534,7 @@ async function resolveBrowserMode(input) {
 		apiKey,
 		projectId
 	};
-	return {
-		ok: true,
-		mode: "local"
-	};
+	return local();
 }
 /**
 * Read the four keys from the agent's own secret store (they are stored as
@@ -18528,6 +18579,17 @@ function unknownModeFailure(raw) {
 		reason: `browserTools: "${raw}" is not a browser mode — expected ${BROWSER_MODES.map((m) => `"${m}"`).join(", ")}. Fix ${BROWSER_MODE_ENV} on this box, or pick a browser in the Studio "Browser settings" screen.`
 	};
 }
+/**
+* The failure a host with no local Chromium (a deployed box) returns for any launch
+* that would open one. Exported so the Studio "Browser settings" screen reports the
+* same words the first browser action fails with.
+*/
+function localBrowserNotAllowedFailure() {
+	return {
+		ok: false,
+		reason: `browserTools: a deployed box has no local browser. Set ${BROWSERBASE_API_KEY_ENV} and ${BROWSERBASE_PROJECT_ID_ENV}, or ${CDP_URL_ENV}, in the Studio "Browser settings" screen.`
+	};
+}
 /** The loud failure an explicit-but-unsatisfiable mode produces. */
 function missingFieldFailure(mode, missing) {
 	return {
@@ -18582,7 +18644,8 @@ function isWsl() {
 * Resolve the Chrome/Chromium executable Stagehand's `chrome-launcher` should launch for a
 * LOCAL browser. Precedence: an explicit `STACKBONE_BROWSER_EXECUTABLE_PATH`, else the
 * workspace's Playwright Chromium (`playwright`'s `chromium.executablePath()`). Returns
-* `undefined` when neither resolves, so `chrome-launcher` falls back to its own detection.
+* `undefined` when neither resolves, and the launch then fails with
+* {@link LOCAL_CHROMIUM_MISSING_MESSAGE} instead of letting `chrome-launcher` detect one.
 *
 * Why pin it: `chrome-launcher` auto-detects a SYSTEM Chrome, which on WSL2 is the Windows
 * `chrome.exe` reached through `/mnt/c` — a Windows binary whose CDP port is unreachable
@@ -18737,14 +18800,18 @@ async function downloadFromFileOrigin(context, current, url, maxBytes) {
 }
 /** Reject once the server has sent nothing for {@link DOWNLOAD_STALL_MS}. */
 function withinStallLimit(call, url) {
-	let timer;
-	const stalled = new Promise((_, reject) => {
-		timer = setTimeout(() => {
-			const seconds = DOWNLOAD_STALL_MS / 1e3;
-			reject(/* @__PURE__ */ new Error(`Could not download ${url}: the server sent nothing for ${seconds} seconds.`));
-		}, DOWNLOAD_STALL_MS);
+	return raceTimer(call, DOWNLOAD_STALL_MS, () => {
+		const seconds = DOWNLOAD_STALL_MS / 1e3;
+		throw new Error(`Could not download ${url}: the server sent nothing for ${seconds} seconds.`);
 	});
-	return Promise.race([call, stalled]).finally(() => clearTimeout(timer));
+}
+/** `call`'s outcome, or `late()`'s once `ms` pass without one. */
+function raceTimer(call, ms, late) {
+	let timer;
+	const timedOut = new Promise((resolve) => {
+		timer = setTimeout(resolve, ms);
+	}).then(late);
+	return Promise.race([call, timedOut]).finally(() => clearTimeout(timer));
 }
 /** Read a CDP `IO` stream to its end, decoding base64 and plain-text chunks alike. */
 async function readCdpStream(send, handle, maxBytes) {
@@ -18831,7 +18898,8 @@ function createStagehandBrowserFactory(options) {
 				browserbase: options?.browserbase
 			},
 			env: process.env,
-			readSecrets: readBrowserProviderSecrets
+			readSecrets: readBrowserProviderSecrets,
+			allowLocalBrowser: options?.allowLocalBrowser
 		});
 		if (!resolved.ok) throw new Error(resolved.reason);
 		const cdpUrl = resolved.mode === "cdp" ? resolved.cdpUrl : void 0;
@@ -18851,7 +18919,8 @@ function createStagehandBrowserFactory(options) {
 			if (hasInitialState) localBrowserLaunchOptions["storageState"] = initialState;
 			if (!cdpUrl) {
 				const executablePath = await resolveChromeExecutablePath();
-				if (executablePath) localBrowserLaunchOptions["executablePath"] = executablePath;
+				if (!executablePath) throw new Error(LOCAL_CHROMIUM_MISSING_MESSAGE);
+				localBrowserLaunchOptions["executablePath"] = executablePath;
 				const args = ["--no-sandbox", "--disable-dev-shm-usage"];
 				if (isWsl()) {
 					wslProfileDir = await mkdtemp(join(tmpdir(), "stackbone-chromium-"));
@@ -18898,13 +18967,15 @@ function createStagehandBrowserFactory(options) {
 			await removeWslProfileDir();
 			throw err;
 		}
-		const pageHandle = stagehand.context.activePage() ?? await stagehand.context.newPage();
+		const pageHandle = cdpUrl ? await stagehand.context.newPage() : stagehand.context.activePage() ?? await stagehand.context.newPage();
+		const tabs = cdpUrl ? ownTabs(pageHandle, stagehand.context) : void 0;
 		if (hasInitialState) await injectStorageStateViaCDP(pageHandle, initialState);
 		const liveViewUrl = browserbase ? await resolveBrowserbaseLiveViewUrl(stagehand, browserbase, resolveLiveViewUrl) : void 0;
 		return {
-			page: adaptStagehandPage(stagehand, pageHandle),
+			page: adaptStagehandPage(stagehand, pageHandle, tabs),
 			close: async () => {
 				try {
+					await tabs?.closeAll();
 					await stagehand.close();
 				} finally {
 					await removeWslProfileDir();
@@ -18912,7 +18983,7 @@ function createStagehandBrowserFactory(options) {
 			},
 			isLive: async () => {
 				try {
-					return await probeStagehandLive(stagehand.context.activePage() ?? pageHandle);
+					return await probeStagehandLive(tabs?.current() ?? stagehand.context.activePage() ?? pageHandle);
 				} catch {
 					return false;
 				}
@@ -18969,6 +19040,97 @@ async function resolveBrowserbaseLiveViewUrl(stagehand, credentials, resolve) {
 	if (typeof sessionId !== "string" || sessionId.length === 0) return void 0;
 	return resolve(sessionId, credentials);
 }
+function ownTabs(first, context) {
+	const owned = new Set([first]);
+	let current = first;
+	const handled = /* @__PURE__ */ new Set();
+	let acting = Promise.resolve();
+	let closing = false;
+	const openTabs = () => {
+		try {
+			return typeof context.pages === "function" ? new Set(context.pages()) : void 0;
+		} catch {
+			return;
+		}
+	};
+	const currentTab = () => {
+		const open = openTabs();
+		if (open !== void 0 && !open.has(current)) {
+			const fallback = [...owned].reverse().find((tab) => open.has(tab));
+			if (fallback !== void 0) current = fallback;
+		}
+		return current;
+	};
+	const browserSend = async (method, params) => {
+		if (typeof context.conn?.send === "function") return context.conn.send(method, params);
+		const via = [currentTab(), ...owned].find((tab) => typeof tab.sendCDP === "function");
+		if (via?.sendCDP === void 0) throw new Error("This browser exposes no CDP access.");
+		return via.sendCDP(method, params);
+	};
+	const openedByOwned = async () => {
+		try {
+			const ownIds = new Set([...owned].flatMap((tab) => tab.targetId?.() ?? []));
+			if (ownIds.size === 0) return [];
+			const answer = await settleWithin(browserSend("Target.getTargets"), FOLLOW_TAB_CAP_MS, {});
+			const ownedOpener = (id) => id !== void 0 && ownIds.has(id);
+			return (answer.targetInfos ?? []).filter((info) => info.type === "page" && (ownedOpener(info.openerId) || ownedOpener(info.openerFrameId)) && !ownIds.has(info.targetId)).map((info) => info.targetId);
+		} catch {
+			return [];
+		}
+	};
+	const followOpenedTab = async () => {
+		if (closing) return;
+		const opened = new Set((await openedByOwned()).filter((id) => !handled.has(id)));
+		if (opened.size === 0) return;
+		for (const id of opened) handled.add(id);
+		for (let waited = 0;; waited += FOLLOW_TAB_POLL_MS) {
+			if (closing) return;
+			const tab = browserTabs(context).find((page) => opened.has(page.targetId?.() ?? ""));
+			if (tab !== void 0) {
+				owned.add(tab);
+				current = tab;
+				return;
+			}
+			if (waited >= FOLLOW_TAB_CAP_MS) return;
+			await delay(FOLLOW_TAB_POLL_MS);
+		}
+	};
+	return {
+		current: currentTab,
+		afterAct: (act) => {
+			const followed = act.then(async (result) => {
+				await followOpenedTab();
+				return result;
+			});
+			acting = Promise.allSettled([acting, followed]).then(() => void 0);
+			return followed;
+		},
+		closeAll: async () => {
+			closing = true;
+			await settleWithin(acting, FOLLOW_TAB_CAP_MS, void 0);
+			const children = await openedByOwned();
+			await settleWithin(Promise.allSettled([...children.map(async (targetId) => browserSend("Target.closeTarget", { targetId })), ...[...owned].map(async (tab) => tab.close())]), FOLLOW_TAB_CAP_MS, []);
+		}
+	};
+}
+/** `call`'s answer, or `fallback` once `ms` pass without one. */
+function settleWithin(call, ms, fallback) {
+	return raceTimer(call, ms, () => fallback);
+}
+/** The tabs of the browser; only the active one when the context cannot list them. */
+function browserTabs(context) {
+	try {
+		if (typeof context.pages === "function") return context.pages();
+		const active = context.activePage();
+		return active === void 0 ? [] : [active];
+	} catch {
+		return [];
+	}
+}
+/** Stagehand's own test for a Zod schema: `extract` reads its options after one. */
+function isZodSchema(value) {
+	return typeof value === "object" && value !== null && "parse" in value && "safeParse" in value;
+}
 /**
 * Bridge a Stagehand v3 instance + its CDP-backed page to the options-object
 * {@link BrowserPage} contract the browser tools and the session pool speak.
@@ -18982,11 +19144,14 @@ async function resolveBrowserbaseLiveViewUrl(stagehand, credentials, resolve) {
 * option is forwarded verbatim as the trailing options object. The model is not one of
 * them: it rides the call's async context ({@link withBrowserModel}).
 */
-function adaptStagehandPage(stagehand, initialPage) {
-	const livePage = () => stagehand.context.activePage() ?? initialPage;
+function adaptStagehandPage(stagehand, initialPage, tabs) {
+	const livePage = () => tabs?.current() ?? stagehand.context.activePage() ?? initialPage;
 	let downloadsSettled = Promise.resolve();
 	let downloadingFrom;
-	const afterDownloads = (run) => downloadsSettled.then(run);
+	const afterDownloads = (run) => {
+		const called = tabs?.current();
+		return downloadsSettled.then(() => run(called ?? livePage()));
+	};
 	const aiOptions = (opts) => {
 		const rest = {};
 		for (const [key, value] of Object.entries(opts ?? {})) if (key !== "action" && key !== "instruction" && key !== "schema") rest[key] = value;
@@ -18996,27 +19161,40 @@ function adaptStagehandPage(stagehand, initialPage) {
 		const value = (opts ?? {})["instruction"];
 		return typeof value === "string" ? value : void 0;
 	};
+	const onOwnTab = (opts, tab) => tabs ? {
+		...aiOptions(opts),
+		page: tab
+	} : aiOptions(opts);
 	return {
-		goto: (url, opts) => afterDownloads(() => livePage().goto(url, opts)),
-		url: () => (downloadingFrom ?? livePage()).url(),
-		title: () => afterDownloads(() => livePage().title()),
-		screenshot: (opts) => afterDownloads(() => livePage().screenshot(opts)),
-		act: (opts) => afterDownloads(() => {
-			const action = opts["action"];
-			const instruction = typeof action === "string" ? action : instructionOf(opts) ?? "";
-			return stagehand.act(instruction, aiOptions(opts));
+		goto: (url, opts) => afterDownloads((tab) => tab.goto(url, opts)),
+		url: () => (tabs?.current() ?? downloadingFrom ?? livePage()).url(),
+		title: () => afterDownloads((tab) => tab.title()),
+		screenshot: (opts) => afterDownloads((tab) => tab.screenshot(opts)),
+		act: (opts) => {
+			const act = afterDownloads((tab) => {
+				const action = opts["action"];
+				const instruction = typeof action === "string" ? action : instructionOf(opts) ?? "";
+				return stagehand.act(instruction, onOwnTab(opts, tab));
+			});
+			return tabs === void 0 ? act : tabs.afterAct(act);
+		},
+		extract: (opts) => afterDownloads((tab) => {
+			const instruction = instructionOf(opts);
+			const schema = (opts ?? {})["schema"];
+			if (tabs === void 0) return stagehand.extract(instruction, schema, aiOptions(opts));
+			if (instruction === void 0) return stagehand.extract(onOwnTab(opts, tab));
+			return isZodSchema(schema) ? stagehand.extract(instruction, schema, onOwnTab(opts, tab)) : stagehand.extract(instruction, onOwnTab(opts, tab));
 		}),
-		extract: (opts) => afterDownloads(() => stagehand.extract(instructionOf(opts), (opts ?? {})["schema"], aiOptions(opts))),
-		observe: (opts) => afterDownloads(() => stagehand.observe(instructionOf(opts), aiOptions(opts))),
-		storageState: () => afterDownloads(() => captureStorageStateViaCDP(livePage())),
-		applyStorageState: (state) => afterDownloads(() => injectStorageStateViaCDP(livePage(), state)),
-		evaluate: (script) => afterDownloads(() => {
-			const p = livePage();
-			return typeof p.evaluate === "function" ? p.evaluate(script) : void 0;
+		observe: (opts) => afterDownloads((tab) => {
+			const instruction = instructionOf(opts);
+			return tabs !== void 0 && instruction === void 0 ? stagehand.observe(onOwnTab(opts, tab)) : stagehand.observe(instruction, onOwnTab(opts, tab));
 		}),
+		storageState: () => afterDownloads((tab) => captureStorageStateViaCDP(tab)),
+		applyStorageState: (state) => afterDownloads((tab) => injectStorageStateViaCDP(tab, state)),
+		evaluate: (script) => afterDownloads((tab) => typeof tab.evaluate === "function" ? tab.evaluate(script) : void 0),
 		download: ({ url, maxBytes }) => {
-			const download = afterDownloads(async () => {
-				downloadingFrom = livePage();
+			const download = afterDownloads(async (tab) => {
+				downloadingFrom = tab;
 				try {
 					return await downloadFromFileOrigin(stagehand.context, downloadingFrom, url, maxBytes);
 				} finally {
@@ -19028,7 +19206,7 @@ function adaptStagehandPage(stagehand, initialPage) {
 		}
 	};
 }
-var MAX_DOWNLOAD_BYTES, DOWNLOAD_STALL_MS, browserModel, delay, DEFAULT_BROWSER_MODEL, BROWSERBASE_SESSION_TIMEOUT_SECONDS, BROWSERBASE_KEEP_ALIVE_ENV, HEADED_ENV, EXECUTABLE_PATH_ENV, PROBE_RETRY_DELAY_MS, BROWSERBASE_API_BASE$1, defaultResolveLiveViewUrl, defaultImportStagehand, readBrowserProviderSecrets, JSON_FENCE, STAGEHAND_PEER, STAGEHAND_INSTALL_SPEC;
+var MAX_DOWNLOAD_BYTES, DOWNLOAD_STALL_MS, browserModel, delay, DEFAULT_BROWSER_MODEL, BROWSERBASE_SESSION_TIMEOUT_SECONDS, BROWSERBASE_KEEP_ALIVE_ENV, HEADED_ENV, EXECUTABLE_PATH_ENV, LOCAL_CHROMIUM_MISSING_MESSAGE, PROBE_RETRY_DELAY_MS, BROWSERBASE_API_BASE$1, defaultResolveLiveViewUrl, defaultImportStagehand, readBrowserProviderSecrets, JSON_FENCE, FOLLOW_TAB_CAP_MS, FOLLOW_TAB_POLL_MS, STAGEHAND_PEER, STAGEHAND_INSTALL_SPEC;
 var init_browser_tools = __esmMin((() => {
 	init_ambient_client();
 	init_browser_profile_state();
@@ -19109,6 +19287,7 @@ var init_browser_tools = __esmMin((() => {
 	BROWSERBASE_KEEP_ALIVE_ENV = "STACKBONE_BROWSERBASE_KEEP_ALIVE";
 	HEADED_ENV = "STACKBONE_BROWSER_HEADED";
 	EXECUTABLE_PATH_ENV = "STACKBONE_BROWSER_EXECUTABLE_PATH";
+	LOCAL_CHROMIUM_MISSING_MESSAGE = `No local Chromium was found on this machine. Install one through Playwright (\`pnpm add playwright@1.59.1\`, then \`pnpm exec playwright install chromium\`) or pin a binary with ${EXECUTABLE_PATH_ENV}.`;
 	PROBE_RETRY_DELAY_MS = 150;
 	BROWSERBASE_API_BASE$1 = "https://api.browserbase.com";
 	defaultResolveLiveViewUrl = async (sessionId, credentials) => {
@@ -19127,6 +19306,8 @@ var init_browser_tools = __esmMin((() => {
 );
 	readBrowserProviderSecrets = (names) => stackbone.secrets.getMany(names);
 	JSON_FENCE = /^```(?:json)?[^\S\n]*\n([\s\S]*)```$/i;
+	FOLLOW_TAB_CAP_MS = 2e3;
+	FOLLOW_TAB_POLL_MS = 25;
 	STAGEHAND_PEER = {
 		pkg: "@browserbasehq/stagehand",
 		version: "3.6.0"
@@ -20014,14 +20195,14 @@ var init_link_auth_props = __esmMin((() => {
 init_link_auth_props();
 var mailboxPattern = new RegExp(LINK_MAILBOX_PATTERN);
 var GRAPH_ID = /^[a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}$/i;
-var EMAIL = /^[^@]+@[^@.]+(?:\.[^@.]+)+$/;
+var EMAIL$1 = /^[^@]+@[^@.]+(?:\.[^@.]+)+$/;
 function mailboxOfMapping(mapping) {
 	if (!mapping) return null;
 	let mailbox = null;
 	for (const key of mapping.matchAll(/(?<![\\\w`])"mailbox"\s*:/g)) {
 		const value = /^\s*((?:\(\s*)*)"([^"\\\s]+)"((?:\s*\))*)\s*(?=[,}])/.exec(mapping.slice(key.index + key[0].length));
 		if (!value || (value[1].match(/\(/g)?.length ?? 0) !== (value[3].match(/\)/g)?.length ?? 0)) return null;
-		if (!mailboxPattern.test(value[2]) || !EMAIL.test(value[2]) && !GRAPH_ID.test(value[2])) return null;
+		if (!mailboxPattern.test(value[2]) || !EMAIL$1.test(value[2]) && !GRAPH_ID.test(value[2])) return null;
 		if (mailbox !== null && mailbox !== value[2]) return null;
 		mailbox = value[2];
 	}
@@ -23190,7 +23371,7 @@ var init_role = __esmMin((() => {
 var STACKBONE_CLI_BUILD_VERSION, EMULATOR_CAPABILITY_ROUTES, EMULATOR_CAPABILITIES, buildContractResponse;
 var init_contract = __esmMin((() => {
 	init_src$26();
-	STACKBONE_CLI_BUILD_VERSION = "0.9.4";
+	STACKBONE_CLI_BUILD_VERSION = "0.9.5";
 	EMULATOR_CAPABILITY_ROUTES = {
 		"database.postgres_direct": "/api/db",
 		"rag.basic": "/api/rag",
@@ -27643,7 +27824,7 @@ function diffObjects(prev, next, basePath) {
 }
 function diffValue(prev, next, path) {
 	if (deepEqual$1(prev, next)) return [];
-	if (isPlainObject$1(prev) && isPlainObject$1(next)) return diffObjects(prev, next, path);
+	if (isPlainObject$2(prev) && isPlainObject$2(next)) return diffObjects(prev, next, path);
 	if (Array.isArray(prev) && Array.isArray(next)) return diffArrays(prev, next, path);
 	return [{
 		op: "replace",
@@ -27657,11 +27838,11 @@ function diffValue(prev, next, path) {
 function diffState(prev, next) {
 	return diffObjects(prev, next, "");
 }
-var EXCLUDED_KEYS, escapeSegment, isPlainObject$1, deepEqual$1;
+var EXCLUDED_KEYS, escapeSegment, isPlainObject$2, deepEqual$1;
 var init_state_projector = __esmMin((() => {
 	EXCLUDED_KEYS = new Set(["messages", "files"]);
 	escapeSegment = (key) => key.replace(/~/g, "~0").replace(/\//g, "~1");
-	isPlainObject$1 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+	isPlainObject$2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 	deepEqual$1 = (a, b) => {
 		if (a === b) return true;
 		if (typeof a !== typeof b) return false;
@@ -27669,7 +27850,7 @@ var init_state_projector = __esmMin((() => {
 			if (!Array.isArray(a) || !Array.isArray(b) || a.length !== b.length) return false;
 			return a.every((v, i) => deepEqual$1(v, b[i]));
 		}
-		if (isPlainObject$1(a) && isPlainObject$1(b)) {
+		if (isPlainObject$2(a) && isPlainObject$2(b)) {
 			const aKeys = Object.keys(a);
 			const bKeys = Object.keys(b);
 			if (aKeys.length !== bKeys.length) return false;
@@ -37864,7 +38045,7 @@ function argTargetLabel(target) {
 	return argSegments(target).join(".");
 }
 /** A plain JSON object — the only thing a path may traverse on the way down. */
-function isRecord$5(value) {
+function isRecord$6(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 /**
@@ -37885,7 +38066,7 @@ function setPath(target, path, value) {
 	let node = target;
 	for (const segment of segments) {
 		const existing = node[segment];
-		const next = isRecord$5(existing) ? { ...existing } : {};
+		const next = isRecord$6(existing) ? { ...existing } : {};
 		node[segment] = next;
 		node = next;
 	}
@@ -39570,7 +39751,7 @@ var init_extra_query_params = __esmMin((() => {}));
 //#endregion
 //#region ../../libs/shared/connect-registry/src/lib/introspector/openapi/openapi-introspector.ts
 /** A plain JSON object guard — the spec is `unknown`, so every descent re-checks. */
-function isRecord$4(value) {
+function isRecord$5(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function asString$2(value) {
@@ -39585,7 +39766,7 @@ function asString$2(value) {
 function firstServerUrl(node) {
 	const servers = node["servers"];
 	if (!Array.isArray(servers)) return void 0;
-	for (const server of servers) if (isRecord$4(server)) {
+	for (const server of servers) if (isRecord$5(server)) {
 		const url = asString$2(server["url"]);
 		if (url) return url;
 	}
@@ -39603,7 +39784,7 @@ function resolveRef(root, ref) {
 	const tokens = ref.slice(2).split("/").map((t) => t.replace(/~1/g, "/").replace(/~0/g, "~"));
 	let node = root;
 	for (const token of tokens) {
-		if (!isRecord$4(node)) return void 0;
+		if (!isRecord$5(node)) return void 0;
 		node = node[token];
 	}
 	return node;
@@ -39616,7 +39797,7 @@ function resolveRef(root, ref) {
 */
 function derefParameter(raw, root) {
 	let current = raw;
-	for (let i = 0; i < 8 && isRecord$4(current) && typeof current["$ref"] === "string"; i++) current = resolveRef(root, current["$ref"]);
+	for (let i = 0; i < 8 && isRecord$5(current) && typeof current["$ref"] === "string"; i++) current = resolveRef(root, current["$ref"]);
 	return current;
 }
 /**
@@ -39627,9 +39808,9 @@ function derefParameter(raw, root) {
 */
 function derefSchemaShallow(schema, root) {
 	const resolved = derefParameter(schema, root) ?? schema;
-	if (!isRecord$4(resolved)) return resolved;
+	if (!isRecord$5(resolved)) return resolved;
 	const items = resolved["items"];
-	if (isRecord$4(items) && typeof items["$ref"] === "string") {
+	if (isRecord$5(items) && typeof items["$ref"] === "string") {
 		const resolvedItems = derefParameter(items, root);
 		if (resolvedItems !== void 0) return {
 			...resolved,
@@ -39666,7 +39847,7 @@ function joinBasePath(basePath, path) {
 * small schema fragment from the recognised keywords.
 */
 function normalizeParameter$1(param, source, context, warnings) {
-	if (!isRecord$4(param)) {
+	if (!isRecord$5(param)) {
 		warnings.push(`${context}: skipped a non-object parameter`);
 		return null;
 	}
@@ -39718,12 +39899,12 @@ function normalizeParameter$1(param, source, context, warnings) {
 */
 function extractRequestBodyOpenapi(operation, root) {
 	const requestBody = derefParameter(operation["requestBody"], root);
-	if (!isRecord$4(requestBody)) return void 0;
+	if (!isRecord$5(requestBody)) return void 0;
 	const content = requestBody["content"];
-	if (!isRecord$4(content)) return void 0;
+	if (!isRecord$5(content)) return void 0;
 	const json = content["application/json"];
-	if (isRecord$4(json) && json["schema"] !== void 0) return json["schema"];
-	for (const mediaType of Object.values(content)) if (isRecord$4(mediaType) && mediaType["schema"] !== void 0) return mediaType["schema"];
+	if (isRecord$5(json) && json["schema"] !== void 0) return json["schema"];
+	for (const mediaType of Object.values(content)) if (isRecord$5(mediaType) && mediaType["schema"] !== void 0) return mediaType["schema"];
 }
 /**
 * Extract the success (200/2xx) response JSON Schema. Handles both dialects:
@@ -39732,7 +39913,7 @@ function extractRequestBodyOpenapi(operation, root) {
 */
 function extractResponseSchema(operation, source) {
 	const responses = operation["responses"];
-	if (!isRecord$4(responses)) return void 0;
+	if (!isRecord$5(responses)) return void 0;
 	const ordered = [
 		"200",
 		...Object.keys(responses).filter((c) => c !== "200" && /^2\d\d$/.test(c)).sort(),
@@ -39740,16 +39921,16 @@ function extractResponseSchema(operation, source) {
 	];
 	for (const code of ordered) {
 		const response = responses[code];
-		if (!isRecord$4(response)) continue;
+		if (!isRecord$5(response)) continue;
 		if (source === "swagger") {
 			if (response["schema"] !== void 0) return response["schema"];
 			continue;
 		}
 		const content = response["content"];
-		if (!isRecord$4(content)) continue;
+		if (!isRecord$5(content)) continue;
 		const json = content["application/json"];
-		if (isRecord$4(json) && json["schema"] !== void 0) return json["schema"];
-		for (const mediaType of Object.values(content)) if (isRecord$4(mediaType) && mediaType["schema"] !== void 0) return mediaType["schema"];
+		if (isRecord$5(json) && json["schema"] !== void 0) return json["schema"];
+		for (const mediaType of Object.values(content)) if (isRecord$5(mediaType) && mediaType["schema"] !== void 0) return mediaType["schema"];
 	}
 }
 /**
@@ -39775,7 +39956,7 @@ function buildOperation(rawPath, resolvedPath, method, operation, pathLevelParam
 			warnings.push(`${context}: skipped a parameter whose $ref did not resolve`);
 			continue;
 		}
-		if (isRecord$4(raw) && source === "swagger") {
+		if (isRecord$5(raw) && source === "swagger") {
 			const location = asString$2(raw["in"]);
 			if (location === "body") {
 				if (bodyParamSchema === void 0 && raw["schema"] !== void 0) {
@@ -39831,7 +40012,7 @@ function buildOperation(rawPath, resolvedPath, method, operation, pathLevelParam
 */
 function readContinuation(operation) {
 	const declared = operation["x-stackbone-continuation"];
-	if (!isRecord$4(declared)) return void 0;
+	if (!isRecord$5(declared)) return void 0;
 	const operationId = asString$2(declared["operationId"]);
 	const urlHeader = asString$2(declared["urlHeader"]);
 	if (operationId === void 0 || operationId === "") return void 0;
@@ -39851,7 +40032,7 @@ function readContinuation(operation) {
 */
 function introspectOpenApi(document) {
 	const warnings = [];
-	if (!isRecord$4(document)) {
+	if (!isRecord$5(document)) {
 		warnings.push("document is not an object; nothing to introspect");
 		return {
 			source: "openapi",
@@ -39871,7 +40052,7 @@ function introspectOpenApi(document) {
 	const basePath = source === "swagger" ? asString$2(document["basePath"]) : void 0;
 	const rootServerUrl = source === "openapi" ? firstServerUrl(document) : void 0;
 	const paths = document["paths"];
-	if (!isRecord$4(paths)) {
+	if (!isRecord$5(paths)) {
 		warnings.push("document has no 'paths' object; no operations extracted");
 		return {
 			source,
@@ -39882,7 +40063,7 @@ function introspectOpenApi(document) {
 	const operations = [];
 	const derivedIdWarnings = [];
 	for (const [rawPath, pathItem] of Object.entries(paths)) {
-		if (!isRecord$4(pathItem)) {
+		if (!isRecord$5(pathItem)) {
 			warnings.push(`path '${rawPath}': not an object, skipped`);
 			continue;
 		}
@@ -39892,7 +40073,7 @@ function introspectOpenApi(document) {
 		for (const method of HTTP_METHODS) {
 			const operation = pathItem[method];
 			if (operation === void 0) continue;
-			if (!isRecord$4(operation)) {
+			if (!isRecord$5(operation)) {
 				warnings.push(`${method.toUpperCase()} ${rawPath}: operation is not an object, skipped`);
 				continue;
 			}
@@ -41243,6 +41424,10 @@ var createTriggerSubscriptionsStore = (opts) => {
 			assertOpen();
 			const sets = [];
 			const params = [id];
+			if (patch.principalKey !== void 0) {
+				params.push(patch.principalKey);
+				sets.push(`principal_key = $${params.length}`);
+			}
 			if (patch.enabled !== void 0) {
 				params.push(patch.enabled);
 				sets.push(`enabled = $${params.length}`);
@@ -42323,7 +42508,7 @@ var init_route_registry_generation = __esmMin((() => {
 }));
 //#endregion
 //#region ../../libs/runtime/workspace-runtime/src/lib/operations/catalog.ts
-var JSON_MEDIA_TYPE, operationKey, capabilityGateIndex, PRIMITIVE_TYPES, isRecord$3, mediaTypeEssence, isExactlyJson, jsonSchemaOf$1, collectRefs, LOCAL_REF, resolveLocalRef, unresolvableRef, isBoundedPrimitive, DEFAULT_STYLE, isParameterLocation, normalizeParameter, bearerSatisfies, out, classify, toEntry$1, buildOperationCatalog, createOperationCatalogCache, visibleTo, EMPTY_FILTER_HINT, listOperations, OPERATION_NOT_FOUND, componentsReachedBy, closures, describeOperation;
+var JSON_MEDIA_TYPE, operationKey, capabilityGateIndex, PRIMITIVE_TYPES, isRecord$4, mediaTypeEssence, isExactlyJson, jsonSchemaOf$1, collectRefs, LOCAL_REF, resolveLocalRef, unresolvableRef, isBoundedPrimitive, DEFAULT_STYLE, isParameterLocation, normalizeParameter, bearerSatisfies, out, classify, toEntry$1, buildOperationCatalog, createOperationCatalogCache, visibleTo, EMPTY_FILTER_HINT, listOperations, OPERATION_NOT_FOUND, componentsReachedBy, closures, describeOperation;
 var init_catalog = __esmMin((() => {
 	init_src$26();
 	init_mutations_outside_catalog();
@@ -42349,7 +42534,7 @@ var init_catalog = __esmMin((() => {
 		"integer",
 		"boolean"
 	]);
-	isRecord$3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+	isRecord$4 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 	mediaTypeEssence = (mediaType) => (mediaType.split(";")[0] ?? "").trim().toLowerCase();
 	isExactlyJson = (content) => {
 		const types = Object.keys(content ?? {}).map(mediaTypeEssence);
@@ -42358,7 +42543,7 @@ var init_catalog = __esmMin((() => {
 	jsonSchemaOf$1 = (content) => Object.entries(content).find(([type]) => mediaTypeEssence(type) === JSON_MEDIA_TYPE)?.[1]?.schema;
 	collectRefs = (node, into = /* @__PURE__ */ new Set()) => {
 		if (Array.isArray(node)) for (const item of node) collectRefs(item, into);
-		else if (isRecord$3(node)) for (const [key, value] of Object.entries(node)) if (key === "$ref" && typeof value === "string") into.add(value);
+		else if (isRecord$4(node)) for (const [key, value] of Object.entries(node)) if (key === "$ref" && typeof value === "string") into.add(value);
 		else collectRefs(value, into);
 		return into;
 	};
@@ -42401,7 +42586,7 @@ var init_catalog = __esmMin((() => {
 		}
 	};
 	isBoundedPrimitive = (schema) => {
-		if (!isRecord$3(schema) || "$ref" in schema) return false;
+		if (!isRecord$4(schema) || "$ref" in schema) return false;
 		const branches = schema["anyOf"] ?? schema["oneOf"];
 		if (Array.isArray(branches)) return branches.length > 0 && branches.every(isBoundedPrimitive);
 		if (Array.isArray(schema["enum"])) return schema["enum"].every((value) => value === null || [
@@ -42425,8 +42610,8 @@ var init_catalog = __esmMin((() => {
 	};
 	isParameterLocation = (value) => value === "path" || value === "query" || value === "header";
 	normalizeParameter = (raw, components) => {
-		const doc = isRecord$3(raw) && typeof raw["$ref"] === "string" ? resolveLocalRef(raw["$ref"], components)?.value : raw;
-		if (!isRecord$3(doc)) return void 0;
+		const doc = isRecord$4(raw) && typeof raw["$ref"] === "string" ? resolveLocalRef(raw["$ref"], components)?.value : raw;
+		if (!isRecord$4(doc)) return void 0;
 		const parameter = doc;
 		if (typeof parameter.name !== "string" || !isParameterLocation(parameter.in)) return void 0;
 		if (parameter.content !== void 0 || parameter.allowReserved === true) return void 0;
@@ -42466,7 +42651,7 @@ var init_catalog = __esmMin((() => {
 			requestBody = {
 				required: doc.requestBody.required === true,
 				contentType: JSON_MEDIA_TYPE,
-				schema: isRecord$3(schema) ? schema : {}
+				schema: isRecord$4(schema) ? schema : {}
 			};
 		}
 		const responses = {};
@@ -42487,7 +42672,7 @@ var init_catalog = __esmMin((() => {
 			responses[status] = {
 				description,
 				contentType: JSON_MEDIA_TYPE,
-				...isRecord$3(schema) ? { schema } : {}
+				...isRecord$4(schema) ? { schema } : {}
 			};
 		}
 		if (successes === 0) return out("response_media_type");
@@ -42546,16 +42731,16 @@ var init_catalog = __esmMin((() => {
 		contentTypes: operation.contentTypes
 	});
 	buildOperationCatalog = (document, gates, generation = 0) => {
-		const components = Object.fromEntries(Object.entries(document.components ?? {}).filter((entry) => isRecord$3(entry[1])));
+		const components = Object.fromEntries(Object.entries(document.components ?? {}).filter((entry) => isRecord$4(entry[1])));
 		const documentSecurity = document.security;
 		const seen = /* @__PURE__ */ new Map();
 		const eligible = [];
 		const excluded = [];
 		for (const [path, item] of Object.entries(document.paths ?? {})) {
-			if (!isRecord$3(item)) continue;
+			if (!isRecord$4(item)) continue;
 			for (const method of HTTP_METHODS$1) {
 				const doc = item[method];
-				if (!isRecord$3(doc)) continue;
+				if (!isRecord$4(doc)) continue;
 				const operation = doc;
 				const METHOD = method.toUpperCase();
 				const operationId = operation.operationId;
@@ -43879,6 +44064,20 @@ var init_target_input_schema = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../../libs/runtime/workspace-runtime/src/lib/connect-inbound/connected-account.ts
+var isPlainObject$1, enrichWithAccount;
+var init_connected_account = __esmMin((() => {
+	isPlainObject$1 = (value) => {
+		if (typeof value !== "object" || value === null) return false;
+		const proto = Object.getPrototypeOf(value);
+		return proto === Object.prototype || proto === null;
+	};
+	enrichWithAccount = (payload, account) => account !== null && isPlainObject$1(payload) ? {
+		...payload,
+		connectedAccount: account
+	} : payload;
+}));
+//#endregion
 //#region ../../libs/runtime/workspace-runtime/src/lib/workflow/agent-echo-paths.ts
 var AGENT_ECHO_PATHS, defaultAgentEchoPath, AGENT_ECHO_EVENT_FIELDS, eventField, comparable, agentEchoCandidate, lookupAgentEcho, agentEchoRejectionMessage, agentEchoLookup;
 var init_agent_echo_paths = __esmMin((() => {
@@ -43942,6 +44141,7 @@ var init_event_forwarder = __esmMin((() => {
 	init_src$13();
 	init_src$7();
 	init_target_input_schema();
+	init_connected_account();
 	init_agent_echo_paths();
 	AGENT_ECHO_LOOKUP_TIMEOUT_MS = 1e4;
 	issue = (message) => [{
@@ -44001,6 +44201,14 @@ var init_event_forwarder = __esmMin((() => {
 		* path.
 		*/
 		if (claim.outcome === "taken_over" && claim.takeoverCount > 3) return reject("claim_abandoned", `delivery abandoned after ${claim.takeoverCount} claim takeovers (cap 3): every attempt died before it marked the delivery, which is what an item whose forward kills the process looks like. Nothing ran and the link's cursor now advances past it, so the items behind it are delivered. Inspect the payload in trigger_deliveries and re-deliver it by hand once the cause is fixed.`);
+		const readBeforeAttempt = async (what, read) => {
+			try {
+				return await withTimeout(read(), AGENT_ECHO_LOOKUP_TIMEOUT_MS, () => /* @__PURE__ */ new Error(`${what} exceeded ${AGENT_ECHO_LOOKUP_TIMEOUT_MS}ms`));
+			} catch (err) {
+				await bestEffort(() => deps.deliveries.release(subscription.id, event.id), "release");
+				throw err;
+			}
+		};
 		/**
 		* The agent's own write coming back (STA3-32), asked before anything is attempted
 		* so it neither starts the agent nor wakes a parked run. A hit is terminal like
@@ -44019,13 +44227,8 @@ var init_event_forwarder = __esmMin((() => {
 		* An event with no id is never asked about, as in S1, so a keyless event is
 		* forwarded exactly as it was before this guard.
 		*/
-		let ownEcho = null;
-		try {
-			if (event.id !== "" && deps.isAgentEcho !== void 0) ownEcho = await withTimeout(deps.isAgentEcho(subscription, event.payload), AGENT_ECHO_LOOKUP_TIMEOUT_MS, () => /* @__PURE__ */ new Error(`agent echo lookup exceeded ${AGENT_ECHO_LOOKUP_TIMEOUT_MS}ms`));
-		} catch (err) {
-			await bestEffort(() => deps.deliveries.release(subscription.id, event.id), "release");
-			throw err;
-		}
+		const isAgentEcho = deps.isAgentEcho;
+		const ownEcho = event.id !== "" && isAgentEcho !== void 0 ? await readBeforeAttempt("agent echo lookup", () => isAgentEcho(subscription, event.payload)) : null;
 		if (ownEcho !== null) return reject("own_echo", agentEchoRejectionMessage(subscription.connector, ownEcho));
 		const start = subscription.targetKind === "workflow" ? deps.start : subscription.targetKind === "agent" ? deps.startAgent : void 0;
 		if (!start) return reject("not_found", `This box cannot start a "${subscription.targetKind}" from a trigger link.`);
@@ -44072,13 +44275,26 @@ var init_event_forwarder = __esmMin((() => {
 		*/
 		const lostTheFence = () => ({ status: "claim_pending" });
 		const rejectMapping = (message) => reject("mapping_error", message);
-		const applied = await mapLinkEvent(subscription, event.payload, deps.limits);
+		/**
+		* The account the link runs as (STA3-123, criterion 9), added before the mapping
+		* and both keys read the event, so a key can name the mailbox too. The echo check
+		* above reads the event as the provider sent it, and so does the sample the tick
+		* keeps.
+		*
+		* A read that fails takes the echo lookup's path above, bound included, and for a
+		* reason of its own: forwarded without its account, the event of a link whose
+		* mapping reads `connectedAccount` fails the workflow's schema, and that
+		* rejection is terminal, so one database blip would drop the mail for good.
+		*/
+		const connectedAccountOf = deps.connectedAccountOf;
+		const payload = connectedAccountOf ? enrichWithAccount(event.payload, await readBeforeAttempt("connected account lookup", () => connectedAccountOf(subscription))) : event.payload;
+		const applied = await mapLinkEvent(subscription, payload, deps.limits);
 		if (!applied.ok) return rejectMapping(applied.error.message);
 		const correlationKey = subscription.targetKind === "workflow" ? subscription.correlationKey?.trim() : void 0;
 		if (correlationKey && deps.resume) {
 			const compiledKey = compileMapping(correlationKey);
 			if (!compiledKey.ok) return rejectMapping(compiledKey.error.message);
-			const keyResult = await applyMapping(compiledKey.value, event.payload, deps.limits);
+			const keyResult = await applyMapping(compiledKey.value, payload, deps.limits);
 			if (!keyResult.ok) return rejectMapping(keyResult.error.message);
 			const token = coerceToken(keyResult.value);
 			if (token) {
@@ -44098,7 +44314,7 @@ var init_event_forwarder = __esmMin((() => {
 		}
 		const conversationKey = subscription.targetKind === "agent" ? subscription.conversationKey?.trim() : void 0;
 		let startOptions = conversationKey ? {
-			conversationKeyValue: await evaluateConversationKey(conversationKey, subscription.id, event.payload, deps.limits),
+			conversationKeyValue: await evaluateConversationKey(conversationKey, subscription.id, payload, deps.limits),
 			...typeof subscription.debounceMs === "number" && { debounceMs: subscription.debounceMs }
 		} : void 0;
 		if (subscription.targetKind === "agent" && event.id !== "" && deps.isAgentEcho) {
@@ -50143,6 +50359,12 @@ var createAppHooks = (deps) => {
 		captureConnectConnectorRows: (fn) => {
 			captured.connectConnectorRows = fn;
 		},
+		captureConnectResolveAccountKey: (fn) => {
+			captured.connectResolveAccountKey = fn;
+		},
+		captureConnectConnectedAccountOf: (fn) => {
+			captured.connectConnectedAccountOf = fn;
+		},
 		captureConnectSpecCache: (cache) => {
 			captured.connectSpecCache = cache;
 		},
@@ -52557,6 +52779,203 @@ var init_get_token = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../../libs/runtime/connect-broker/src/lib/oauth/default-oauth-exchanger.ts
+/**
+* Call a provider endpoint and read its answer as JSON. A non-2xx status or a
+* body that is not JSON throws what `fail` builds from the detail.
+* The token endpoint and the userinfo lookup (`account-identity.ts`) both read
+* a provider's answer through here.
+*/
+async function fetchProviderJson(fetchImpl, url, init, fail) {
+	const response = await fetchImpl(url, init);
+	const raw = await response.text();
+	if (!response.ok) throw fail(`returned ${response.status}: ${raw.slice(0, 500)}`);
+	try {
+		return JSON.parse(raw);
+	} catch {
+		throw fail("returned a non-JSON body");
+	}
+}
+var tokenEndpointResponseSchema, formEncoded, DefaultOAuthExchanger;
+var init_default_oauth_exchanger = __esmMin((() => {
+	init_src$27();
+	tokenEndpointResponseSchema = z.object({
+		access_token: z.string(),
+		refresh_token: z.string().optional(),
+		expires_in: z.number().optional(),
+		id_token: z.string().optional()
+	});
+	formEncoded = (value) => new URLSearchParams([["", value]]).toString().slice(1);
+	DefaultOAuthExchanger = class {
+		constructor(deps) {
+			this.fetchImpl = deps?.fetch ?? globalThis.fetch;
+			this.now = deps?.now ?? Date.now;
+			this.tokenEndpointAuthMethodOf = deps?.tokenEndpointAuthMethodOf ?? (() => void 0);
+		}
+		async exchangeCode(input) {
+			const client = this.clientAuthentication(input.connector);
+			const { params } = client;
+			params.set("grant_type", "authorization_code");
+			params.set("code", input.code);
+			params.set("redirect_uri", input.redirectUri);
+			if (input.codeVerifier) params.set("code_verifier", input.codeVerifier);
+			return this.post(input.connector.tokenUrl, client, "invalid_grant");
+		}
+		async refresh(input) {
+			const client = this.clientAuthentication(input.connector);
+			client.params.set("grant_type", "refresh_token");
+			client.params.set("refresh_token", input.refreshToken);
+			return this.post(input.connector.tokenUrl, client, "credential_error");
+		}
+		async exchangeClientCredentials(input) {
+			const client = this.clientAuthentication(input.connector);
+			const { params } = client;
+			params.set("grant_type", "client_credentials");
+			const scope = input.scope ?? input.connector.scopes.join(" ");
+			if (scope) params.set("scope", scope);
+			const tokens = await this.post(input.connector.tokenUrl, client, "credential_error");
+			delete tokens.refreshToken;
+			return tokens;
+		}
+		/**
+		* The client's half of a token request. In the body, `client_id` and an
+		* optional `client_secret`. In a Basic header, each form-encoded and then
+		* joined with a colon (RFC 6749 §2.3.1), so a colon in the id cannot be read
+		* as the separator; a public client sends an empty password. Never both.
+		*/
+		clientAuthentication(connector) {
+			const params = new URLSearchParams();
+			if (this.tokenEndpointAuthMethodOf(connector) === "client_secret_basic") {
+				const credentials = `${formEncoded(connector.clientId)}:${formEncoded(connector.clientSecret ?? "")}`;
+				return {
+					params,
+					headers: { authorization: `Basic ${Buffer.from(credentials, "utf8").toString("base64")}` }
+				};
+			}
+			params.set("client_id", connector.clientId);
+			if (connector.clientSecret) params.set("client_secret", connector.clientSecret);
+			return {
+				params,
+				headers: {}
+			};
+		}
+		/**
+		* POST the form to the token endpoint and parse the response into
+		* `ExchangedTokens`. A non-2xx response or an unparseable body becomes a
+		* `BrokerError` with the supplied failure code (`invalid_grant` for a code
+		* exchange, `credential_error` for a refresh).
+		*/
+		async post(tokenUrl, { params, headers }, failureCode) {
+			if (!tokenUrl) throw makeBrokerError("credential_error", "connector has no tokenUrl configured for the OAuth token exchange");
+			const body = await fetchProviderJson(this.fetchImpl, tokenUrl, {
+				method: "POST",
+				headers: {
+					"content-type": "application/x-www-form-urlencoded",
+					accept: "application/json",
+					...headers
+				},
+				body: params.toString()
+			}, (detail) => makeBrokerError(failureCode, `token endpoint ${detail}`));
+			const parsed = tokenEndpointResponseSchema.safeParse(body);
+			if (!parsed.success) throw makeBrokerError(failureCode, `token endpoint response missing access_token: ${parsed.error.message}`);
+			const result = { accessToken: parsed.data.access_token };
+			if (parsed.data.refresh_token) result.refreshToken = parsed.data.refresh_token;
+			if (typeof parsed.data.expires_in === "number") result.expiresAt = this.now() + parsed.data.expires_in * 1e3;
+			if (parsed.data.id_token) result.idToken = parsed.data.id_token;
+			return result;
+		}
+	};
+}));
+//#endregion
+//#region ../../libs/runtime/connect-broker/src/lib/oauth/account-identity.ts
+/**
+* The email of the Google account behind `tokens`: the `id_token`'s `email`, else
+* Google's userinfo. Null, with no fetch, for a connector whose token endpoint is
+* not Google's. Throws `credential_error` when Google's userinfo fails, times
+* out or names no email.
+*/
+async function resolveAccountIdentity(input) {
+	if (hostOf(input.connector.tokenUrl) !== GOOGLE_TOKEN_HOST) return null;
+	const claims = input.tokens.idToken ? idTokenClaims(input.tokens.idToken) : null;
+	const claimed = claims ? emailOf(claims) : null;
+	if (claimed) return { email: claimed };
+	const fetchImpl = input.fetch ?? globalThis.fetch;
+	const headers = {
+		authorization: `Bearer ${input.tokens.accessToken}`,
+		accept: "application/json"
+	};
+	let answer;
+	try {
+		answer = await fetchWithTimeout(({ signal }) => fetchProviderJson(fetchImpl, GOOGLE_USERINFO_URL, {
+			method: "GET",
+			headers,
+			signal
+		}, userinfoFailure), input.timeoutMs ?? 1e4, (ms) => /* @__PURE__ */ new Error(`timed out after ${ms}ms`));
+	} catch (err) {
+		throw isBrokerError(err) ? err : userinfoFailure(`did not answer: ${err instanceof Error ? err.message : String(err)}`);
+	}
+	const email = isRecord$3(answer) ? emailOf(answer) : null;
+	if (!email) throw userinfoFailure("answered with no email");
+	return { email };
+}
+function hostOf(url) {
+	if (!url) return "";
+	try {
+		return new URL(url).hostname;
+	} catch {
+		return "";
+	}
+}
+/** The `email` of an id_token's claims or of Google's userinfo, when it is one. */
+function emailOf(record) {
+	const value = record["email"];
+	const candidate = typeof value === "string" ? value.trim().toLowerCase() : "";
+	return EMAIL.test(candidate) ? candidate : null;
+}
+/**
+* The claims of a JWS-compact `id_token`, or null when it is not one. The
+* signature is not checked: the token came straight from the token endpoint over
+* TLS (OpenID Connect Core 3.1.3.7), and a token that does not decode only means
+* the email is looked up at Google's userinfo.
+*/
+function idTokenClaims(idToken) {
+	const segments = idToken.split(".");
+	const payload = segments[1];
+	if (segments.length !== 3 || !payload || !BASE64URL.test(payload)) return null;
+	try {
+		const claims = JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
+		return isRecord$3(claims) ? claims : null;
+	} catch {
+		return null;
+	}
+}
+var GOOGLE_TOKEN_HOST, GOOGLE_USERINFO_URL, userinfoFailure, EMAIL, isRecord$3, BASE64URL;
+var init_account_identity = __esmMin((() => {
+	init_src$27();
+	init_src$13();
+	init_default_oauth_exchanger();
+	GOOGLE_TOKEN_HOST = "oauth2.googleapis.com";
+	GOOGLE_USERINFO_URL = "https://www.googleapis.com/oauth2/v2/userinfo";
+	userinfoFailure = (detail) => makeBrokerError("credential_error", `userinfo endpoint ${detail}`);
+	EMAIL = /^[^\s@]+@[^\s@.]+(?:\.[^\s@.]+)+$/;
+	isRecord$3 = (value) => typeof value === "object" && value !== null;
+	BASE64URL = /^[A-Za-z0-9_-]+$/;
+}));
+//#endregion
+//#region ../../libs/runtime/connect-broker/src/lib/refresh/logger.ts
+var consoleRefreshLogger;
+var init_logger = __esmMin((() => {
+	consoleRefreshLogger = {
+		error: (message, context) => console.error("ERROR", message, context ? JSON.stringify(context) : ""),
+		warn: (message, context) => console.warn("WARN", message, context ? JSON.stringify(context) : ""),
+		info: (message, context) => console.info("INFO", message, context ? JSON.stringify(context) : ""),
+		debug: (message, context) => {
+			if (process.env["STACKBONE_DEBUG"] !== "1") return;
+			console.debug("DEBUG", message, context ? JSON.stringify(context) : "");
+		}
+	};
+}));
+//#endregion
 //#region ../../libs/runtime/connect-broker/src/lib/oauth/state.ts
 function base64UrlEncode(bytes) {
 	return bytes.toString("base64url");
@@ -52633,16 +53052,25 @@ var init_state = __esmMin((() => {
 }));
 //#endregion
 //#region ../../libs/runtime/connect-broker/src/lib/oauth/oauth-flow.ts
-var DEFAULT_BINDING_TTL_MS, mintCodeVerifier, codeChallengeOf, OAuthFlow;
+var APP_PRINCIPAL$1, LEGACY_KEY, failureOf$2, DEFAULT_BINDING_TTL_MS, mintCodeVerifier, codeChallengeOf, OAuthFlow;
 var init_oauth_flow = __esmMin((() => {
 	init_src$27();
+	init_account_identity();
+	init_logger();
 	init_state();
+	APP_PRINCIPAL$1 = { type: "app" };
+	LEGACY_KEY = principalKey(APP_PRINCIPAL$1);
+	failureOf$2 = (err) => err instanceof Error ? {
+		error: err.message,
+		stack: err.stack
+	} : { error: String(err) };
 	DEFAULT_BINDING_TTL_MS = 600 * 1e3;
 	mintCodeVerifier = () => randomBytes(32).toString("base64url");
 	codeChallengeOf = (verifier, method) => method === "S256" ? createHash("sha256").update(verifier).digest("base64url") : verifier;
 	OAuthFlow = class {
 		constructor(deps) {
 			this.deps = deps;
+			this.logger = deps.logger ?? consoleRefreshLogger;
 		}
 		now() {
 			return this.deps.now ? this.deps.now() : Date.now();
@@ -52735,23 +53163,142 @@ var init_oauth_flow = __esmMin((() => {
 				redirectUri: this.deps.brokerCallbackUrl,
 				...binding.codeVerifier !== void 0 ? { codeVerifier: binding.codeVerifier } : {}
 			});
+			const account = await this.resolveAccount({
+				connector,
+				tokens
+			});
+			const key = account ? principalKey({
+				type: "user",
+				issuer: connector.connectorId,
+				id: account.email
+			}) : state.principalKey;
 			const grant = {
 				orgId: connector.orgId,
 				connector: connector.connectorId,
-				principalKey: state.principalKey,
+				principalKey: key,
 				accessToken: tokens.accessToken,
 				refreshToken: tokens.refreshToken ?? null,
 				expiresAt: tokens.expiresAt ?? null,
-				externalSubject: null
+				externalSubject: account?.email ?? null
 			};
-			await this.deps.store.upsertGrant(grant);
+			const fold = account === null ? "none" : await this.foldLegacyGrant(connector, grant);
+			if (fold === "none" && account !== null) await this.upsertAdoptingLegacyLinks(grant);
+			else if (fold !== "folded") await this.deps.store.upsertGrant(grant);
+			const legacyLinksLeft = fold === "kept" ? await this.countLegacyLinks(connector) : void 0;
 			return {
 				redirectTo: this.resolveConsumerRedirect(binding, state),
 				granted: {
 					connector: connector.connectorId,
-					principalKey: state.principalKey
-				}
+					principalKey: key
+				},
+				...legacyLinksLeft ? { legacyLinksLeft } : {}
+			};
+		}
+		resolveAccount(input) {
+			return (this.deps.resolveAccountIdentity ?? resolveAccountIdentity)(input);
+		}
+		/**
+		* D12: a reconnect of the mailbox the connector's legacy `app` grant belongs to
+		* folds the two grants into one. `kept`, with nothing of the legacy grant
+		* written, for another mailbox, no identity, any failure on the way, or a legacy
+		* grant that changed while its identity was read: the caller keeps both, and the
+		* log says why (D15). `none`, quietly, when there is no legacy grant (every first
+		* connect) or this flow cannot fold.
+		*/
+		async foldLegacyGrant(connector, account) {
+			const { store, issueGrantToken, moveAccountLinks } = this.deps;
+			if (!store.foldLegacyGrant || !issueGrantToken || !moveAccountLinks) return "none";
+			const { orgId, connectorId } = connector;
+			let legacyGrantId = null;
+			const keepBoth = (reason, detail = {}) => {
+				this.logger.warn("reconnect kept the legacy app grant beside the account", {
+					orgId,
+					connector: connectorId,
+					legacyGrantId,
+					reason,
+					...detail
+				});
+				return "kept";
 			};
+			try {
+				legacyGrantId = (await store.getGrantTokenRevision(orgId, connectorId, LEGACY_KEY))?.id ?? null;
+				if (legacyGrantId === null) return "none";
+				const accessToken = await issueGrantToken({
+					orgId,
+					principal: APP_PRINCIPAL$1
+				}, connector);
+				const revision = await store.getGrantTokenRevision(orgId, connectorId, LEGACY_KEY);
+				if (revision === null || revision.id !== legacyGrantId) return keepBoth("legacy_changed");
+				const legacy = await this.resolveAccount({
+					connector,
+					tokens: { accessToken }
+				});
+				if (legacy === null) return keepBoth("no_identity");
+				if (legacy.email !== account.externalSubject) return keepBoth("other_mailbox");
+				if (await store.foldLegacyGrant({
+					legacy: {
+						...revision,
+						principalKey: LEGACY_KEY
+					},
+					account
+				}, moveAccountLinks) === null) return keepBoth("legacy_changed");
+				return "folded";
+			} catch (err) {
+				if (isBrokerError(err)) return keepBoth("broker_error", {
+					code: err.code,
+					error: err.message
+				});
+				this.logger.error("reconnect could not fold the legacy app grant and kept both", {
+					orgId,
+					connector: connectorId,
+					legacyGrantId,
+					reason: "unexpected_error",
+					...failureOf$2(err)
+				});
+				return "kept";
+			}
+		}
+		/**
+		* D16: an account connected on a connector with no grant takes the links a
+		* revoked grant left under `app`, as the grant that used to land back on `app`
+		* did. With any grant on the connector, only the account's own is written; the
+		* store decides inside the write, so two first connects never both adopt.
+		*/
+		async upsertAdoptingLegacyLinks(account) {
+			const { store, moveAccountLinks } = this.deps;
+			if (!store.upsertGrantAdoptingLinks || !moveAccountLinks) {
+				await store.upsertGrant(account);
+				return;
+			}
+			const moved = await store.upsertGrantAdoptingLinks({
+				account,
+				from: LEGACY_KEY
+			}, moveAccountLinks);
+			if (moved && moved.triggers + moved.outputs > 0) this.logger.info("connect adopted the links a revoked grant left under app", {
+				orgId: account.orgId,
+				connector: account.connector,
+				...moved
+			});
+		}
+		/**
+		* The links still under the legacy `app` grant after a reconnect kept it (D15).
+		* A count that fails is logged and left out: the grant is already stored, and
+		* failing the callback now would spend the single-use `state` for a report.
+		*/
+		async countLegacyLinks(connector) {
+			try {
+				return await this.deps.countAccountLinks?.({
+					connector: connector.connectorId,
+					principalKey: LEGACY_KEY
+				});
+			} catch (err) {
+				this.logger.error("reconnect could not count the links left on the legacy app grant", {
+					orgId: connector.orgId,
+					connector: connector.connectorId,
+					...failureOf$2(err)
+				});
+				return;
+			}
 		}
 		/**
 		* Resolve the CONSUMER redirect target the broker 302s the browser to after a
@@ -52810,7 +53357,12 @@ var init_connect_service = __esmMin((() => {
 				brokerCallbackUrl: deps.oauth.brokerCallbackUrl,
 				stateSecret: deps.oauth.stateSecret,
 				...deps.oauth.bindingTtlMs !== void 0 ? { bindingTtlMs: deps.oauth.bindingTtlMs } : {},
-				now: this.now
+				now: this.now,
+				...deps.resolveAccountIdentity !== void 0 ? { resolveAccountIdentity: deps.resolveAccountIdentity } : {},
+				issueGrantToken: async (caller, connector) => (await this.buildGetTokenService(connector).getToken(caller, connector.connectorId)).token,
+				...deps.moveAccountLinks !== void 0 ? { moveAccountLinks: deps.moveAccountLinks } : {},
+				...deps.countAccountLinks !== void 0 ? { countAccountLinks: deps.countAccountLinks } : {},
+				...deps.logger !== void 0 ? { logger: deps.logger } : {}
 			});
 		}
 		/**
@@ -53330,11 +53882,11 @@ var init_drizzle_broker_store = __esmMin((() => {
 			if (!row) return null;
 			return toGrantSummary(row);
 		}
-		async upsertGrant(record) {
+		async upsertGrant(record, tx) {
 			const access = this.encrypt(record.accessToken);
 			const refresh = this.encryptNullable(record.refreshToken);
 			const expiresAt = record.expiresAt === null ? null : new Date(record.expiresAt);
-			const [row] = await this.db.insert(connectionGrantTable).values({
+			const [row] = await (tx ?? this.db).insert(connectionGrantTable).values({
 				organizationId: record.orgId,
 				connector: record.connector,
 				principalKey: record.principalKey,
@@ -53383,6 +53935,66 @@ var init_drizzle_broker_store = __esmMin((() => {
 			}).where(and(eq(connectionGrantTable.id, expected.id), eq(connectionGrantTable.organizationId, expected.orgId), eq(connectionGrantTable.connector, expected.connector), eq(connectionGrantTable.principalKey, expected.principalKey), eq(connectionGrantTable.accessTokenNonce, Buffer.from(expected.tokenRevision, "hex")), isNull(connectionGrantTable.materialCiphertext))).returning();
 			return row ? this.decryptGrant(row) : null;
 		}
+		async foldLegacyGrant(fold, moveLinks) {
+			const { legacy, account } = fold;
+			const access = this.encrypt(account.accessToken);
+			const refresh = this.encryptNullable(account.refreshToken);
+			const credentials = {
+				accessTokenNonce: access.nonce,
+				accessTokenCiphertext: access.ciphertext,
+				refreshTokenNonce: refresh?.nonce ?? null,
+				refreshTokenCiphertext: refresh?.ciphertext ?? null,
+				materialNonce: null,
+				materialCiphertext: null,
+				expiresAt: account.expiresAt === null ? null : new Date(account.expiresAt),
+				externalSubject: account.externalSubject,
+				healthStatus: "active",
+				healthDetail: null,
+				updatedAt: /* @__PURE__ */ new Date()
+			};
+			const ofConnector = and(eq(connectionGrantTable.organizationId, account.orgId), eq(connectionGrantTable.connector, account.connector));
+			const legacyAsRead = and(ofConnector, eq(connectionGrantTable.id, legacy.id), eq(connectionGrantTable.principalKey, legacy.principalKey), eq(connectionGrantTable.accessTokenNonce, Buffer.from(legacy.tokenRevision, "hex")), isNull(connectionGrantTable.materialCiphertext));
+			return this.db.transaction(async (tx) => {
+				await tx.select({ id: connectorTable.id }).from(connectorTable).where(and(eq(connectorTable.organizationId, account.orgId), eq(connectorTable.connectorId, account.connector))).for("update");
+				const [own] = await tx.select({ id: connectionGrantTable.id }).from(connectionGrantTable).where(and(ofConnector, eq(connectionGrantTable.principalKey, account.principalKey))).for("update");
+				let row;
+				if (own) {
+					if ((await tx.delete(connectionGrantTable).where(legacyAsRead).returning({ id: connectionGrantTable.id })).length === 0) return null;
+					[row] = await tx.update(connectionGrantTable).set(credentials).where(eq(connectionGrantTable.id, own.id)).returning();
+					if (!row) throw makeBrokerError("execute_failed", "the account grant vanished mid-fold");
+				} else {
+					[row] = await tx.update(connectionGrantTable).set({
+						principalKey: account.principalKey,
+						...credentials
+					}).where(legacyAsRead).returning();
+					if (!row) return null;
+				}
+				await moveLinks(tx, {
+					connector: account.connector,
+					from: legacy.principalKey,
+					to: account.principalKey
+				});
+				return this.decryptGrant(row);
+			});
+		}
+		async upsertGrantAdoptingLinks({ account, from }, moveLinks) {
+			return this.db.transaction(async (tx) => {
+				await tx.select({ id: connectorTable.id }).from(connectorTable).where(and(eq(connectorTable.organizationId, account.orgId), eq(connectorTable.connectorId, account.connector))).for("update");
+				const [held] = await tx.select({ id: connectionGrantTable.id }).from(connectionGrantTable).where(and(eq(connectionGrantTable.organizationId, account.orgId), eq(connectionGrantTable.connector, account.connector))).limit(1);
+				await this.upsertGrant(account, tx);
+				if (held) return null;
+				return moveLinks(tx, {
+					connector: account.connector,
+					from,
+					to: account.principalKey
+				});
+			});
+		}
+		async awaitAccountMoves(orgId, connector) {
+			await this.db.transaction(async (tx) => {
+				await tx.select({ id: connectorTable.id }).from(connectorTable).where(and(eq(connectorTable.organizationId, orgId), eq(connectorTable.connectorId, connector))).for("share");
+			});
+		}
 		async deleteGrant(orgId, connector, principalKey) {
 			await this.db.delete(connectionGrantTable).where(and(eq(connectionGrantTable.organizationId, orgId), eq(connectionGrantTable.connector, connector), eq(connectionGrantTable.principalKey, principalKey)));
 		}
@@ -53411,7 +54023,7 @@ var init_drizzle_broker_store = __esmMin((() => {
 				healthStatus: input.status,
 				healthDetail: input.detail,
 				updatedAt: /* @__PURE__ */ new Date()
-			}).where(eq(connectionGrantTable.id, input.grantId));
+			}).where(and(eq(connectionGrantTable.id, input.grantId), input.fence ? eq(connectionGrantTable.principalKey, input.fence.principalKey) : void 0, input.fence?.tokenRevision !== void 0 ? eq(connectionGrantTable.accessTokenNonce, Buffer.from(input.fence.tokenRevision, "hex")) : void 0));
 		}
 		encrypt(plaintext) {
 			const envelope = this.cipher.encrypt(plaintext);
@@ -53604,104 +54216,6 @@ var init_purge_unreadable_envelopes = __esmMin((() => {
 	};
 }));
 //#endregion
-//#region ../../libs/runtime/connect-broker/src/lib/oauth/default-oauth-exchanger.ts
-var tokenEndpointResponseSchema, formEncoded, DefaultOAuthExchanger;
-var init_default_oauth_exchanger = __esmMin((() => {
-	init_src$27();
-	tokenEndpointResponseSchema = z.object({
-		access_token: z.string(),
-		refresh_token: z.string().optional(),
-		expires_in: z.number().optional()
-	});
-	formEncoded = (value) => new URLSearchParams([["", value]]).toString().slice(1);
-	DefaultOAuthExchanger = class {
-		constructor(deps) {
-			this.fetchImpl = deps?.fetch ?? globalThis.fetch;
-			this.now = deps?.now ?? Date.now;
-			this.tokenEndpointAuthMethodOf = deps?.tokenEndpointAuthMethodOf ?? (() => void 0);
-		}
-		async exchangeCode(input) {
-			const client = this.clientAuthentication(input.connector);
-			const { params } = client;
-			params.set("grant_type", "authorization_code");
-			params.set("code", input.code);
-			params.set("redirect_uri", input.redirectUri);
-			if (input.codeVerifier) params.set("code_verifier", input.codeVerifier);
-			return this.post(input.connector.tokenUrl, client, "invalid_grant");
-		}
-		async refresh(input) {
-			const client = this.clientAuthentication(input.connector);
-			client.params.set("grant_type", "refresh_token");
-			client.params.set("refresh_token", input.refreshToken);
-			return this.post(input.connector.tokenUrl, client, "credential_error");
-		}
-		async exchangeClientCredentials(input) {
-			const client = this.clientAuthentication(input.connector);
-			const { params } = client;
-			params.set("grant_type", "client_credentials");
-			const scope = input.scope ?? input.connector.scopes.join(" ");
-			if (scope) params.set("scope", scope);
-			const tokens = await this.post(input.connector.tokenUrl, client, "credential_error");
-			delete tokens.refreshToken;
-			return tokens;
-		}
-		/**
-		* The client's half of a token request. In the body, `client_id` and an
-		* optional `client_secret`. In a Basic header, each form-encoded and then
-		* joined with a colon (RFC 6749 §2.3.1), so a colon in the id cannot be read
-		* as the separator; a public client sends an empty password. Never both.
-		*/
-		clientAuthentication(connector) {
-			const params = new URLSearchParams();
-			if (this.tokenEndpointAuthMethodOf(connector) === "client_secret_basic") {
-				const credentials = `${formEncoded(connector.clientId)}:${formEncoded(connector.clientSecret ?? "")}`;
-				return {
-					params,
-					headers: { authorization: `Basic ${Buffer.from(credentials, "utf8").toString("base64")}` }
-				};
-			}
-			params.set("client_id", connector.clientId);
-			if (connector.clientSecret) params.set("client_secret", connector.clientSecret);
-			return {
-				params,
-				headers: {}
-			};
-		}
-		/**
-		* POST the form to the token endpoint and parse the response into
-		* `ExchangedTokens`. A non-2xx response or an unparseable body becomes a
-		* `BrokerError` with the supplied failure code (`invalid_grant` for a code
-		* exchange, `credential_error` for a refresh).
-		*/
-		async post(tokenUrl, { params, headers }, failureCode) {
-			if (!tokenUrl) throw makeBrokerError("credential_error", "connector has no tokenUrl configured for the OAuth token exchange");
-			const response = await this.fetchImpl(tokenUrl, {
-				method: "POST",
-				headers: {
-					"content-type": "application/x-www-form-urlencoded",
-					accept: "application/json",
-					...headers
-				},
-				body: params.toString()
-			});
-			const raw = await response.text();
-			if (!response.ok) throw makeBrokerError(failureCode, `token endpoint returned ${response.status}: ${raw.slice(0, 500)}`);
-			let body;
-			try {
-				body = JSON.parse(raw);
-			} catch {
-				throw makeBrokerError(failureCode, "token endpoint returned a non-JSON body");
-			}
-			const parsed = tokenEndpointResponseSchema.safeParse(body);
-			if (!parsed.success) throw makeBrokerError(failureCode, `token endpoint response missing access_token: ${parsed.error.message}`);
-			const result = { accessToken: parsed.data.access_token };
-			if (parsed.data.refresh_token) result.refreshToken = parsed.data.refresh_token;
-			if (typeof parsed.data.expires_in === "number") result.expiresAt = this.now() + parsed.data.expires_in * 1e3;
-			return result;
-		}
-	};
-}));
-//#endregion
 //#region ../../libs/runtime/connect-broker/src/lib/cache/in-memory-token-cache.ts
 var createInMemoryTokenCache;
 var init_in_memory_token_cache = __esmMin((() => {
@@ -54291,6 +54805,7 @@ function grantToRefreshable(grant) {
 		accessTokenExpiresAt: grant.expiresAt === null ? null : new Date(grant.expiresAt),
 		connector: grant.connector,
 		principalKey: grant.principalKey,
+		...grant.tokenRevision !== void 0 ? { tokenRevision: grant.tokenRevision } : {},
 		hasRefreshToken: grant.refreshToken !== null
 	};
 }
@@ -54329,10 +54844,7 @@ var init_grant_refresh_ports = __esmMin((() => {
 				reason: "no refresh token"
 			};
 			const grant = await this.store.getGrant(grantRef.organizationId, grantRef.connector, grantRef.principalKey);
-			if (grant === null) return {
-				kind: "permanent",
-				reason: "grant not found"
-			};
+			if (grant === null) return { kind: "superseded" };
 			if (grant.refreshToken === null) return {
 				kind: "permanent",
 				reason: "no refresh token"
@@ -54376,10 +54888,15 @@ var init_grant_refresh_ports = __esmMin((() => {
 			this.setter = setter;
 		}
 		async setHealth(input) {
+			const grant = input.connection;
 			await this.setter.setGrantHealth({
 				grantId: input.connectionId,
 				status: input.status,
-				detail: input.detail
+				detail: input.detail,
+				...grant ? { fence: {
+					principalKey: grant.principalKey,
+					...input.status !== "active" && grant.tokenRevision !== void 0 ? { tokenRevision: grant.tokenRevision } : {}
+				} } : {}
 			});
 		}
 	};
@@ -54388,20 +54905,6 @@ var init_grant_refresh_ports = __esmMin((() => {
 			return { disabledAutomationIds: [] };
 		}
 	};
-}));
-//#endregion
-//#region ../../libs/runtime/connect-broker/src/lib/refresh/logger.ts
-var consoleRefreshLogger;
-var init_logger = __esmMin((() => {
-	consoleRefreshLogger = {
-		error: (message, context) => console.error("ERROR", message, context ? JSON.stringify(context) : ""),
-		warn: (message, context) => console.warn("WARN", message, context ? JSON.stringify(context) : ""),
-		info: (message, context) => console.info("INFO", message, context ? JSON.stringify(context) : ""),
-		debug: (message, context) => {
-			if (process.env["STACKBONE_DEBUG"] !== "1") return;
-			console.debug("DEBUG", message, context ? JSON.stringify(context) : "");
-		}
-	};
 })), REFRESH_REVOKED_REASON, ConnectionRefreshProcessor;
 var init_connection_refresh_processor = __esmMin((() => {
 	init_logger();
@@ -54447,6 +54950,7 @@ var init_connection_refresh_processor = __esmMin((() => {
 				case "refreshed":
 					if (connection.healthStatus !== "active") await this.deps.health.setHealth({
 						connectionId: connection.id,
+						connection,
 						status: "active",
 						detail: null
 					});
@@ -54457,6 +54961,7 @@ var init_connection_refresh_processor = __esmMin((() => {
 				case "transient":
 					await this.deps.health.setHealth({
 						connectionId: connection.id,
+						connection,
 						status: "error",
 						detail: outcome.reason
 					});
@@ -54468,6 +54973,7 @@ var init_connection_refresh_processor = __esmMin((() => {
 				case "permanent": {
 					await this.deps.health.setHealth({
 						connectionId: connection.id,
+						connection,
 						status: "revoked",
 						detail: outcome.reason
 					});
@@ -65986,6 +66492,34 @@ var createCatalogPieceTriggerRunner = (catalog, files = {}) => createPieceTrigge
 	...files
 });
 //#endregion
+//#region ../../libs/runtime/workspace-runtime/src/lib/connect/move-account-links.ts
+var moveAccountLinks = async (tx, { connector, from, to }) => {
+	const triggers = await tx.execute(sql`
+    UPDATE stackbone_platform.trigger_subscriptions
+       SET principal_key = ${to}, poll_revision = poll_revision + 1, updated_at = now()
+     WHERE connector = ${connector} AND principal_key = ${from}`);
+	const outputs = await tx.execute(sql`
+    UPDATE stackbone_platform.workflow_file_output_bindings
+       SET principal_key = ${to}, updated_at = now()
+     WHERE connector = ${connector} AND principal_key = ${from}`);
+	return {
+		triggers: triggers.count,
+		outputs: outputs.count
+	};
+};
+var countAccountLinks = (db) => async ({ connector, principalKey }) => {
+	const [row] = await db.execute(sql`
+      SELECT
+        (SELECT count(*)::int FROM stackbone_platform.trigger_subscriptions
+          WHERE connector = ${connector} AND principal_key = ${principalKey}) AS triggers,
+        (SELECT count(*)::int FROM stackbone_platform.workflow_file_output_bindings
+          WHERE connector = ${connector} AND principal_key = ${principalKey}) AS outputs`);
+	return {
+		triggers: row?.triggers ?? 0,
+		outputs: row?.outputs ?? 0
+	};
+};
+//#endregion
 //#region ../../libs/runtime/workspace-runtime/src/lib/connect/piece/piece-oauth2-method.ts
 init_src$6();
 /**
@@ -66102,7 +66636,9 @@ var makeContextFactory = (opts) => {
 					oauth: {
 						brokerCallbackUrl: brokerCallbackBaseUrl,
 						stateSecret: deriveBase64Key(opts.encryptionKey)
-					}
+					},
+					moveAccountLinks,
+					countAccountLinks: countAccountLinks(db)
 				});
 				return {
 					db,
@@ -73311,8 +73847,10 @@ var probeBrowserProvider = async (resolved, deps = {}) => {
 };
 /**
 * No HTTP here — a `local` launch is reachable exactly when a Chromium binary
-* exists on the box. The workspace's browser peers are an optional install, so
-* "no browser found" is the realistic failure and it names how to fix it.
+* exists on the machine. Playwright is not a required peer (STA3-125), so "no
+* browser found" is the realistic failure under `stackbone dev`, and it names how
+* to fix it. A deployed box never reaches this probe: `resolveProbeTarget` refuses
+* `local` there first.
 */
 var probeLocalBrowser = async (resolveLocalBrowser, fileExists = defaultFileExists) => {
 	try {
@@ -73320,7 +73858,7 @@ var probeLocalBrowser = async (resolveLocalBrowser, fileExists = defaultFileExis
 		if (executablePath && await fileExists(executablePath)) return { ok: true };
 		return {
 			ok: false,
-			error: "No local Chromium was found on this box. Install the browser peers (`playwright install chromium`) or pin a binary with STACKBONE_BROWSER_EXECUTABLE_PATH."
+			error: LOCAL_CHROMIUM_MISSING_MESSAGE
 		};
 	} catch (err) {
 		return {
@@ -73423,14 +73961,15 @@ var API_KEY_PRESENT_PLACEHOLDER = "__stored__";
 * Pure by design — it takes the stored values and the environment rather than
 * reading either, so every precedence case is unit-testable without a database.
 */
-var buildBrowserProviderView = async (stored, env) => {
+var buildBrowserProviderView = async (stored, env, { allowLocalBrowser } = {}) => {
 	const parsedMode = browserProviderModeSchema.safeParse(stored.mode);
 	const resolution = await resolveBrowserMode({
 		env,
 		readSecrets: async () => ({
 			data: toSecretRecord(stored),
 			error: null
-		})
+		}),
+		allowLocalBrowser
 	});
 	return {
 		mode: parsedMode.success ? parsedMode.data : null,
@@ -73468,7 +74007,7 @@ var readStored = async (opts) => {
 	};
 };
 /** The current browser provider as the screen sees it. */
-var getBrowserProvider = async (opts, env = process.env) => buildBrowserProviderView(await readStored(opts), env);
+var getBrowserProvider = async (opts, host = {}, env = process.env) => buildBrowserProviderView(await readStored(opts), env, host);
 /**
 * Which stored rows a save GOVERNS, per mode. A write replaces the fields of the
 * mode being saved and leaves the other modes' credentials alone.
@@ -73535,7 +74074,7 @@ var setBrowserProvider = async (opts, body, actor = { userId: null }) => {
 * so a body without one falls back to the STORED key — that is how "test the
 * configuration I saved last week" works without retyping the secret.
 */
-var testBrowserProviderConnection = async (opts, body) => {
+var testBrowserProviderConnection = async (opts, body, host = {}) => {
 	let storedApiKey = null;
 	if (body.mode === "browserbase" && !normalize(body.api_key)) try {
 		storedApiKey = await readSystemSecret(opts, BROWSERBASE_API_KEY_ENV);
@@ -73545,7 +74084,7 @@ var testBrowserProviderConnection = async (opts, body) => {
 			error: `The stored ${BROWSERBASE_API_KEY_ENV} could not be read. Enter the key again to replace it.`
 		};
 	}
-	const target = resolveProbeTarget(body, storedApiKey);
+	const target = resolveProbeTarget(body, storedApiKey, host);
 	if (!target.ok) return {
 		ok: false,
 		error: target.reason
@@ -73558,11 +74097,11 @@ var testBrowserProviderConnection = async (opts, body) => {
 * did not type one (the read masks it, so the screen cannot send it back). An
 * incomplete candidate is refused here rather than probed and misreported.
 */
-var resolveProbeTarget = (body, storedApiKey) => {
-	if (body.mode === "local") return {
+var resolveProbeTarget = (body, storedApiKey, { allowLocalBrowser = true } = {}) => {
+	if (body.mode === "local") return allowLocalBrowser ? {
 		ok: true,
 		mode: "local"
-	};
+	} : localBrowserNotAllowedFailure();
 	if (body.mode === "cdp") {
 		const cdpUrl = normalize(body.cdp_url);
 		return cdpUrl ? {
@@ -73633,8 +74172,12 @@ var browserProviderRequestBody = named("BrowserProviderPutRequest", browserProvi
 * activity log, and it is the only route here that changes anything. Required
 * rather than optional, like the profiles router next door — a build of this
 * surface that silently recorded nothing is the gap this closes.
+*
+* `host` is required for the same reason (STA3-125): a deployed box has no local
+* Chromium, and a router that defaulted to allowing one would report and probe a
+* browser the box cannot open.
 */
-var createBrowserProviderRouter = (secretsOptions) => {
+var createBrowserProviderRouter = (secretsOptions, host) => {
 	const app = new OpenAPIHono({ defaultHook: invalidPayloadHook });
 	app.openapi(createRoute({
 		method: "get",
@@ -73647,7 +74190,7 @@ var createBrowserProviderRouter = (secretsOptions) => {
 			200: jsonResponse$2(named("BrowserProviderGetResponse", browserProviderGetResponseSchema), "The stored configuration and the mode it resolves to."),
 			403: forbiddenResponse("secrets:rotate")
 		}
-	}), async (c) => c.json(await getBrowserProvider(secretsOptions), 200));
+	}), async (c) => c.json(await getBrowserProvider(secretsOptions, host), 200));
 	app.openapi(createRoute({
 		method: "put",
 		path: "/",
@@ -73663,7 +74206,7 @@ var createBrowserProviderRouter = (secretsOptions) => {
 		}
 	}), async (c) => {
 		await setBrowserProvider(secretsOptions, c.req.valid("json"), { userId: readActorUserId(c) });
-		return c.json(await getBrowserProvider(secretsOptions), 200);
+		return c.json(await getBrowserProvider(secretsOptions, host), 200);
 	});
 	app.openapi(createRoute({
 		method: "post",
@@ -73678,7 +74221,7 @@ var createBrowserProviderRouter = (secretsOptions) => {
 			400: errorResponse("The body failed its schema (`invalid_payload`)."),
 			403: forbiddenResponse("secrets:rotate")
 		}
-	}), async (c) => c.json(await testBrowserProviderConnection(secretsOptions, c.req.valid("json")), 200));
+	}), async (c) => c.json(await testBrowserProviderConnection(secretsOptions, c.req.valid("json"), host), 200));
 	return app;
 };
 //#endregion
@@ -73699,7 +74242,7 @@ var mountBrowser = (app, ctx) => {
 	app.route("/api/browser-provider", createBrowserProviderRouter({
 		...ctx.secrets,
 		audit: ctx.audit
-	}));
+	}, { allowLocalBrowser: ctx.opts.host !== "image" }));
 	app.route("/api/browser-profiles", createBrowserProfilesRouter({
 		db: ctx.db,
 		audit: ctx.audit
@@ -75466,8 +76009,127 @@ var resolveConnectSecrets = (opts) => {
 	throw new Error("A box needs its own Connect secrets: pass `connectIdentity` (a deployed image) or `connectSecrets`, or boot a dev box through `startEmulatorServer`, which mints them.");
 };
 //#endregion
+//#region ../../libs/runtime/workspace-runtime/src/lib/connect/resolve-account.ts
+/**
+* The principal a connector call runs as.
+*
+* Only `oauth` holds accounts. Every other mode keeps the principal it was given:
+* `api_key`, `client_credentials` and `none` have no grant, and a `custom` piece's
+* material sits under `app` and is no account. On those modes an `account` is
+* ignored, since there is one credential to run as (criterion 10).
+*
+* On `oauth`, an explicit `app` reads as "no account named" (D14): every deployed
+* SDK sends it, and the `/execute` and Studio schemas default to it, so honouring
+* it would break a one-account box once its grant is keyed by email. Any other
+* explicit principal wins, and on `oauth` naming one beside an `account` is
+* `invalid_args`.
+*
+* With no account named, the one account is used; none is `no_token`, as the mint
+* says today; several is `account_required` with each id and email. A legacy `app`
+* grant is one more account, never a silent default.
+*/
+async function resolveAccount(store, connector, selection) {
+	if (connector.authMode !== "oauth") return selection.principal ?? { type: "app" };
+	const named = selection.principal?.type === "app" ? void 0 : selection.principal;
+	if (named !== void 0 && selection.account !== void 0) throw makeBrokerError("invalid_args", "name a principal or an account, not both");
+	if (named !== void 0) return named;
+	const grants = (await store.listGrants(connector.orgId)).filter((g) => g.connector === connector.connectorId);
+	if (selection.account !== void 0) {
+		const chosen = grants.find((g) => g.id === selection.account);
+		if (chosen === void 0) throw makeBrokerError("no_token", `no account "${selection.account}" on connector "${connector.connectorId}"`, false);
+		return principalFromKey(chosen.principalKey);
+	}
+	const accounts = defaultCandidates(grants);
+	const [only] = accounts;
+	if (only === void 0) throw makeBrokerError("no_token", `no grant for principal on connector "${connector.connectorId}"`);
+	if (accounts.length > 1) throw accountRequired(connector.connectorId, accounts);
+	return principalFromKey(only.principalKey);
+}
+/**
+* {@link resolveAccount} for a selection boundary on the box, which knows the
+* connector by id.
+*
+* Two cases keep the principal the request carried, so what they answer stays
+* today's. An unregistered connector: the mint refuses it as
+* `connector_installation_required`. An OAuth connector with no account yet, when
+* the request named none: the mint answers `no_token` itself, an evict of nothing
+* is still `evicted`, and a link or a binding made before the account is
+* connected is stored as it always was.
+*/
+async function resolveConnectorAccount(store, orgId, connectorId, selection) {
+	const requested = selection.principal ?? { type: "app" };
+	const connector = await store.getConnector(orgId, connectorId);
+	if (connector === null) return requested;
+	try {
+		return await resolveAccount(store, connector, selection);
+	} catch (err) {
+		if (selection.account === void 0 && isBrokerError(err) && err.code === "no_token") return requested;
+		throw err;
+	}
+}
+/** A fold or adoption may have moved the grant after the row's first resolve. */
+async function followAccountMove(resolveAccountKey, request, row, move) {
+	if (!resolveAccountKey) return row;
+	let key;
+	try {
+		key = await resolveAccountKey(request);
+	} catch {
+		return row;
+	}
+	return key === row.principalKey ? row : await move(row.id, key) ?? row;
+}
+/**
+* The grants a call naming no account may fall to.
+*
+* A grant the refresh sweep marked `revoked` cannot mint once its access token
+* expires. Counting it would turn a box into `account_required` after a reconnect
+* that could not read its dead legacy grant's identity and so kept both rows. When
+* every grant is revoked they all stay, so a lone one still reaches the mint and
+* the caller gets the refusal it gets today.
+*/
+function defaultCandidates(grants) {
+	const live = grants.filter((g) => g.healthStatus !== "revoked");
+	return live.length > 0 ? live : grants;
+}
+/**
+* The list rides in the message as well as in `accounts`: the message is what
+* every consumer shows as is (an SDK error, a Studio toast), so the choice reads
+* the same wherever it surfaces.
+*/
+function accountRequired(connectorId, grants) {
+	const accounts = grants.map((g) => ({
+		id: g.id,
+		email: g.externalSubject
+	}));
+	const listed = accounts.map((a) => `${a.id} (${a.email ?? "no email"})`).join(", ");
+	return {
+		...makeBrokerError("account_required", `connector "${connectorId}" holds ${accounts.length} accounts: ${listed}; name one with { account }`),
+		code: "account_required",
+		accounts
+	};
+}
+var accountKeyResolver, connectedAccountLookup;
+var init_resolve_account = __esmMin((() => {
+	init_src$27();
+	accountKeyResolver = (store, orgId) => async (request) => isPrincipalKey(request.principalKey) ? principalKey(await resolveConnectorAccount(store, orgId, request.connector, {
+		principal: principalFromKey(request.principalKey),
+		account: request.account
+	})) : request.principalKey;
+	connectedAccountLookup = (store, orgId) => async ({ connector, principalKey: key }) => {
+		if ((await store.getConnector(orgId, connector))?.authMode !== "oauth") return null;
+		const grants = (await store.listGrants(orgId)).filter((g) => g.connector === connector);
+		if (grants.length === 0) return null;
+		const grant = grants.find((g) => g.principalKey === key);
+		if (grant === void 0) throw new Error(`no connected account under ${key}; it moved`);
+		return {
+			id: grant.id,
+			email: grant.externalSubject
+		};
+	};
+}));
+//#endregion
 //#region ../../libs/runtime/workspace-runtime/src/lib/connect/http/broker-refusal.ts
-var statusForBrokerCode, brokerRefusal, answerBrokerRefusal, brokerRefusalResponses;
+var statusForBrokerCode, brokerRefusal, answerRefusal, answerBrokerRefusal, answerAccountScopedRefusal, answerAccountSelectionRefusal, unknownAccountResponse, accountRequiredResponse, brokerRefusalResponses;
 var init_broker_refusal = __esmMin((() => {
 	init_src$27();
 	init_route_helpers();
@@ -75482,7 +76144,8 @@ var init_broker_refusal = __esmMin((() => {
 			case "invalid_args": return 400;
 			case "invalid_grant": return 400;
 			case "precondition_failed":
-			case "cardinality_mismatch": return 409;
+			case "cardinality_mismatch":
+			case "account_required": return 409;
 			case "credential_error":
 			case "execute_failed":
 			case "timeout":
@@ -75492,15 +76155,18 @@ var init_broker_refusal = __esmMin((() => {
 	brokerRefusal = (err) => {
 		if (isBrokerError(err)) return {
 			status: statusForBrokerCode(err.code),
-			body: {
+			body: isAccountRequiredError(err) ? {
+				code: err.code,
+				message: err.message,
+				details: { accounts: err.accounts }
+			} : {
 				code: err.code,
 				message: err.message
 			}
 		};
 		throw err;
 	};
-	answerBrokerRefusal = (c, err) => {
-		const refusal = brokerRefusal(err);
+	answerRefusal = (c, refusal) => {
 		switch (refusal.status) {
 			case 400: return c.json(refusal.body, 400);
 			case 401: return c.json(refusal.body, 401);
@@ -75508,6 +76174,22 @@ var init_broker_refusal = __esmMin((() => {
 			default: return c.json(refusal.body, 502);
 		}
 	};
+	answerBrokerRefusal = (c, err) => answerRefusal(c, brokerRefusal(err));
+	answerAccountScopedRefusal = (c, err) => {
+		const refusal = brokerRefusal(err);
+		return refusal.status === 409 ? c.json(refusal.body, 409) : answerRefusal(c, refusal);
+	};
+	answerAccountSelectionRefusal = (c, err) => {
+		const refusal = brokerRefusal(err);
+		switch (refusal.status) {
+			case 400: return c.json(refusal.body, 400);
+			case 401: return c.json(refusal.body, 401);
+			case 409: return c.json(refusal.body, 409);
+			default: throw err;
+		}
+	};
+	unknownAccountResponse = (subject) => errorResponse(`${subject} names an \`account\` the connector does not hold (\`no_token\`). A reconnect gives the account a new id: list the connector's grants and name a current one.`);
+	accountRequiredResponse = (subject) => errorResponse(`${subject} names no account and the connector holds several (\`account_required\`). \`details.accounts\` lists each one's \`id\` and \`email\` (\`null\` for a legacy account); name one and retry.`);
 	brokerRefusalResponses = (subject) => ({
 		401: errorResponse(`${subject} needs an authorization this box does not hold: no grant yet (\`no_token\`), a user who has not consented (\`user_authorization_required\`), a call with no principal (\`principal_required\`) or a provider that refused the identity (\`access_denied\`).`),
 		404: errorResponse("The connector is not registered on this box (`connector_installation_required`), or the thing named does not exist (`not_found`)."),
@@ -75579,7 +76261,8 @@ var createConnectCallbackRouter = (opts, sharedContext) => {
 				subjectType: "connection",
 				payload: {
 					connector: result.granted.connector,
-					principal: result.granted.principalKey
+					principal: result.granted.principalKey,
+					...result.legacyLinksLeft ? { legacyLinksLeft: result.legacyLinksLeft } : {}
 				}
 			}, ctx.db, "the OAuth grant");
 			return c.redirect(result.redirectTo, 302);
@@ -76863,11 +77546,13 @@ init_actor();
 init_error_envelopes();
 init_require_capability();
 init_route_helpers();
+init_resolve_account();
 init_spec_fetch();
 /**
-* The principal the `operations` route mints under. In-process and app-scoped, the
-* same one the `/execute` executor uses: introspecting a registration is the box
-* reading a provider's own metadata, never an end user acting.
+* The principal the `operations` route asks to mint under. In-process and
+* app-scoped, the same one the `/execute` executor uses: introspecting a
+* registration is the box reading a provider's own metadata, never an end user
+* acting. On an OAuth connector it names no account ({@link specReadPrincipal}).
 *
 * Also the principal a `piece` registration's credential is stored under
 * (PLA-1664): the SDK's connector invoker asks for `app` unless told otherwise,
@@ -76875,6 +77560,16 @@ init_spec_fetch();
 */
 var APP_PRINCIPAL = { type: "app" };
 /**
+* The principal a provider-served spec is read under: {@link APP_PRINCIPAL} as
+* the request, which on an OAuth connector names no account, so the one account
+* it holds reads the spec (STA3-123). A Gmail grant is keyed by its mailbox and
+* there is no `app` grant to mint. The `operations` mint, the spec cache entry it
+* writes and the refresh that evicts it all ask here, so the three name the same
+* account. Every other registration (API key, custom material) keeps `app`.
+*/
+var specReadPrincipal = (ctx, connectorId) => resolveConnectorAccount(ctx.store, DEV_ORG_ID, connectorId, { principal: APP_PRINCIPAL });
+var unmintedSpecWarning = (err) => `this connector's spec is served by the provider and needs its credential, which could not be minted — the spec was fetched unauthenticated: ${isBrokerError(err) || err instanceof Error ? err.message : String(err)}`;
+/**
 * The placement a piece's OAUTH2 row stores (PLA-1774), under either grant
 * (PLA-1838). Its token is read through the refresh-aware token path — an OAuth
 * access pair, or an M2M token minted per expiry — and every `TokenResponse`
@@ -77165,6 +77860,12 @@ var registerConnectorRoutes = (app, { opts, getContext, registry, unavailable, c
 		const ctx = await getContext();
 		const connector = await ctx.store.getConnector(DEV_ORG_ID, connectorId);
 		if (!connector) return c.json(CONNECTOR_NOT_FOUND, 404);
+		let principal = APP_PRINCIPAL;
+		try {
+			principal = await specReadPrincipal(ctx, connectorId);
+		} catch (err) {
+			if (!isAccountRequiredError(err)) throw err;
+		}
 		let entry = null;
 		try {
 			const def = resolveEffectiveDefinition({
@@ -77175,7 +77876,7 @@ var registerConnectorRoutes = (app, { opts, getContext, registry, unavailable, c
 				def,
 				orgId: DEV_ORG_ID,
 				cache: ctx.specCache,
-				principal: APP_PRINCIPAL
+				principal
 			});
 		} catch {}
 		if (entry === null) return c.json({
@@ -77227,23 +77928,32 @@ var registerConnectorRoutes = (app, { opts, getContext, registry, unavailable, c
 		const specOrigin = def.specSource?.kind ?? "derived";
 		let token;
 		let mintWarning;
-		if (specFetchUsesCredential(def)) try {
-			token = await ctx.service.issueToken({
-				orgId: DEV_ORG_ID,
-				principal: APP_PRINCIPAL
-			}, {
-				connector: def.id,
-				principal: APP_PRINCIPAL
-			});
-		} catch (err) {
-			mintWarning = `this connector's spec is served by the provider and needs its credential, which could not be minted — the spec was fetched unauthenticated: ${err instanceof Error ? err.message : String(err)}`;
+		let principal = APP_PRINCIPAL;
+		if (specFetchUsesCredential(def)) {
+			try {
+				principal = await specReadPrincipal(ctx, connectorId);
+			} catch (err) {
+				if (!isAccountRequiredError(err)) throw err;
+				mintWarning = unmintedSpecWarning(err);
+			}
+			if (mintWarning === void 0) try {
+				token = await ctx.service.issueToken({
+					orgId: DEV_ORG_ID,
+					principal
+				}, {
+					connector: def.id,
+					principal
+				});
+			} catch (err) {
+				mintWarning = unmintedSpecWarning(err);
+			}
 		}
 		const baseFetch = opts.specFetch ?? defaultSpecFetch;
 		const specEntry = specCacheEntryFor({
 			def,
 			orgId: DEV_ORG_ID,
 			cache: ctx.specCache,
-			principal: APP_PRINCIPAL
+			principal
 		});
 		const cached = specEntry === null ? null : createCachingSpecFetch({
 			fetch: baseFetch,
@@ -77404,6 +78114,7 @@ var init_support = __esmMin((() => {
 		operation: z.string().min(1),
 		args: z.record(z.string(), z.unknown()).default({}),
 		principal: principalSchema.default({ type: "app" }),
+		account: z.string().min(1).optional(),
 		installationId: z.string().min(1).optional(),
 		runId: z.string().min(1).optional(),
 		idempotent: z.boolean().optional()
@@ -77425,7 +78136,8 @@ var init_support = __esmMin((() => {
 			error: {
 				code: error.code,
 				message: error.message,
-				...error.retryable !== void 0 ? { retryable: error.retryable } : {}
+				...error.retryable !== void 0 ? { retryable: error.retryable } : {},
+				...isAccountRequiredError(error) ? { details: { accounts: error.accounts } } : {}
 			}
 		};
 		switch (statusForBrokerCode(error.code)) {
@@ -77485,6 +78197,7 @@ init_src$6();
 init_src$26();
 init_route_helpers();
 init_api_docs();
+init_resolve_account();
 init_broker_refusal();
 init_support();
 /**
@@ -77534,27 +78247,29 @@ var createConnectTokenRouter = (opts, sharedContext) => {
 		security: HMAC_ROUTE_SECURITY,
 		middleware: [requireBrokerSignature(opts.hmacSecret)],
 		summary: "Mint a credential for a connector",
-		description: "The runtime hot path: a `@stackbone/sdk/connect` adapter calls this before a tool call. The response carries `placement` — every slot the credential occupies — so the caller applies it where the OPERATOR configured it rather than guessing. It is the same set `POST /execute` applies inside the box, which is what keeps the two paths from disagreeing about one connector.\n\nThe two consumers read it differently, and only one of them can. `connectHeaders()` builds the request headers itself, so it honours the set: a `header` placement writes the raw token to that header, a `bearer` one writes `Authorization: Bearer`. `connect()` / `withConnect()` cannot — a connection runtime carries only a bearer through `auth.getToken`, and `TokenResult` has no slot for a placement — so that path stays BEARER-ONLY by construction. A non-bearer connector wired through it fails at the provider, not here: a key the provider reads from a header of its own, such as the `apikey` header the built-in `supabase` places beside its bearer, never reaches that header. Use `connectHeaders()` or `POST /execute` for those.\n\nThe signature proves POSSESSION of the workspace secret, not WHICH install is calling, so the body asserts its own scoping claims: `installationId` and `agentName` are read as claims, `connector` and `principal` pick the grant. A connector with no grant answers `no_token` on 401 and the adapter turns that into an authorization prompt.",
-		request: { body: jsonBody(named("ConnectTokenRequest", tokenRequestSchema), "Which connector, for which principal, on behalf of which install.") },
+		description: "The runtime hot path: a `@stackbone/sdk/connect` adapter calls this before a tool call. The response carries `placement` — every slot the credential occupies — so the caller applies it where the OPERATOR configured it rather than guessing. It is the same set `POST /execute` applies inside the box, which is what keeps the two paths from disagreeing about one connector.\n\nThe two consumers read it differently, and only one of them can. `connectHeaders()` builds the request headers itself, so it honours the set: a `header` placement writes the raw token to that header, a `bearer` one writes `Authorization: Bearer`. `connect()` / `withConnect()` cannot — a connection runtime carries only a bearer through `auth.getToken`, and `TokenResult` has no slot for a placement — so that path stays BEARER-ONLY by construction. A non-bearer connector wired through it fails at the provider, not here: a key the provider reads from a header of its own, such as the `apikey` header the built-in `supabase` places beside its bearer, never reaches that header. Use `connectHeaders()` or `POST /execute` for those.\n\nThe signature proves POSSESSION of the workspace secret, not WHICH install is calling, so the body asserts its own scoping claims: `installationId` and `agentName` are read as claims, `connector`, `principal` and `account` pick the grant. `account` picks a connected account by its id, as `account_required` lists them; an id the connector does not hold answers `no_token` on 401. On an OAuth connector `app` with no `account` names no account: the one account the connector holds is used, and several answer `account_required` on 409. A connector with no grant answers `no_token` on 401 and the adapter turns that into an authorization prompt.",
+		request: { body: jsonBody(named("ConnectTokenRequest", tokenRequestSchema), "Which connector, for which principal or connected account, on behalf of which install.") },
 		responses: {
 			200: jsonResponse$2(named("ConnectTokenResponse", connectTokenResponseSchema), "The minted credential. `expiresAt` is absent when the provider declared no expiry."),
 			400: errorResponse("The body failed its schema (`invalid_payload`), or the broker refused the request (`invalid_args`, `invalid_grant`)."),
 			401: AGENT_WIRE_401,
 			404: errorResponse("The connector is not registered on this box (`connector_installation_required`, `not_found`)."),
+			409: accountRequiredResponse("The mint"),
 			502: errorResponse("The provider round-trip failed (`credential_error`, `execute_failed`, `timeout`, `invalid_output`).")
 		}
 	}), async (c) => {
 		const request = c.req.valid("json");
 		const ctx = await getContext();
-		const caller = {
-			orgId: DEV_ORG_ID,
-			principal: request.principal,
-			...request.installationId !== void 0 ? { installationId: request.installationId } : {}
-		};
 		try {
+			const principal = await resolveConnectorAccount(ctx.store, DEV_ORG_ID, request.connector, request);
+			const caller = {
+				orgId: DEV_ORG_ID,
+				principal,
+				...request.installationId !== void 0 ? { installationId: request.installationId } : {}
+			};
 			const minted = await ctx.service.issueToken(caller, {
 				connector: request.connector,
-				principal: request.principal,
+				principal,
 				...request.installationId !== void 0 ? { installationId: request.installationId } : {},
 				...request.agentName !== void 0 ? { agentName: request.agentName } : {}
 			});
@@ -77564,7 +78279,7 @@ var createConnectTokenRouter = (opts, sharedContext) => {
 				placement: minted.placement
 			}, 200);
 		} catch (err) {
-			return answerBrokerRefusal(c, err);
+			return answerAccountScopedRefusal(c, err);
 		}
 	});
 	app.openapi(createRoute({
@@ -77579,20 +78294,20 @@ var createConnectTokenRouter = (opts, sharedContext) => {
 		responses: {
 			200: jsonResponse$2(named("ConnectExecuteSuccess", connectExecuteSuccessSchema), "The operation’s own output, passed through untouched."),
 			400: executeRefusal("The body failed its schema (`invalid_payload`), or the broker refused the arguments (`invalid_args`, `invalid_grant`)."),
-			401: executeRefusal("The signature is missing or wrong (`access_denied`), or the connector has no usable authorization (`no_token`, `user_authorization_required`, `principal_required`)."),
+			401: executeRefusal("The signature is missing or wrong (`access_denied`), or the connector has no usable authorization (`no_token`, `user_authorization_required`, `principal_required`). `no_token` also answers an `account` the connector does not hold."),
 			404: executeRefusal("No such connector on this box, or no such operation on it (`not_found`, `connector_installation_required`)."),
-			409: executeRefusal("The provider refused a guarded write: no rows matched (`precondition_failed`), or the requested row limit was exceeded (`cardinality_mismatch`). Terminal: change the guard or narrow the target before retrying."),
+			409: executeRefusal("The provider refused a guarded write: no rows matched (`precondition_failed`), or the requested row limit was exceeded (`cardinality_mismatch`). Terminal: change the guard or narrow the target before retrying. Or the call names no account and the connector holds several (`account_required`): `error.details.accounts` lists each one’s `id` and `email`; name one with `account` and retry."),
 			502: executeRefusal("The provider call failed (`execute_failed`, `timeout`, `credential_error`, `invalid_output`). Upstream, not the box.")
 		}
 	}), async (c) => {
 		const request = c.req.valid("json");
-		const executor = buildConnectExecutor(opts, await getContext(), registry, {
-			orgId: DEV_ORG_ID,
-			principal: request.principal,
-			...request.installationId !== void 0 ? { installationId: request.installationId } : {}
-		});
+		const ctx = await getContext();
 		try {
-			const result = await executor.execute({
+			const result = await buildConnectExecutor(opts, ctx, registry, {
+				orgId: DEV_ORG_ID,
+				principal: await resolveConnectorAccount(ctx.store, DEV_ORG_ID, request.connector, request),
+				...request.installationId !== void 0 ? { installationId: request.installationId } : {}
+			}).execute({
 				orgId: DEV_ORG_ID,
 				connectConnectorId: request.connector,
 				connectOperationId: request.operation,
@@ -77618,31 +78333,33 @@ var createConnectTokenRouter = (opts, sharedContext) => {
 		middleware: [requireBrokerSignature(opts.hmacSecret)],
 		summary: "Drop a cached credential",
 		description: "The adapter’s 401-recovery hook: a provider rejected a token that has not expired yet, so the cached copy is dropped and the NEXT mint fetches a fresh one. The durable GRANT survives — that is what separates this from `DELETE /api/connect/grants/{grantId}`, which drops the authorization and makes the principal start over.\n\nEvicting a connector with nothing cached is not an error; it answers the same `evicted` either way.",
-		request: { body: jsonBody(named("ConnectEvictRequest", evictRequestSchema), "Which connector, for which principal.") },
+		request: { body: jsonBody(named("ConnectEvictRequest", evictRequestSchema), "Which connector, for which principal or connected account.") },
 		responses: {
 			200: jsonResponse$2(named("ConnectEvictResponse", connectEvictResponseSchema), "The cached credential for that pair is gone. The grant is untouched."),
 			400: errorResponse("The body failed its schema (`invalid_payload`), or the broker refused the arguments (`invalid_args`, `invalid_grant`)."),
 			401: AGENT_WIRE_401,
 			404: errorResponse("The connector is not registered on this box (`connector_installation_required`, `not_found`)."),
+			409: accountRequiredResponse("The eviction"),
 			502: errorResponse("The broker could not reach its own cache (`credential_error`).")
 		}
 	}), async (c) => {
 		const request = c.req.valid("json");
 		const ctx = await getContext();
 		try {
+			const principal = await resolveConnectorAccount(ctx.store, DEV_ORG_ID, request.connector, request);
 			await ctx.service.evict({
 				orgId: DEV_ORG_ID,
-				principal: request.principal
+				principal
 			}, {
 				connector: request.connector,
-				principal: request.principal
+				principal
 			});
 			return c.json({
 				connector: request.connector,
 				status: "evicted"
 			}, 200);
 		} catch (err) {
-			return answerBrokerRefusal(c, err);
+			return answerAccountScopedRefusal(c, err);
 		}
 	});
 	return app;
@@ -77651,6 +78368,7 @@ var createConnectTokenRouter = (opts, sharedContext) => {
 //#region ../../libs/runtime/workspace-runtime/src/lib/connect/http/connect-handlers.ts
 init_src$3();
 init_src$6();
+init_resolve_account();
 /** The org every registration on this box belongs to. A box is single-tenant, so
 *  the intake's spec cache key is scoped by the same id the routes use. */
 var CONNECT_BOX_ORG_ID = DEV_ORG_ID;
@@ -77691,6 +78409,12 @@ var createConnectHandlers = (opts) => {
 	const connectorRows = async (connector) => {
 		return (await shared()).store.getConnector(DEV_ORG_ID, connector);
 	};
+	const resolveAccountKey = async (request) => {
+		const { store } = await shared();
+		await store.awaitAccountMoves?.(DEV_ORG_ID, request.connector);
+		return accountKeyResolver(store, DEV_ORG_ID)(request);
+	};
+	const connectedAccountOf = async (link) => connectedAccountLookup((await shared()).store, DEV_ORG_ID)(link);
 	const createRefreshProcessor = async () => {
 		const ctx = await shared();
 		return createGrantRefreshProcessor({
@@ -77724,6 +78448,8 @@ var createConnectHandlers = (opts) => {
 		issueCredentialMaterial,
 		evict,
 		connectorRows,
+		resolveAccountKey,
+		connectedAccountOf,
 		specCache,
 		createRefreshProcessor,
 		agentWire,
@@ -77800,6 +78526,8 @@ var mountConnect = (app, ctx) => {
 	hooks.captureConnectIssueCredentialMaterial?.(connectHandlers.issueCredentialMaterial);
 	hooks.captureConnectEvictToken?.(connectHandlers.evict);
 	hooks.captureConnectConnectorRows?.(connectHandlers.connectorRows);
+	hooks.captureConnectResolveAccountKey?.(connectHandlers.resolveAccountKey);
+	hooks.captureConnectConnectedAccountOf?.(connectHandlers.connectedAccountOf);
 	hooks.captureConnectSpecCache?.(connectHandlers.specCache);
 	hooks.captureConnectRefreshProcessorFactory?.(connectHandlers.createRefreshProcessor);
 	hooks.captureConnectAgentWire?.(connectHandlers.agentWire);
@@ -98239,6 +98967,7 @@ var init_mount$1 = __esmMin((() => {
 		const browserPool = createBrowserSessionPool({
 			factory: createStagehandBrowserFactory({
 				importStagehand: resolveWorkspaceStagehand(options.projectRoot),
+				allowLocalBrowser: options.host !== "image",
 				loadInitialStorageState: async () => {
 					const merged = await profileStore.loadMergedStorageState();
 					return merged.error ? void 0 : merged.data;
@@ -98394,6 +99123,7 @@ var createDeepAgentBoot = (deps) => {
 			deepAgentsProjectRoot = deepAgents.projectRoot;
 			plantAmbientBridges = fromApp.plantAmbientBridges;
 			const mounted = await mountDeepAgents(app, {
+				host: opts.host,
 				projectRoot: deepAgents.projectRoot,
 				agents: deepAgents.agents,
 				compileAgentModule: deepAgents.compileAgentModule,
@@ -100132,6 +100862,7 @@ var init_runtime_connector_plants = __esmMin((() => {
 							connector: args.connector,
 							operation: args.operation,
 							args: args.args,
+							...args.account !== void 0 ? { account: args.account } : {},
 							...echo ?? {}
 						},
 						...extra,
@@ -101537,7 +102268,8 @@ var init_intake_runtime = __esmMin((() => {
 					...opts.startAgent ? { startAgent: opts.startAgent } : {},
 					deliveries: opts.store,
 					...opts.resume ? { resume: opts.resume } : {},
-					...opts.isAgentEcho ? { isAgentEcho: opts.isAgentEcho } : {}
+					...opts.isAgentEcho ? { isAgentEcho: opts.isAgentEcho } : {},
+					...opts.connectedAccountOf ? { connectedAccountOf: opts.connectedAccountOf } : {}
 				}, subscription, event);
 				forwards.add(forwarding);
 				forwarding.finally(() => forwards.delete(forwarding)).catch(() => void 0);
@@ -101615,7 +102347,7 @@ var init_intake_runtime = __esmMin((() => {
 }));
 //#endregion
 //#region ../../libs/runtime/workspace-runtime/src/lib/connect-inbound/subscriptions-router.ts
-var TRIGGER_SUBSCRIPTIONS_TAG, looseSubscriptionIdPath, deleteTriggerSubscriptionQuery, mappingCompileError, KEY_REFUSALS, keyCompileRefusal, keyCompileError, keysCompileError, compileKey, targetSchemaRefusal, previewKey, editingWaitOrKey, patchKeysRefusal, linkSampleEvent, namedLink, namedLinkSampleEvent, previewSample, armingMappingRefusal, trimmedScope, VERIFY_TOKEN_PARAM, withGeneratedVerifyToken, scopeValuesRefusal, sameScope, unreachableConnectorRefusal, fencedOperationRefusal, armingCursorSeed, webhookArm, armedWebhookUrl, answerEnableRefusal, armingEnable, transientRefusal, ENABLE_RETRYABLE_RESPONSE, disarmingHook, linkNames, createTriggerSubscriptionsRouter;
+var TRIGGER_SUBSCRIPTIONS_TAG, looseSubscriptionIdPath, deleteTriggerSubscriptionQuery, mappingCompileError, KEY_REFUSALS, keyCompileRefusal, keyCompileError, keysCompileError, compileKey, targetSchemaRefusal, previewKey, editingWaitOrKey, patchKeysRefusal, linkSampleEvent, namedLink, namedLinkSampleEvent, previewSample, withLinkAccount, armingMappingRefusal, trimmedScope, VERIFY_TOKEN_PARAM, withGeneratedVerifyToken, scopeValuesRefusal, sameScope, unreachableConnectorRefusal, fencedOperationRefusal, armingCursorSeed, webhookArm, armedWebhookUrl, answerEnableRefusal, armingEnable, transientRefusal, ENABLE_RETRYABLE_RESPONSE, disarmingHook, linkNames, createTriggerSubscriptionsRouter;
 var init_subscriptions_router = __esmMin((() => {
 	init_src$7();
 	init_src$6();
@@ -101623,6 +102355,8 @@ var init_subscriptions_router = __esmMin((() => {
 	init_src$3();
 	init_src$26();
 	init_box_audit();
+	init_broker_refusal();
+	init_resolve_account();
 	init_actor();
 	init_require_capability();
 	init_route_helpers();
@@ -101630,6 +102364,7 @@ var init_subscriptions_router = __esmMin((() => {
 	init_webhook_paths();
 	init_piece_action_runner();
 	init_target_input_schema();
+	init_connected_account();
 	init_intake_scheduler();
 	TRIGGER_SUBSCRIPTIONS_TAG = "trigger-subscriptions";
 	looseSubscriptionIdPath = z.object({ id: z.string().openapi({
@@ -101721,17 +102456,20 @@ var init_subscriptions_router = __esmMin((() => {
 	namedLink = async (deps, request) => request.subscriptionId === void 0 ? null : deps.store.get(request.subscriptionId);
 	namedLinkSampleEvent = async (deps, request) => linkSampleEvent(await namedLink(deps, request), request.connector, request.trigger);
 	previewSample = async (deps, request) => {
-		const link = await namedLink(deps, request);
+		const named = await namedLink(deps, request);
+		const link = named !== null && named.connector === request.connector && named.trigger === request.trigger ? named : null;
 		const own = linkSampleEvent(link, request.connector, request.trigger);
 		if (own !== void 0) return {
 			event: own,
-			source: "link"
+			source: "link",
+			link
 		};
 		if (isWebhookTrigger(deps.registry, request.connector, request.trigger)) return {
 			event: void 0,
-			source: "none"
+			source: "none",
+			link
 		};
-		if (deps.fetchSampleEvent && link !== null && link.connector === request.connector && link.trigger === request.trigger) {
+		if (deps.fetchSampleEvent && link !== null) {
 			const warn = deps.logger?.warn ?? ((message) => console.warn(message));
 			let fetched = null;
 			try {
@@ -101750,15 +102488,26 @@ var init_subscriptions_router = __esmMin((() => {
 				}
 				return {
 					event: fetched,
-					source: "fetched"
+					source: "fetched",
+					link
 				};
 			}
 		}
 		return {
 			event: resolveTriggerSampleData(deps.registry, request.connector, request.trigger),
-			source: "declared"
+			source: "declared",
+			link
 		};
 	};
+	withLinkAccount = async (deps, link, sample) => {
+		if (link === null || deps.connectedAccountOf === void 0) return sample;
+		try {
+			return enrichWithAccount(sample, await deps.connectedAccountOf(link));
+		} catch (err) {
+			(deps.logger?.warn ?? ((message) => console.warn(message)))(`[trigger-link] could not read the sample's connected account: ${messageOf$3(err)}`);
+			return sample;
+		}
+	};
 	armingMappingRefusal = async (deps, link) => {
 		if (!deps.resolveTargetInputSchema) return null;
 		const schemaPair = deps.resolveTargetInputSchema(link.targetKind, link.targetName);
@@ -101768,7 +102517,7 @@ var init_subscriptions_router = __esmMin((() => {
 		if (isEmptyTriggerSample(link.sampleEvent) && isWebhookTrigger(deps.registry, link.connector, link.trigger)) return null;
 		const sampleData = isEmptyTriggerSample(link.sampleEvent) ? resolveTriggerSampleData(deps.registry, link.connector, link.trigger) : link.sampleEvent;
 		if (isEmptyTriggerSample(sampleData)) return null;
-		const applied = await mapLinkEvent(link, sampleData);
+		const applied = await mapLinkEvent(link, await withLinkAccount(deps, link, sampleData));
 		if (!applied.ok) {
 			if (applied.error.kind === "parse_error") return null;
 			return {
@@ -101933,16 +102682,18 @@ var init_subscriptions_router = __esmMin((() => {
 			middleware: [requireCapability("config:write")],
 			summary: "Link a polling trigger to a workflow or agent",
 			description: "Arms a new link and, when it is enabled, its polling repeatable. A link on a piece's webhook trigger arms no repeatable: its `onEnable` registers the link's own `/api/hooks/{subscriptionId}/{token}` URL at the provider, under a token minted for this arm and never returned. Every way a link can be born broken is refused here rather than at tick time: a trigger the registry does not resolve, a trigger missing one of the per-subscription values it declares (a mailbox and a Drive folder are both one of these) or carrying one that does not match the shape the param declares, and a `mapping`, `correlationKey` or `conversationKey` that does not compile as JSONata. A link carries the one key its kind reads: a workflow link resumes a run by `correlationKey`, an agent link continues a conversation by `conversationKey`, and the other kind's key is refused (`invalid_payload`) unless it is blank (null, empty or whitespace). A body that names no `targetKind` is a workflow link here too. An agent link with a `conversationKey` may also carry `debounceMs`, from 1 to 10000 ms: how long it waits after an event for more events of the same conversation, so a burst of chat messages gets one answer. Null or absent answers each event as it arrives. A non-null `debounceMs` is refused (`invalid_payload`) on a workflow link and on an agent link whose `conversationKey` is absent or blank. A link being ARMED is held to more: its `mapping` is run over the trigger's sample event and the result validated against the destination's input schema, so a mapping that could only ever be rejected never arms a poll that would consume events and start nothing. A blank or `null` `mapping` is judged on what the link delivers without one: a workflow link gets the event unchanged; an agent link gets it unchanged when it carries a non-empty text `message`, and otherwise as `{ message }` holding the event as text (a string as is, anything else as JSON), so an agent link with no mapping is not refused for an event whose `message` is missing or not text. Nothing is stored in its place: the stored `mapping` stays `null`. A trigger that declares no sample, or an empty one (`{}`), gives that check nothing to judge, and the link arms; once it has received an event, that event is the sample the check reads on every later patch. A link born with `enabled: false` skips that check — it is made on the patch that turns it on.",
-			request: { body: jsonBody(named("RegisterTriggerSubscriptionRequest", registerTriggerSubscriptionRequestSchema), "The capability to poll, the workflow or agent to start, and the optional JSONata in between. `principalKey` defaults to `app` — the integration's own credential rather than a user grant.") },
+			request: { body: jsonBody(named("RegisterTriggerSubscriptionRequest", registerTriggerSubscriptionRequestSchema), "The capability to poll, the workflow or agent to start, and the optional JSONata in between. `principalKey` defaults to `app` — the integration's own credential rather than a user grant. On an OAuth connector `app` names no account: the link is stored under the key of the one account the connector holds, and several answer `account_required`. `account` names one of them by its grant id, as `account_required` lists them, and the link is stored under that account's key.") },
 			responses: {
 				201: jsonResponse$2(named("TriggerSubscriptionResponse", triggerSubscriptionResponseSchema), "The link as it was stored. Its repeatable is armed when `enabled`."),
 				403: forbiddenResponse("config:write"),
-				400: errorResponse("The body failed its schema (`invalid_payload`, including a key the link's kind does not read and a `debounceMs` on a workflow link or on an agent link with no `conversationKey`), or the link would be born broken: `unknown_capability` (no such polling trigger on that integration, including when the integration itself is unknown), `scope_required` (a value the trigger declares in `scopeParams` is missing — the message names which, and a mailbox-scoped trigger reports its mailbox this way too), `invalid_scope` (a value that does not match the pattern its param declares), `invalid_mapping`, `invalid_correlation_key` or `invalid_conversation_key` (the JSONata does not compile). A link being ARMED is also refused when its mapping (or, with none, the default its kind delivers) compiles but cannot fill the destination: `mapping_evaluation_failed` (it throws on the trigger's sample event) or `mapping_cannot_produce_input` (the mapped sample violates the destination's input schema — `details.mappingIssues` names the offending paths), and a piece trigger whose own `onEnable` fails: `trigger_enable_failed`, with the piece's message, or the broker's own code when the link's credential could not be minted (`no_token`, `user_authorization_required`, `invalid_grant`, `credential_error`). A piece's webhook link with no event yet is not judged on its mapping: its trigger's declared sample is another account's example, so the check waits for the link's first event. A piece's webhook trigger is refused `webhook_url_unavailable` on a box that knows no public URL its provider could deliver to (`stackbone dev` with no tunnel). Nothing is stored and nothing is armed."),
+				400: errorResponse("The body failed its schema (`invalid_payload`, including a key the link's kind does not read and a `debounceMs` on a workflow link or on an agent link with no `conversationKey`), names a `principalKey` other than `app` beside an `account` (`invalid_args`), or the link would be born broken: `unknown_capability` (no such polling trigger on that integration, including when the integration itself is unknown), `scope_required` (a value the trigger declares in `scopeParams` is missing — the message names which, and a mailbox-scoped trigger reports its mailbox this way too), `invalid_scope` (a value that does not match the pattern its param declares), `invalid_mapping`, `invalid_correlation_key` or `invalid_conversation_key` (the JSONata does not compile). A link being ARMED is also refused when its mapping (or, with none, the default its kind delivers) compiles but cannot fill the destination: `mapping_evaluation_failed` (it throws on the trigger's sample event) or `mapping_cannot_produce_input` (the mapped sample violates the destination's input schema — `details.mappingIssues` names the offending paths), and a piece trigger whose own `onEnable` fails: `trigger_enable_failed`, with the piece's message, or the broker's own code when the link's credential could not be minted (`no_token`, `user_authorization_required`, `invalid_grant`, `credential_error`). A piece's webhook link with no event yet is not judged on its mapping: its trigger's declared sample is another account's example, so the check waits for the link's first event. A piece's webhook trigger is refused `webhook_url_unavailable` on a box that knows no public URL its provider could deliver to (`stackbone dev` with no tunnel). Nothing is stored and nothing is armed."),
+				401: unknownAccountResponse("The link"),
+				409: accountRequiredResponse("The link"),
 				503: ENABLE_RETRYABLE_RESPONSE
 			}
 		}), async (c) => {
 			const parsed = c.req.valid("json");
-			const { connector, trigger, principalKey, targetKind, targetName } = parsed;
+			const { connector, trigger, targetKind, targetName } = parsed;
 			const scope = withGeneratedVerifyToken(deps, {
 				connector,
 				trigger
@@ -101961,13 +102712,24 @@ var init_subscriptions_router = __esmMin((() => {
 			if (mappingError) return c.json(mappingError, 400);
 			const keyError = keysCompileError(parsed);
 			if (keyError) return c.json(keyError, 400);
+			let principalKey;
+			try {
+				principalKey = deps.resolveAccountKey ? await deps.resolveAccountKey({
+					connector,
+					principalKey: parsed.principalKey,
+					account: parsed.account
+				}) : parsed.principalKey;
+			} catch (err) {
+				return answerAccountSelectionRefusal(c, err);
+			}
 			if (parsed.enabled !== false) {
 				const armingRefusal = await armingMappingRefusal(deps, {
 					connector,
 					trigger,
 					targetKind,
 					targetName,
-					mapping: parsed.mapping ?? null
+					mapping: parsed.mapping ?? null,
+					principalKey
 				});
 				if (armingRefusal) return c.json(armingRefusal, 400);
 			}
@@ -102056,7 +102818,11 @@ var init_subscriptions_router = __esmMin((() => {
 				...cursorColumn !== null ? { cursorColumn } : {},
 				...seed !== null ? { pollCursor: seed } : {}
 			};
-			const subscription = await deps.store.register(input);
+			const subscription = await followAccountMove(deps.resolveAccountKey, {
+				connector,
+				principalKey: parsed.principalKey,
+				account: parsed.account
+			}, await deps.store.register(input), (id, principalKey) => deps.store.update(id, { principalKey }));
 			if (subscription.enabled && !webhook) await deps.scheduler.add(subscription.id);
 			await recordCompleted(deps.audit, {
 				action: "trigger.create",
@@ -102072,7 +102838,7 @@ var init_subscriptions_router = __esmMin((() => {
 			path: "/preview",
 			tags: [TRIGGER_SUBSCRIPTIONS_TAG],
 			summary: "Dry-run a candidate mapping over the trigger sample event",
-			description: "Compiles the JSONata, evaluates it over the sample event, then validates the result against the destination input JSON Schema: the workflow's declared schema, or an agent's required `message` string with at least one character. Whitespace is valid. No mapping is written, no repeatable armed, no delivery journalled and no cursor moved, so it is the safe way to author a mapping before saving one.\n\nThe sample event is the trigger descriptor's own, unless `subscriptionId` names a link on the same trigger. A link that has received an event is evaluated over its first real event (`sampleSource: link`). A link with none yet is evaluated over the newest event its provider holds, read once without claiming or delivering it; that event is kept as the link's sample and echoed back as `sampleEvent` (`sampleSource: fetched`). When that read finds nothing or fails (an empty mailbox, an expired credential, a timeout), the answer is over the descriptor's sample (`sampleSource: declared`), never an error.\n\nA webhook trigger has no feed to read and its descriptor's sample comes from another account, so until the named link receives its first event nothing is evaluated: the answer is `{ output: null, issues: [], sampleSource: none }`, with no key and no verdict on the mapping. The same holds when no `subscriptionId` is given. A key or a destination input schema that does not compile is still refused with its 400, since it is wrong on any event.\n\nA blank or `null` `mapping` maps the way the link delivers: on a workflow it is the identity mapping and the sample event comes back unchanged; on an agent the sample event comes back unchanged when it carries a non-empty text `message`, and otherwise as `{ message }` holding the event as text (a string as is, anything else as JSON). `output` is whatever the expression produced, which may be a scalar or an array as easily as an object.\n\nThe key the link's kind reads is evaluated over the same sample event: `correlationKey` on a workflow link (the run a real event would resume), `conversationKey` on an agent link (the conversation it would land in). As on register, a non-blank key of the other kind is refused (`invalid_payload`); a blank one (null, empty or whitespace) is no key.\n\nPresent only on a box with an inbound-trigger intake armed.",
+			description: "Compiles the JSONata, evaluates it over the sample event, then validates the result against the destination input JSON Schema: the workflow's declared schema, or an agent's required `message` string with at least one character. Whitespace is valid. No mapping is written, no repeatable armed, no delivery journalled and no cursor moved, so it is the safe way to author a mapping before saving one.\n\nThe sample event is the trigger descriptor's own, unless `subscriptionId` names a link on the same trigger. A link that has received an event is evaluated over its first real event (`sampleSource: link`). A link with none yet is evaluated over the newest event its provider holds, read once without claiming or delivering it; that event is kept as the link's sample and echoed back as `sampleEvent` (`sampleSource: fetched`). When that read finds nothing or fails (an empty mailbox, an expired credential, a timeout), the answer is over the descriptor's sample (`sampleSource: declared`), never an error. Whichever it is, when the named link runs as a connected account the sample is evaluated with that account added as `connectedAccount: { id, email }`, as delivery adds it to every event; `sampleEvent` is echoed as the provider sent it.\n\nA webhook trigger has no feed to read and its descriptor's sample comes from another account, so until the named link receives its first event nothing is evaluated: the answer is `{ output: null, issues: [], sampleSource: none }`, with no key and no verdict on the mapping. The same holds when no `subscriptionId` is given. A key or a destination input schema that does not compile is still refused with its 400, since it is wrong on any event.\n\nA blank or `null` `mapping` maps the way the link delivers: on a workflow it is the identity mapping and the sample event comes back unchanged; on an agent the sample event comes back unchanged when it carries a non-empty text `message`, and otherwise as `{ message }` holding the event as text (a string as is, anything else as JSON). `output` is whatever the expression produced, which may be a scalar or an array as easily as an object.\n\nThe key the link's kind reads is evaluated over the same sample event: `correlationKey` on a workflow link (the run a real event would resume), `conversationKey` on an agent link (the conversation it would land in). As on register, a non-blank key of the other kind is refused (`invalid_payload`); a blank one (null, empty or whitespace) is no key.\n\nPresent only on a box with an inbound-trigger intake armed.",
 			request: { body: jsonBody(named("PreviewTriggerMappingRequest", previewTriggerMappingRequestSchema), "The capability to read the sample event from, the workflow or agent to validate against, and the candidate `mapping` (plus the optional `correlationKey` or `conversationKey`) to try.") },
 			responses: {
 				200: jsonResponse$2(named("TriggerMappingPreview", triggerMappingPreviewResponseSchema), "The mapped output, plus one issue per field the target schema rejected. An empty `issues` with a 200 IS the passing dry-run, except under `sampleSource: none`: a webhook trigger with no event yet, where nothing was evaluated and `output` is `null`. Otherwise `sampleSource` says which sample event was evaluated over, and `sampleEvent` is present only when it was `fetched`. `correlationKey` and `conversationKey` are each present only when the request carried a non-blank expression for it, and `null` when that expression matched nothing."),
@@ -102122,7 +102888,7 @@ var init_subscriptions_router = __esmMin((() => {
 					sampleSource: sample.source
 				}, 200);
 			}
-			const sampleData = sample.event;
+			const sampleData = await withLinkAccount(deps, sample.link, sample.event);
 			const source = {
 				sampleSource: sample.source,
 				...sample.source === "fetched" ? { sampleEvent: sample.event } : {}
@@ -102231,19 +102997,21 @@ var init_subscriptions_router = __esmMin((() => {
 			tags: [TRIGGER_SUBSCRIPTIONS_TAG],
 			middleware: [requireCapability("config:write")],
 			summary: "List a provider-filled scope param's options for one principal",
-			description: "Runs the options loader of a scope param the capability flags `dynamicOptions: true` (a piece dropdown, such as WhatsApp's business number) through the credential of `principalKey`, and answers the values it may take. Each `value` is the text a link stores under the param and is sent back as is on register: a string the piece answered stays that string, and anything else is its JSON. Writes nothing and arms nothing.\n\nPresent only on a box with an inbound-trigger intake armed.",
-			request: { body: jsonBody(named("TriggerScopeOptionsRequest", triggerScopeOptionsRequestSchema), "The capability, the param to load, the principal whose credential loads it, and the scope drafted so far.") },
+			description: "Runs the options loader of a scope param the capability flags `dynamicOptions: true` (a piece dropdown, such as WhatsApp's business number) through the credential of `principalKey`, and answers the values it may take. `principalKey` and `account` are resolved as register resolves them: on an OAuth connector `app` names no account, so the options load with the one account the connector holds, and several answer `account_required`; `account` names one of them by its grant id. Each `value` is the text a link stores under the param and is sent back as is on register: a string the piece answered stays that string, and anything else is its JSON. Writes nothing and arms nothing.\n\nPresent only on a box with an inbound-trigger intake armed.",
+			request: { body: jsonBody(named("TriggerScopeOptionsRequest", triggerScopeOptionsRequestSchema), "The capability, the param to load, the principal or connected account whose credential loads it, and the scope drafted so far.") },
 			responses: {
 				200: jsonResponse$2(named("TriggerScopeOptions", triggerScopeOptionsResponseSchema), "The options, in the piece's order, with its `placeholder` and `disabled` when it gave them. An empty list is a legitimate answer: the account has none."),
 				403: forbiddenResponse("config:write"),
-				400: errorResponse("The body failed its schema (`invalid_payload`), the param is typed rather than filled by the provider (`not_dynamic`), or the options could not be loaded for a reason somebody has to fix first: the broker's own code when the principal's credential could not be issued (`no_token`, `user_authorization_required`, `invalid_grant`, `credential_error`), `scope_options_failed` otherwise, with the piece's message."),
+				400: errorResponse("The body failed its schema (`invalid_payload`), names a `principalKey` other than `app` beside an `account` (`invalid_args`), the param is typed rather than filled by the provider (`not_dynamic`), or the options could not be loaded for a reason somebody has to fix first: the broker's own code when the principal's credential could not be issued (`no_token`, `user_authorization_required`, `invalid_grant`, `credential_error`), `scope_options_failed` otherwise, with the piece's message."),
+				401: unknownAccountResponse("The options request"),
 				404: errorResponse("No such trigger on that integration (`unknown_capability`), or the trigger declares no scope param by that name (`unknown_scope_param`)."),
+				409: accountRequiredResponse("The options request"),
 				501: errorResponse("This runtime wired no options loader (`scope_options_unavailable`)."),
 				503: errorResponse("Loading failed in a way the same request may clear later: the piece bundle or the credential issuer could not be reached, the provider answered 5xx, or it did not answer within the deadline. The code is the broker's when the credential could not be issued, `scope_options_failed` otherwise.")
 			}
 		}), async (c) => {
 			const parsed = c.req.valid("json");
-			const { connector, trigger, param, principalKey } = parsed;
+			const { connector, trigger, param } = parsed;
 			if (!resolveTriggerPoll(deps.registry, connector, trigger)) return c.json({
 				code: "unknown_capability",
 				message: `No polling trigger "${trigger}" for integration "${connector}".`
@@ -102262,6 +103030,16 @@ var init_subscriptions_router = __esmMin((() => {
 				code: "scope_options_unavailable",
 				message: "Loading scope options is not available on this runtime."
 			}, 501);
+			let principalKey;
+			try {
+				principalKey = deps.resolveAccountKey ? await deps.resolveAccountKey({
+					connector,
+					principalKey: parsed.principalKey,
+					account: parsed.account
+				}) : parsed.principalKey;
+			} catch (err) {
+				return answerAccountSelectionRefusal(c, err);
+			}
 			const answered = await deps.scopeOptions({
 				connector,
 				trigger,
@@ -102323,8 +103101,8 @@ var init_subscriptions_router = __esmMin((() => {
 			path: "/{id}",
 			tags: [TRIGGER_SUBSCRIPTIONS_TAG],
 			middleware: [requireCapability("config:write")],
-			summary: "Toggle a link, or edit its mapping or its scope in place",
-			description: "Editing in place — instead of delete + re-register — preserves the polling cursor and the delivery journal, so fixing a mapping does NOT re-drain the inbox. An explicit `mappingGraph: null` is the code-mode detach.\n\nA link on a piece's webhook trigger is registered at its provider while it is on. Switching it off runs `onDisable` and clears its token, so the URL the provider held answers 404; switching it on, or changing its scope, registers it again under a new token. `enabled: true` sent to one that is already on registers nothing more.\n\nAt least one of `enabled`, `mapping`, `mappingGraph`, `correlationKey`, `conversationKey`, `debounceMs` or `scope` must be present; a body with none of them is refused (`resumeFrom` alone does not count — it qualifies an arming rather than being an edit of its own). The repeatable is re-asserted against the resulting `enabled` state, so a mapping-only patch neither arms nor disarms anything.\n\nA link carries the one key its kind reads: `correlationKey` on a workflow link, `conversationKey` on an agent link. The body names no kind, so the stored link decides, and a non-blank key of the other kind is refused (`invalid_payload`).\n\n`debounceMs` (1 to 10000 ms; `null` clears it) is how long an agent link waits after an event for more events of the same conversation, so a burst of chat messages gets one answer. The stored link decides it too: a non-null wait is refused (`invalid_payload`) on a workflow link and on an agent link left with no `conversationKey`, and so is a patch that clears or blanks the `conversationKey` while a wait is still set. Clear both in the same patch.\n\n`resumeFrom` decides what an ARMING does with the events sitting above the cursor. A cursor is a bookmark, not a clock, so a link that stopped — because its connection was revoked, or because somebody switched it off — resumes where it last read and delivers everything since, at once, timestamped now. `cursor` (the default, and what every link did before this field) keeps that. `now` replaces the bookmark with one minted against the provider this instant, so the window is dropped on purpose. NEITHER APPLIES TO A LINK ARMED FOR THE FIRST TIME: registration mints no bookmark, so there is nothing to keep and the link starts from now whatever you ask for. Anything written between registering it and arming it is not delivered, and `resumeFrom: \"cursor\"` on such a link is refused (`no_cursor_to_resume_from`) rather than quietly meaning `now` (PLA-1304). The choice lives HERE and not at revoke time because at revoke time nobody knows how long the revocation will last, which is the one fact that decides it.\n\n`scope` is the other field whose edit moves the cursor. It exists so a mistyped `owner`, `repo` or folder id can be corrected without deleting the link and losing its journal. A cursor only means something inside the scope it was minted in, so changing the scope REPLACES it: a link that stays armed is reseeded \"from now\" on the new scope, a link that is off has it cleared and the patch that arms it seeds it fresh. Re-sending the scope already stored changes nothing and moves no cursor.",
+			summary: "Toggle a link, or edit its mapping, scope or account in place",
+			description: "Editing in place — instead of delete + re-register — preserves the link id and delivery journal. Fixing a mapping keeps the polling cursor, so it does NOT re-drain the inbox. An explicit `mappingGraph: null` is the code-mode detach.\n\nA link on a piece's webhook trigger is registered at its provider while it is on. Switching it off runs `onDisable` and clears its token, so the URL the provider held answers 404; switching it on, or changing its scope, registers it again under a new token. `enabled: true` sent to one that is already on registers nothing more.\n\nAt least one of `enabled`, `mapping`, `mappingGraph`, `correlationKey`, `conversationKey`, `debounceMs`, `scope` or `account` must be present; a body with none of them is refused (`resumeFrom` alone does not count — it qualifies an arming rather than being an edit of its own). The repeatable is re-asserted against the resulting `enabled` state, so a mapping-only patch neither arms nor disarms anything.\n\nA link carries the one key its kind reads: `correlationKey` on a workflow link, `conversationKey` on an agent link. The body names no kind, so the stored link decides, and a non-blank key of the other kind is refused (`invalid_payload`).\n\n`debounceMs` (1 to 10000 ms; `null` clears it) is how long an agent link waits after an event for more events of the same conversation, so a burst of chat messages gets one answer. The stored link decides it too: a non-null wait is refused (`invalid_payload`) on a workflow link and on an agent link left with no `conversationKey`, and so is a patch that clears or blanks the `conversationKey` while a wait is still set. Clear both in the same patch.\n\n`resumeFrom` decides what an ARMING does with the events sitting above the cursor. A cursor is a bookmark, not a clock, so a link that stopped — because its connection was revoked, or because somebody switched it off — resumes where it last read and delivers everything since, at once, timestamped now. `cursor` (the default, and what every link did before this field) keeps that. `now` replaces the bookmark with one minted against the provider this instant, so the window is dropped on purpose. NEITHER APPLIES TO A LINK ARMED FOR THE FIRST TIME: registration mints no bookmark, so there is nothing to keep and the link starts from now whatever you ask for. Anything written between registering it and arming it is not delivered, and `resumeFrom: \"cursor\"` on such a link is refused (`no_cursor_to_resume_from`) rather than quietly meaning `now` (PLA-1304). The choice lives HERE and not at revoke time because at revoke time nobody knows how long the revocation will last, which is the one fact that decides it.\n\n`scope` is the other field whose edit moves the cursor. It exists so a mistyped `owner`, `repo` or folder id can be corrected without deleting the link and losing its journal. A cursor only means something inside the scope it was minted in, so changing the scope REPLACES it: a link that stays armed is reseeded \"from now\" on the new scope, a link that is off has it cleared and the patch that arms it seeds it fresh. Re-sending the scope already stored changes nothing and moves no cursor. `account` names the connected account by its grant id, as on register. A cursor belongs to one mailbox, so moving to another account replaces it like a scope change. The id, mapping, keys and delivery journal stay in place.",
 			request: {
 				params: looseSubscriptionIdPath,
 				body: jsonBody(named("PatchTriggerSubscriptionRequest", patchTriggerSubscriptionRequestSchema), "The knobs a link can change after registration. Every field is optional on its own, but the body may not be empty.")
@@ -102332,7 +103110,9 @@ var init_subscriptions_router = __esmMin((() => {
 			responses: {
 				200: jsonResponse$2(named("TriggerSubscriptionResponse", triggerSubscriptionResponseSchema), "The link as it now stands."),
 				403: forbiddenResponse("config:write"),
-				400: errorResponse("The body failed its schema — including the \"provide at least one field\" rule — (`invalid_payload`), it gives the link the key of the other kind (`invalid_payload`), it would leave a `debounceMs` on a workflow link or on an agent link with no `conversationKey` (`invalid_payload`), or the new JSONata does not compile (`invalid_mapping`, `invalid_correlation_key`, `invalid_conversation_key`). A patch that TURNS THE LINK ON is refused on the mapping it would leave behind when that mapping cannot fill the destination, a blank or `null` one judged on the default its kind delivers, as on register (`mapping_evaluation_failed`, `mapping_cannot_produce_input` — `details.mappingIssues` names the offending paths), and when a piece trigger's own `onEnable` fails (`trigger_enable_failed`, with the piece's message, or the broker's own code when the link's credential could not be minted), or when a piece's webhook trigger has no public URL to register (`webhook_url_unavailable`). A piece's webhook link that has received no event yet is not judged on its mapping; from its first event on, every save that leaves it armed is judged on that event. A `scope` edit is refused on the same two checks the register path runs (`scope_required`, `invalid_scope`), and — when the link stays armed — on the connection fence the new scope resolves onto (`operation_not_permitted`) and on a connector no request could reach (`connector_installation_required`). `resumeFrom` on a body that does not turn the link on is `invalid_payload`, `resumeFrom: \"cursor\"` on a link that has never polled is `no_cursor_to_resume_from` (it has no bookmark to resume from), and `resumeFrom: \"now\"` when no cursor can be minted for \"now\" is `cursor_seed_failed` — clearing the stored one instead would replay the provider's whole history. Nothing is written, `enabled` is left untouched, the previous expression stands and the cursor is not moved."),
+				400: errorResponse("The body failed its schema — including the \"provide at least one field\" rule — (`invalid_payload`), account selection is invalid (`invalid_args`), it gives the link the key of the other kind (`invalid_payload`), it would leave a `debounceMs` on a workflow link or on an agent link with no `conversationKey` (`invalid_payload`), or the new JSONata does not compile (`invalid_mapping`, `invalid_correlation_key`, `invalid_conversation_key`). A patch that TURNS THE LINK ON is refused on the mapping it would leave behind when that mapping cannot fill the destination, a blank or `null` one judged on the default its kind delivers, as on register (`mapping_evaluation_failed`, `mapping_cannot_produce_input` — `details.mappingIssues` names the offending paths), and when a piece trigger's own `onEnable` fails (`trigger_enable_failed`, with the piece's message, or the broker's own code when the link's credential could not be minted), or when a piece's webhook trigger has no public URL to register (`webhook_url_unavailable`). A piece's webhook link that has received no event yet is not judged on its mapping; from its first event on, every save that leaves it armed is judged on that event. A `scope` edit is refused on the same two checks the register path runs (`scope_required`, `invalid_scope`), and — when the link stays armed — on the connection fence the new scope resolves onto (`operation_not_permitted`) and on a connector no request could reach (`connector_installation_required`). An account change runs those connection checks against the new account too. `resumeFrom` on a body that does not turn the link on is `invalid_payload`, `resumeFrom: \"cursor\"` on a link that has never polled is `no_cursor_to_resume_from` (it has no bookmark to resume from), and `resumeFrom: \"now\"` when no cursor can be minted for \"now\" is `cursor_seed_failed` — clearing the stored one instead would replay the provider's whole history. Nothing is written, `enabled` is left untouched, the previous expression stands and the cursor is not moved."),
+				401: unknownAccountResponse("The link"),
+				409: accountRequiredResponse("The link"),
 				404: errorResponse("This box holds no link with that id (`not_found`)."),
 				503: ENABLE_RETRYABLE_RESPONSE
 			}
@@ -102344,7 +103124,8 @@ var init_subscriptions_router = __esmMin((() => {
 			const editingMapping = parsed.mapping !== void 0 || parsed.mappingGraph !== void 0;
 			const editingScope = parsed.scope !== void 0;
 			const disarming = parsed.enabled === false;
-			const needsRow = arming || editingMapping || editingScope || disarming;
+			const editingAccount = parsed.account !== void 0;
+			const needsRow = arming || editingMapping || editingScope || editingAccount || disarming;
 			const stored = needsRow || parsed.correlationKey?.trim() || editingWaitOrKey(parsed) ? await deps.store.get(c.req.param("id")) : null;
 			const keysRefusal = stored ? patchKeysRefusal(stored, parsed) : null;
 			if (keysRefusal) return c.json({
@@ -102358,6 +103139,18 @@ var init_subscriptions_router = __esmMin((() => {
 				message: "\"resumeFrom\" only applies to a patch that turns the link on. Send it together with \"enabled\": true."
 			}, 400);
 			const existing = needsRow ? stored : null;
+			const accountSelection = existing && editingAccount ? {
+				connector: existing.connector,
+				principalKey: "app",
+				account: parsed.account
+			} : void 0;
+			let principalKey = existing?.principalKey ?? "app";
+			if (accountSelection && deps.resolveAccountKey) try {
+				principalKey = await deps.resolveAccountKey(accountSelection);
+			} catch (err) {
+				return answerAccountSelectionRefusal(c, err);
+			}
+			const accountChanged = existing !== null && principalKey !== existing.principalKey;
 			const trimmed = editingScope ? trimmedScope(parsed.scope) : void 0;
 			const scope = existing && trimmed !== void 0 ? withGeneratedVerifyToken(deps, existing, trimmed) : trimmed;
 			if (existing && scope !== void 0) {
@@ -102377,12 +103170,13 @@ var init_subscriptions_router = __esmMin((() => {
 					targetKind: existing.targetKind,
 					targetName: existing.targetName,
 					mapping: parsed.mapping !== void 0 ? parsed.mapping ?? null : existing.mapping,
+					principalKey,
 					sampleEvent: existing.sampleEvent
 				});
 				if (armingRefusal) return c.json(armingRefusal, 400);
 			}
 			const effectiveScope = scope !== void 0 ? scope : existing?.scope ?? null;
-			const rescoping = scopeChanged && willBeArmed;
+			const rescoping = (scopeChanged || accountChanged) && willBeArmed;
 			if ((arming || rescoping) && existing) {
 				const unreachable = await unreachableConnectorRefusal(deps, existing.connector);
 				if (unreachable) return c.json(unreachable, 400);
@@ -102405,6 +103199,7 @@ var init_subscriptions_router = __esmMin((() => {
 				if (triggerColumnCursor(deps.registry, existing.connector, existing.trigger) === null) {
 					seed = await armingCursorSeed(deps, {
 						...existing,
+						principalKey,
 						scope: effectiveScope
 					});
 					if (webhook) {
@@ -102415,7 +103210,7 @@ var init_subscriptions_router = __esmMin((() => {
 					const enabled = await armingEnable(deps, {
 						connector: existing.connector,
 						trigger: existing.trigger,
-						principalKey: existing.principalKey,
+						principalKey,
 						scope: effectiveScope,
 						...arm ? { webhookUrl: arm.url } : {}
 					});
@@ -102425,7 +103220,7 @@ var init_subscriptions_router = __esmMin((() => {
 					const prepared = await deps.prepareColumnCursor({
 						connector: existing.connector,
 						trigger: existing.trigger,
-						principalKey: existing.principalKey,
+						principalKey,
 						scope: effectiveScope,
 						cursorColumn: existing.cursorColumn ?? null
 					});
@@ -102442,10 +103237,11 @@ var init_subscriptions_router = __esmMin((() => {
 				message: "This link cannot be started \"from now\": no cursor can be minted for it right now, and clearing the stored one would replay the provider's whole history. It stays where it was — retry, or arm it with \"resumeFrom\": \"cursor\"."
 			}, 400);
 			const disarm = disarming || rescoping ? await disarmingHook(deps, existing) : null;
-			const subscription = await deps.store.update(c.req.param("id"), {
+			const updated = await deps.store.update(c.req.param("id"), {
+				...accountChanged ? { principalKey } : {},
 				...parsed.enabled !== void 0 ? { enabled: parsed.enabled } : {},
 				...scope !== void 0 ? { scope } : {},
-				...scopeChanged || skippingBacklog || arm ? { resetCursorTo: seed } : seed !== null ? { seedCursorIfUnset: seed } : {},
+				...scopeChanged || accountChanged || skippingBacklog || arm ? { resetCursorTo: seed } : seed !== null ? { seedCursorIfUnset: seed } : {},
 				...arm ? { webhookToken: arm.token } : webhook && disarming ? { webhookToken: null } : {},
 				...parsed.mapping !== void 0 ? { mapping: parsed.mapping } : {},
 				...parsed.mappingGraph !== void 0 ? { mappingGraph: parsed.mappingGraph } : {},
@@ -102453,10 +103249,11 @@ var init_subscriptions_router = __esmMin((() => {
 				...parsed.conversationKey !== void 0 ? { conversationKey: parsed.conversationKey } : {},
 				...parsed.debounceMs !== void 0 ? { debounceMs: parsed.debounceMs } : {}
 			});
-			if (!subscription) return c.json({
+			if (!updated) return c.json({
 				code: "not_found",
 				message: "Trigger link not found."
 			}, 404);
+			const subscription = accountSelection && accountChanged ? await followAccountMove(deps.resolveAccountKey, accountSelection, updated, (id, key) => deps.store.update(id, { principalKey: key })) : updated;
 			const action = parsed.enabled === void 0 ? "trigger.update" : parsed.enabled ? "trigger.enable" : "trigger.disable";
 			await recordCompleted(deps.audit, {
 				action,
@@ -103187,6 +103984,8 @@ var init_destinations_router = __esmMin((() => {
 	init_actor();
 	init_route_helpers();
 	init_api_docs();
+	init_broker_refusal();
+	init_resolve_account();
 	init_support();
 	init_output_writer();
 	init_action_caller();
@@ -103329,17 +104128,39 @@ var init_destinations_router = __esmMin((() => {
 			path: "/bindings",
 			tags: [DESTINATIONS_TAG],
 			summary: "Bind a declared output to a destination",
-			description: "Decides how one of a workflow's declarations reaches the outside. WHICH rules apply comes from what the workspace declared the name as, never from the body: a `file` needs a connector that can file and a destination it accepts; an `action` needs a connector this box knows and NO destination, because the operator picks the connection and nothing else. A name nothing declares takes the file rules.\n\nAn UPSERT on the (workflow, output) pair: binding an output that is already bound replaces the binding and keeps its id, because the later decision is the one that holds. `principalKey` defaults to `app`.\n\nThe connector must be one `GET /api/destinations/capabilities` lists — a name this box does not know, or one with no file writer, is refused here rather than days later on a run nobody is watching — and `principalKey` must be a grant the broker can resolve.\n\n`destination` is stored as the operator sent it; the one shape rule is an `id` string, which is what the connector's writer receives. Every other key is display metadata the box never reads.",
+			description: "Decides how one of a workflow's declarations reaches the outside. WHICH rules apply comes from what the workspace declared the name as, never from the body: a `file` needs a connector that can file and a destination it accepts; an `action` needs a connector this box knows and NO destination, because the operator picks the connection and nothing else. A name nothing declares takes the file rules.\n\nAn UPSERT on the (workflow, output) pair: binding an output that is already bound replaces the binding and keeps its id, because the later decision is the one that holds. `principalKey` defaults to `app`. On an OAuth connector `app` names no account: the binding is stored under the key of the one account the connector holds, and several answer `account_required`. `account` names one of them by its grant id, as `account_required` lists them, and the binding is stored under that account's key.\n\nThe connector must be one `GET /api/destinations/capabilities` lists — a name this box does not know, or one with no file writer, is refused here rather than days later on a run nobody is watching — and `principalKey` must be a grant the broker can resolve.\n\n`destination` is stored as the operator sent it; the one shape rule is an `id` string, which is what the connector's writer receives. Every other key is display metadata the box never reads.",
 			request: { body: jsonBody(named("UpsertDestinationBindingRequest", upsertDestinationBindingRequestSchema), "The output to bind, the connector and grant to write through, and where.") },
 			responses: {
 				201: jsonResponse$2(named("DestinationBindingResponse", destinationBindingResponseSchema), "The binding as it was stored."),
-				400: errorResponse("The body failed its schema (`invalid_payload`), names a connector this box does not know or that cannot file a document (`unknown_connector`, `connector_cannot_file`), names a grant the broker cannot resolve (`invalid_principal_key`), or sends a destination the declaration does not accept — missing or malformed for a `file` (`destination_required`, `invalid_destination`), present at all for an `action` (`destination_not_accepted`).")
+				400: errorResponse("The body failed its schema (`invalid_payload`), names a connector this box does not know or that cannot file a document (`unknown_connector`, `connector_cannot_file`), names a grant the broker cannot resolve (`invalid_principal_key`), names a `principalKey` other than `app` beside an `account` (`invalid_args`), or sends a destination the declaration does not accept — missing or malformed for a `file` (`destination_required`, `invalid_destination`), present at all for an `action` (`destination_not_accepted`)."),
+				401: unknownAccountResponse("The binding"),
+				409: accountRequiredResponse("The binding")
 			}
 		}), async (c) => {
 			const parsed = c.req.valid("json");
 			const refusal = deps.declaredKind?.(parsed.workflowName, parsed.outputName) === "action" ? unknownConnectorRefusal(deps.definitions, parsed.connector) ?? principalKeyRefusal(parsed.principalKey) ?? actionDestinationRefusal(parsed.destination) : connectorRefusal(deps.definitions, parsed.connector) ?? principalKeyRefusal(parsed.principalKey) ?? destinationRefusal(deps.definitions, parsed.connector, parsed.destination);
 			if (refusal) return c.json(refusal, 400);
-			const binding = await deps.store.upsertBinding(parsed);
+			let principalKey;
+			try {
+				principalKey = deps.resolveAccountKey ? await deps.resolveAccountKey({
+					connector: parsed.connector,
+					principalKey: parsed.principalKey,
+					account: parsed.account
+				}) : parsed.principalKey;
+			} catch (err) {
+				return answerAccountSelectionRefusal(c, err);
+			}
+			const binding = await followAccountMove(deps.resolveAccountKey, {
+				connector: parsed.connector,
+				principalKey: parsed.principalKey,
+				account: parsed.account
+			}, await deps.store.upsertBinding({
+				workflowName: parsed.workflowName,
+				outputName: parsed.outputName,
+				connector: parsed.connector,
+				principalKey,
+				destination: parsed.destination
+			}), (id, key) => deps.store.updateBinding(id, { principalKey: key }));
 			await recordCompleted(deps.audit, {
 				action: "destination.bind",
 				actorUserId: readActorUserId(c),
@@ -103368,15 +104189,17 @@ var init_destinations_router = __esmMin((() => {
 			path: "/bindings/{id}",
 			tags: [DESTINATIONS_TAG],
 			summary: "Move a bound output, or re-point it at another connection",
-			description: "Edits the destination, the connector or the grant in place; the (workflow, output) pair a binding is keyed by never changes. At least one of `connector`, `principalKey` or `destination` must be present.",
+			description: "Edits the destination, the connector or the grant in place; the (workflow, output) pair a binding is keyed by never changes. At least one of `connector`, `principalKey`, `account` or `destination` must be present. A re-point resolves the account the way the bind does: `app` on an OAuth connector names no account, and `account` names one by its grant id, stored under that account's key.",
 			request: {
 				params: looseBindingIdPath,
 				body: jsonBody(named("PatchDestinationBindingRequest", patchDestinationBindingRequestSchema), "The fields to change.")
 			},
 			responses: {
 				200: jsonResponse$2(named("DestinationBindingResponse", destinationBindingResponseSchema), "The binding after the edit."),
-				400: errorResponse("The body failed its schema (`invalid_payload`), carried none of the three editable fields, named a connector this box cannot file through (`unknown_connector`, `connector_cannot_file`), named a grant the broker cannot resolve (`invalid_principal_key`), or sent a destination the declaration does not accept (`destination_required`, `invalid_destination`, `destination_not_accepted`)."),
-				404: errorResponse("This box holds no binding with that id (`not_found`).")
+				400: errorResponse("The body failed its schema (`invalid_payload`), carried none of the four editable fields, named a connector this box cannot file through (`unknown_connector`, `connector_cannot_file`), named a grant the broker cannot resolve (`invalid_principal_key`), named a `principalKey` other than `app` beside an `account` (`invalid_args`), or sent a destination the declaration does not accept (`destination_required`, `invalid_destination`, `destination_not_accepted`)."),
+				401: unknownAccountResponse("The re-point"),
+				404: errorResponse("This box holds no binding with that id (`not_found`)."),
+				409: accountRequiredResponse("The re-point")
 			}
 		}), async (c) => {
 			const patch = c.req.valid("json");
@@ -103385,12 +104208,24 @@ var init_destinations_router = __esmMin((() => {
 			const connector = patch.connector ?? existing?.connector;
 			const fieldRefusal = (patch.connector === void 0 ? null : kind === "action" ? unknownConnectorRefusal(deps.definitions, patch.connector) : connectorRefusal(deps.definitions, patch.connector)) ?? (patch.principalKey !== void 0 ? principalKeyRefusal(patch.principalKey) : null) ?? (patch.destination === void 0 ? null : kind === "action" ? actionDestinationRefusal(patch.destination) : connector === void 0 ? null : destinationRefusal(deps.definitions, connector, patch.destination));
 			if (fieldRefusal) return c.json(fieldRefusal, 400);
-			const binding = await deps.store.updateBinding(c.req.param("id"), {
+			let principalKey = patch.principalKey;
+			const accountSelection = existing && (patch.connector !== void 0 && patch.connector !== existing.connector || patch.principalKey !== void 0 || patch.account !== void 0) ? {
+				connector: connector ?? existing.connector,
+				principalKey: patch.principalKey ?? (patch.account !== void 0 ? "app" : existing.principalKey),
+				account: patch.account
+			} : void 0;
+			if (accountSelection && deps.resolveAccountKey) try {
+				principalKey = await deps.resolveAccountKey(accountSelection);
+			} catch (err) {
+				return answerAccountSelectionRefusal(c, err);
+			}
+			const updated = await deps.store.updateBinding(c.req.param("id"), {
 				...patch.connector !== void 0 ? { connector: patch.connector } : {},
-				...patch.principalKey !== void 0 ? { principalKey: patch.principalKey } : {},
+				...principalKey !== void 0 ? { principalKey } : {},
 				...patch.destination !== void 0 ? { destination: patch.destination } : {}
 			});
-			if (!binding) return c.json(NOT_FOUND, 404);
+			if (!updated) return c.json(NOT_FOUND, 404);
+			const binding = accountSelection ? await followAccountMove(deps.resolveAccountKey, accountSelection, updated, (id, key) => deps.store.updateBinding(id, { principalKey: key })) : updated;
 			await recordCompleted(deps.audit, {
 				action: "destination.rebind",
 				actorUserId: readActorUserId(c),
@@ -103594,6 +104429,7 @@ var init_runtime_subsystems = __esmMin((() => {
 				...intake.connectorRows ? { connectorRows: intake.connectorRows } : {},
 				...intake.specCache ? { specCache: intake.specCache } : {},
 				...intake.orgId !== void 0 ? { orgId: intake.orgId } : {},
+				...intake.connectedAccountOf ? { connectedAccountOf: intake.connectedAccountOf } : {},
 				startDeps: ctx.startDeps,
 				startAgent: ctx.startAgent,
 				registry: intake.registry,
@@ -103616,6 +104452,8 @@ var init_runtime_subsystems = __esmMin((() => {
 				webhookUrl: intakeRuntime.webhookUrl,
 				prepareColumnCursor: intakeRuntime.prepareColumnCursor,
 				...intake.connectorRows ? { connectorRows: intake.connectorRows } : {},
+				...intake.resolveAccountKey ? { resolveAccountKey: intake.resolveAccountKey } : {},
+				...intake.connectedAccountOf ? { connectedAccountOf: intake.connectedAccountOf } : {},
 				audit: intake.audit,
 				db: intake.db,
 				resolveTargetInputSchema: createTargetInputSchemaResolver({
@@ -103652,7 +104490,8 @@ var init_runtime_subsystems = __esmMin((() => {
 					audit: intake.audit,
 					db: intake.db,
 					definitions: intake.registry,
-					...destinations.declaredKind ? { declaredKind: destinations.declaredKind } : {}
+					...destinations.declaredKind ? { declaredKind: destinations.declaredKind } : {},
+					...intake.resolveAccountKey ? { resolveAccountKey: intake.resolveAccountKey } : {}
 				}));
 			}
 			try {
@@ -104523,6 +105362,8 @@ var createWorkflowRuntimeBoot = (deps) => {
 		const issueCredentialMaterial = deps.connectIssueCredentialMaterial?.();
 		const pieceTriggers = deps.connectPieceTriggers?.();
 		const connectorRows = deps.connectConnectorRows();
+		const resolveAccountKey = deps.connectResolveAccountKey?.();
+		const connectedAccountOf = deps.connectConnectedAccountOf?.();
 		const connectSpecCache = deps.connectSpecCache();
 		const connectAgentWire = deps.connectAgentWire();
 		workflowRuntimeHandle = await mountWorkflowRuntime(target, {
@@ -104561,6 +105402,8 @@ var createWorkflowRuntimeBoot = (deps) => {
 				...pieceTriggers ? { pieceTriggers } : {},
 				registry: deps.connectRegistry,
 				...connectorRows ? { connectorRows } : {},
+				...resolveAccountKey ? { resolveAccountKey } : {},
+				...connectedAccountOf ? { connectedAccountOf } : {},
 				...connectSpecCache ? { specCache: connectSpecCache } : {},
 				orgId: CONNECT_BOX_ORG_ID,
 				audit: deps.audit,
@@ -105089,6 +105932,8 @@ var bootEmulatorServer = async (opts, ledger) => {
 		connectIssueCredentialMaterial: () => captured.connectIssueCredentialMaterial,
 		connectPieceTriggers: () => seededOpts.connectPieceTriggers,
 		connectConnectorRows: () => captured.connectConnectorRows,
+		connectResolveAccountKey: () => captured.connectResolveAccountKey,
+		connectConnectedAccountOf: () => captured.connectConnectedAccountOf,
 		connectSpecCache: () => captured.connectSpecCache,
 		connectAgentWire: () => captured.connectAgentWire,
 		recurringJobExecutions: cadences.executions,
@@ -105641,7 +106486,7 @@ var calls_workflow_ts_default = "import { z } from \"zod\";\nimport { streamDeep
 var plain_workflow_ts_default = "import { z } from \"zod\";\n\n/**\n * Workflow \"{{name}}\" — a durable pipeline.\n *\n * Each `\"use step\"` is a durable checkpoint: kill the runtime mid-run and it\n * resumes from the last completed step instead of replaying everything.\n */\n\n// THE contract — sibling exports next to the bare workflow function. The build\n// harvests these (by convention) into the manifest + a live validator. The\n// parameter type is DERIVED from `inputSchema` and the RETURN type from\n// `outputSchema` (both `z.infer`), so neither side can drift from the contract\n// the build harvests. Without the return annotation the schema is published to\n// Studio and the generated types and never compared to what the body returns\n// (PLA-1272).\nexport const inputSchema = z.object({\n  message: z.string().describe(\"The input to process\"),\n});\n\nexport const outputSchema = z.object({\n  message: z.string(),\n  processed: z.boolean(),\n});\n\ntype {{Name}}Input = z.infer<typeof inputSchema>;\n\nexport async function {{export}}(input: {{Name}}Input): Promise<z.infer<typeof outputSchema>> {\n  \"use workflow\";\n\n  const result = await processMessage(input); // step 1 — durable checkpoint\n  return result;\n}\n\nasync function processMessage(input: {{Name}}Input) {\n  \"use step\";\n  // Replace this with the deterministic work of your step (DB write, HTTP call,\n  // an LLM call, …). Returning a value records it as the step's checkpoint.\n  return { message: input.message, processed: true };\n}\n";
 //#endregion
 //#region src/services/scaffold/template-loader.ts
-var SDK_TEMPLATE_VERSION = "0.10.4";
+var SDK_TEMPLATE_VERSION = "0.10.5";
 var PREFIX = "./templates/";
 var templates = new Map(Object.entries(/* @__PURE__ */ Object.assign({
 	"./templates/deep-agents/index.ts.tmpl": index_ts_default,