@gaodefa/daocore 2026.5.51 → 2026.5.53

package/dist/agent-runner.runtime.js

@@ -1 +1 @@
-export * from "./agent-runner.runtime-B709koec.js";
+export * from "./agent-runner.runtime-vxDguHci.js";

package/dist/agent-runtime-C5xeqCn8.js

@@ -0,0 +1,229 @@
+import { n as findNormalizedProviderValue, r as normalizeProviderId } from "./provider-id-zTW9Rdln.js";
+import "./agent-scope-Dx1S0aWX.js";
+import "./provider-auth-aliases-BCoTTDl4.js";
+import "./sandbox-paths-LIVGeGKH.js";
+import "./model-auth-markers-BBq_2Ul_.js";
+import "./model-selection-D1TyOrqK.js";
+import "./model-catalog-W4s3tp_Q.js";
+import "./typebox-BFQUlzrn.js";
+import "./common-vJyw6dD-.js";
+import "./auth-profiles-DJttKtDp.js";
+import "./model-auth-D1amzkLm.js";
+import "./pi-embedded-utils-B5v2j1CN.js";
+import "./identity-ZuObO2Tn.js";
+import "./tts-53iqjiuM.js";
+import "./web-shared-CYJpPo1M.js";
+import "./agent-dir-compat-X9XMR4LI.js";
+import "./identity-avatar-yF0oWfzu.js";
+import "./simple-completion-runtime-CJFmCkYk.js";
+import "./web-guarded-fetch-BxhtrQZt.js";
+import "./agent-command-DB0sppso.js";
+//#region src/agents/model-catalog-scope.ts
+function dedupeCatalogScopeRefs(values) {
+	const refs = /* @__PURE__ */ new Set();
+	for (const value of values) {
+		const trimmed = value?.trim();
+		if (trimmed) refs.add(trimmed);
+	}
+	return [...refs];
+}
+function providerFromModelRef(value) {
+	const trimmed = value?.trim();
+	if (!trimmed) return;
+	const slash = trimmed.indexOf("/");
+	if (slash <= 0) return;
+	return normalizeProviderId(trimmed.slice(0, slash)) || void 0;
+}
+function resolveModelCatalogScope(params) {
+	const provider = params.provider.trim();
+	const model = params.model.trim();
+	return {
+		providerRefs: dedupeCatalogScopeRefs([provider, findNormalizedProviderValue(params.cfg?.models?.providers, provider)?.api]),
+		modelRefs: dedupeCatalogScopeRefs([provider && model ? `${provider}/${model}` : model, model])
+	};
+}
+function resolveProviderDiscoveryProviderIdsForCatalogScope(params) {
+	const providerIds = dedupeCatalogScopeRefs([...params.providerRefs ?? [], ...(params.modelRefs ?? []).map(providerFromModelRef)]);
+	return providerIds.length > 0 ? providerIds : void 0;
+}
+//#endregion
+//#region src/tools/availability.ts
+function isRecord(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function resolveConfigPath(config, path) {
+	let current = config;
+	for (const segment of path) {
+		if (!isRecord(current)) return;
+		current = current[segment];
+	}
+	return current;
+}
+function hasConfiguredValue(params) {
+	const { value, signal } = params;
+	if (value === void 0 || value === null) return false;
+	if ((signal.check ?? "exists") === "available") return params.context.isConfigValueAvailable?.({
+		value,
+		path: signal.path,
+		signal
+	}) === true;
+	if ((signal.check ?? "exists") === "exists") return true;
+	if (typeof value === "string") return value.trim().length > 0;
+	if (Array.isArray(value)) return value.length > 0;
+	if (typeof value === "object") return Object.keys(value).length > 0;
+	return true;
+}
+function hasAvailabilityExpressionShape(value) {
+	return "kind" in value || "allOf" in value || "anyOf" in value;
+}
+function diagnostic(reason, signal, message) {
+	return {
+		reason,
+		signal,
+		message
+	};
+}
+function evaluateSignal(signal, context) {
+	switch (signal.kind) {
+		case "always": return null;
+		case "auth": return context.authProviderIds?.has(signal.providerId) ? null : diagnostic("auth-missing", signal, `Missing auth provider: ${signal.providerId}`);
+		case "config": return hasConfiguredValue({
+			value: resolveConfigPath(context.config, signal.path),
+			signal,
+			context
+		}) ? null : diagnostic("config-missing", signal, `Missing config path: ${signal.path.join(".")}`);
+		case "env": return context.env?.[signal.name]?.trim() ? null : diagnostic("env-missing", signal, `Missing environment value: ${signal.name}`);
+		case "plugin-enabled": return context.enabledPluginIds?.has(signal.pluginId) ? null : diagnostic("plugin-disabled", signal, `Plugin is not enabled: ${signal.pluginId}`);
+		case "context": {
+			const value = context.values?.[signal.key];
+			if (!("equals" in signal)) return value === void 0 ? diagnostic("context-mismatch", signal, `Missing context value: ${signal.key}`) : null;
+			return value === signal.equals ? null : diagnostic("context-mismatch", signal, `Context value did not match: ${signal.key}`);
+		}
+		default: return diagnostic("unsupported-signal", signal, "Unsupported availability signal");
+	}
+}
+function evaluateExpression(expression, context) {
+	if ("kind" in expression) {
+		const diagnostic = evaluateSignal(expression, context);
+		return diagnostic ? [diagnostic] : [];
+	}
+	if ("allOf" in expression) {
+		if (expression.allOf.length === 0) return [{
+			reason: "unsupported-signal",
+			message: "Empty availability allOf group"
+		}];
+		return expression.allOf.flatMap((entry) => evaluateExpression(entry, context));
+	}
+	if ("anyOf" in expression) {
+		if (expression.anyOf.length === 0) return [{
+			reason: "unsupported-signal",
+			message: "Empty availability anyOf group"
+		}];
+		const diagnostics = expression.anyOf.map((entry) => evaluateExpression(entry, context));
+		return diagnostics.some((entries) => entries.length === 0) ? [] : diagnostics.flat();
+	}
+	return [{
+		reason: "unsupported-signal",
+		message: "Unsupported availability expression"
+	}];
+}
+function evaluateToolAvailability(params) {
+	const context = params.context ?? {};
+	const availability = params.descriptor.availability ?? { kind: "always" };
+	if (!hasAvailabilityExpressionShape(availability)) return [{
+		reason: "unsupported-signal",
+		message: "Unsupported availability expression"
+	}];
+	return evaluateExpression(availability, context);
+}
+//#endregion
+//#region src/tools/descriptors.ts
+function defineToolDescriptor(descriptor) {
+	return descriptor;
+}
+function defineToolDescriptors(descriptors) {
+	return descriptors;
+}
+//#endregion
+//#region src/tools/diagnostics.ts
+var ToolPlanContractError = class extends Error {
+	constructor(params) {
+		super(params.message);
+		this.name = "ToolPlanContractError";
+		this.code = params.code;
+		this.toolName = params.toolName;
+	}
+};
+//#endregion
+//#region src/tools/execution.ts
+function formatToolExecutorRef(ref) {
+	switch (ref.kind) {
+		case "core": return `core:${ref.executorId}`;
+		case "plugin": return `plugin:${ref.pluginId}:${ref.toolName}`;
+		case "channel": return `channel:${ref.channelId}:${ref.actionId}`;
+		case "mcp": return `mcp:${ref.serverId}:${ref.toolName}`;
+		default: return ref;
+	}
+}
+//#endregion
+//#region src/tools/planner.ts
+function compareDescriptors(left, right) {
+	return (left.sortKey ?? left.name).localeCompare(right.sortKey ?? right.name) || left.name.localeCompare(right.name);
+}
+function assertUniqueNames(descriptors) {
+	const seen = /* @__PURE__ */ new Set();
+	for (const descriptor of descriptors) {
+		if (seen.has(descriptor.name)) throw new ToolPlanContractError({
+			code: "duplicate-tool-name",
+			toolName: descriptor.name,
+			message: `Duplicate tool descriptor name: ${descriptor.name}`
+		});
+		seen.add(descriptor.name);
+	}
+}
+function buildToolPlan(options) {
+	const descriptors = options.descriptors.toSorted(compareDescriptors);
+	assertUniqueNames(descriptors);
+	const visible = [];
+	const hidden = [];
+	for (const descriptor of descriptors) {
+		const diagnostics = [...evaluateToolAvailability({
+			descriptor,
+			context: options.availability
+		})];
+		if (diagnostics.length > 0) {
+			hidden.push({
+				descriptor,
+				diagnostics
+			});
+			continue;
+		}
+		if (!descriptor.executor) throw new ToolPlanContractError({
+			code: "missing-executor",
+			toolName: descriptor.name,
+			message: `Visible tool descriptor has no executor ref: ${descriptor.name}`
+		});
+		visible.push({
+			descriptor,
+			executor: descriptor.executor
+		});
+	}
+	return {
+		visible,
+		hidden
+	};
+}
+//#endregion
+//#region src/tools/protocol.ts
+function toToolProtocolDescriptor(entry) {
+	return {
+		name: entry.descriptor.name,
+		description: entry.descriptor.description,
+		inputSchema: entry.descriptor.inputSchema
+	};
+}
+function toToolProtocolDescriptors(entries) {
+	return entries.map(toToolProtocolDescriptor);
+}
+//#endregion
+export { ToolPlanContractError as a, evaluateToolAvailability as c, formatToolExecutorRef as i, resolveModelCatalogScope as l, toToolProtocolDescriptors as n, defineToolDescriptor as o, buildToolPlan as r, defineToolDescriptors as s, toToolProtocolDescriptor as t, resolveProviderDiscoveryProviderIdsForCatalogScope as u };

package/dist/agent-svdKN_62.js

@@ -0,0 +1,2 @@
+import "./agent-command-DB0sppso.js";
+export {};

package/dist/agent-via-gateway-DQa8cmBa.js

@@ -0,0 +1,463 @@
+import { c as normalizeOptionalString } from "./string-coerce-DyL154ka.js";
+import { t as formatCliCommand } from "./command-format-tWmMYcvZ.js";
+import "./agent-scope-Dx1S0aWX.js";
+import { d as resolveAgentIdFromSessionKey, h as scopeLegacySessionKeyToAgent, l as normalizeAgentId, o as classifySessionKeyShape, s as isUnscopedSessionKeySentinel } from "./session-key-Bte0mmcq.js";
+import { c as resolveDefaultAgentId, n as listAgentIds } from "./agent-scope-config-CJUQxn7u.js";
+import { r as writeRuntimeJson } from "./runtime-E_A14BX_.js";
+import { a as routeLogsToStderr } from "./console-DkZh-KMc.js";
+import { i as getRuntimeConfig } from "./io-Ct2JqgbR.js";
+import "./config-CLrwLpl0.js";
+import { i as GATEWAY_CLIENT_NAMES, r as GATEWAY_CLIENT_MODES } from "./client-info-B56HGdh-.js";
+import { u as normalizeMessageChannel } from "./message-channel-CRza_Xs_.js";
+import { t as ADMIN_SCOPE } from "./operator-scopes-DGvgHuOd.js";
+import { l as isGatewayTransportError, r as callGateway, u as randomIdempotencyKey } from "./call-BFqofFc5.js";
+import { m as resolveSendableOutboundReplyParts } from "./reply-payload-DMPQsrQC.js";
+import { r as resolveSessionKeyForRequest, t as buildExplicitSessionIdSessionKey } from "./session-CMmK5oT3.js";
+import { r as withProgress } from "./progress-CE2g1zbv.js";
+import { t as agentCommand } from "./agent-command-DB0sppso.js";
+import "./agent-svdKN_62.js";
+import { randomUUID } from "node:crypto";
+//#region src/commands/agent-via-gateway.ts
+const NO_GATEWAY_TIMEOUT_MS = 2147e6;
+const EMBEDDED_FALLBACK_META = {
+	transport: "embedded",
+	fallbackFrom: "gateway"
+};
+const GATEWAY_TIMEOUT_FALLBACK_SESSION_PREFIX = "gateway-fallback-";
+const GATEWAY_TRANSIENT_CONNECT_RETRY_DELAYS_MS = [
+	1e3,
+	2e3,
+	5e3,
+	1e4,
+	15e3
+];
+const AGENT_CLI_SIGNALS = ["SIGINT", "SIGTERM"];
+const GATEWAY_ABORT_RETRY_DELAYS_MS = [
+	50,
+	150,
+	300,
+	600
+];
+const GATEWAY_ABORT_REQUEST_TIMEOUT_MS = 2e3;
+const AGENT_CLI_SIGNAL_EXIT_CODES = {
+	SIGINT: 130,
+	SIGTERM: 143
+};
+function protectJsonStdout(opts) {
+	if (opts.json === true) routeLogsToStderr();
+}
+function parseTimeoutSeconds(opts) {
+	const raw = opts.timeout !== void 0 ? Number.parseInt(opts.timeout, 10) : opts.cfg.agents?.defaults?.timeoutSeconds ?? 600;
+	if (Number.isNaN(raw) || raw < 0) throw new Error(`Invalid --timeout. Use seconds as a non-negative integer, for example --timeout 600. Use --timeout 0 to disable the timeout.`);
+	return raw;
+}
+function formatPayloadForLog(payload) {
+	const parts = resolveSendableOutboundReplyParts({
+		text: payload.text,
+		mediaUrls: payload.mediaUrls,
+		mediaUrl: typeof payload.mediaUrl === "string" ? payload.mediaUrl : void 0
+	});
+	const lines = [];
+	if (parts.text) lines.push(parts.text.trimEnd());
+	for (const url of parts.mediaUrls) lines.push(`MEDIA:${url}`);
+	return lines.join("\n").trimEnd();
+}
+function isGatewayAgentTimeoutError(err) {
+	if (isGatewayTransportError(err)) return err.kind === "timeout";
+	return err instanceof Error && err.message.includes("gateway request timeout for agent");
+}
+function isGatewayAgentEmbeddedFallbackError(err) {
+	return isGatewayTransportError(err);
+}
+function isTransientGatewayAgentConnectClose(err) {
+	if (!isGatewayTransportError(err) || err.kind !== "closed") return false;
+	const code = typeof err.code === "number" ? err.code : void 0;
+	const reason = normalizeOptionalString(err.reason);
+	return code === 1e3 && (!reason || reason === "no close reason");
+}
+function validateExplicitSessionKeyForDispatch(opts) {
+	const sessionKey = opts.sessionKey?.trim();
+	if (!sessionKey) return;
+	if (classifySessionKeyShape(sessionKey) === "malformed_agent") throw new Error(`Invalid --session-key "${sessionKey}". Agent-prefixed session keys must use agent:<agent-id>:<session-key>.`);
+	const agentIdRaw = opts.agent?.trim() || void 0;
+	if (!agentIdRaw || classifySessionKeyShape(sessionKey) !== "agent") return;
+	const agentId = normalizeAgentId(agentIdRaw);
+	const sessionAgentId = resolveAgentIdFromSessionKey(sessionKey);
+	if (sessionAgentId !== agentId) throw new Error(`Agent id "${agentIdRaw}" does not match session key agent "${sessionAgentId}".`);
+}
+function normalizeSessionKeyOptsForDispatch(opts) {
+	const rawSessionKey = opts.sessionKey?.trim();
+	const isLegacySessionKey = rawSessionKey && classifySessionKeyShape(rawSessionKey) === "legacy_or_alias";
+	const agentIdRaw = opts.agent?.trim();
+	const shouldScopeDefaultAgentKey = isLegacySessionKey && !agentIdRaw && !isUnscopedSessionKeySentinel(rawSessionKey);
+	const cfg = isLegacySessionKey && (agentIdRaw || shouldScopeDefaultAgentKey) ? getRuntimeConfig() : void 0;
+	const sessionKey = scopeLegacySessionKeyToAgent({
+		agentId: agentIdRaw ?? (shouldScopeDefaultAgentKey ? resolveDefaultAgentId(cfg) : void 0),
+		sessionKey: opts.sessionKey,
+		mainKey: cfg?.session?.mainKey
+	});
+	if (sessionKey === opts.sessionKey) return opts;
+	return {
+		...opts,
+		sessionKey
+	};
+}
+function isAbortError(err) {
+	return err instanceof Error && err.name === "AbortError";
+}
+function readAcceptedRunContext(payload) {
+	if (!payload || typeof payload !== "object") return {};
+	const runId = payload.runId;
+	const sessionKey = payload.sessionKey;
+	if (payload.status !== "accepted") return {};
+	return {
+		runId: typeof runId === "string" && runId.trim() ? runId.trim() : void 0,
+		sessionKey: typeof sessionKey === "string" && sessionKey.trim() ? sessionKey.trim() : void 0
+	};
+}
+function createAgentCliSignalBridge(processLike = process) {
+	const controller = new AbortController();
+	let receivedSignal;
+	const handlers = /* @__PURE__ */ new Map();
+	const detachHandlers = () => {
+		for (const [signal, handler] of handlers) processLike.off(signal, handler);
+		handlers.clear();
+	};
+	for (const signal of AGENT_CLI_SIGNALS) {
+		const handler = () => {
+			receivedSignal = signal;
+			if (!controller.signal.aborted) {
+				controller.abort();
+				detachHandlers();
+			}
+		};
+		handlers.set(signal, handler);
+		processLike.on(signal, handler);
+	}
+	return {
+		signal: controller.signal,
+		getReceivedSignal: () => receivedSignal,
+		dispose: detachHandlers
+	};
+}
+function isAgentCliProcessLike(value) {
+	return Boolean(value) && typeof value === "object" && typeof value.on === "function" && typeof value.off === "function";
+}
+function resolveAgentCliProcessLike(deps) {
+	if (!deps || !Object.prototype.hasOwnProperty.call(deps, "process")) return process;
+	const processLike = deps.process;
+	return isAgentCliProcessLike(processLike) ? processLike : process;
+}
+function createAbortDelayError() {
+	const err = /* @__PURE__ */ new Error("gateway agent retry aborted");
+	err.name = "AbortError";
+	return err;
+}
+function delayMs(ms, signal) {
+	if (signal?.aborted) return Promise.reject(createAbortDelayError());
+	return new Promise((resolve, reject) => {
+		const timer = setTimeout(() => {
+			signal?.removeEventListener("abort", onAbort);
+			resolve();
+		}, ms);
+		const onAbort = () => {
+			clearTimeout(timer);
+			signal?.removeEventListener("abort", onAbort);
+			reject(createAbortDelayError());
+		};
+		signal?.addEventListener("abort", onAbort, { once: true });
+	});
+}
+function isConfirmedChatAbortResponseForRun(value, runId) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+	const response = value;
+	if (response.aborted !== true) return false;
+	if (response.runIds === void 0) return true;
+	return Array.isArray(response.runIds) && response.runIds.includes(runId);
+}
+async function abortAcceptedGatewayAgentRunWithRequest(params) {
+	if (!params.signal || !params.runId || !params.sessionKey) return false;
+	try {
+		if (isConfirmedChatAbortResponseForRun(await params.request("chat.abort", {
+			sessionKey: params.sessionKey,
+			runId: params.runId
+		}, { timeoutMs: GATEWAY_ABORT_REQUEST_TIMEOUT_MS }), params.runId)) return true;
+		if (params.logFailure !== false) params.runtime.error?.(`Interrupted by ${params.signal}; Gateway run ${params.runId} was not confirmed aborted.`);
+		return false;
+	} catch (err) {
+		if (params.logFailure !== false) params.runtime.error?.(`Interrupted by ${params.signal}; failed to abort Gateway run ${params.runId}: ${String(err)}`);
+		return false;
+	}
+}
+async function abortAcceptedGatewayAgentRunWithGatewayCall(params) {
+	const request = async (method, requestParams, opts) => await callGateway({
+		method,
+		params: requestParams,
+		timeoutMs: opts?.timeoutMs ?? void 0,
+		expectFinal: opts?.expectFinal,
+		...params.gatewayIdentity
+	});
+	for (const [attempt, retryDelayMs] of [...GATEWAY_ABORT_RETRY_DELAYS_MS, 0].entries()) {
+		const isFinalAttempt = attempt === GATEWAY_ABORT_RETRY_DELAYS_MS.length;
+		if (await abortAcceptedGatewayAgentRunWithRequest({
+			runId: params.runId,
+			sessionKey: params.sessionKey,
+			signal: params.signal,
+			runtime: params.runtime,
+			request,
+			logFailure: isFinalAttempt
+		}) || isFinalAttempt) return;
+		await delayMs(retryDelayMs);
+	}
+}
+async function abortAcceptedGatewayAgentRunOnActiveConnection(params) {
+	for (const [attempt, retryDelayMs] of [...GATEWAY_ABORT_RETRY_DELAYS_MS, 0].entries()) {
+		const isFinalAttempt = attempt === GATEWAY_ABORT_RETRY_DELAYS_MS.length;
+		const aborted = await abortAcceptedGatewayAgentRunWithRequest({
+			runId: params.runId,
+			sessionKey: params.sessionKey,
+			signal: params.signal,
+			runtime: params.runtime,
+			request: params.request,
+			logFailure: false
+		});
+		if (aborted || isFinalAttempt) return aborted;
+		await delayMs(retryDelayMs);
+	}
+	return false;
+}
+function exitForReceivedSignal(signal, runtime) {
+	if (!signal) return false;
+	runtime.exit(AGENT_CLI_SIGNAL_EXIT_CODES[signal]);
+	return true;
+}
+function returnAfterSignalExit(value, signal, runtime) {
+	return exitForReceivedSignal(signal, runtime) ? void 0 : value;
+}
+function createGatewayTimeoutFallbackSessionId() {
+	return `${GATEWAY_TIMEOUT_FALLBACK_SESSION_PREFIX}${randomUUID()}`;
+}
+function createGatewayTimeoutFallbackSession(agentId) {
+	const sessionId = createGatewayTimeoutFallbackSessionId();
+	return {
+		sessionId,
+		sessionKey: buildExplicitSessionIdSessionKey({
+			sessionId,
+			agentId
+		})
+	};
+}
+function resolveAgentIdForGatewayTimeoutFallback(opts) {
+	const explicitSessionKey = opts.sessionKey?.trim();
+	if (classifySessionKeyShape(explicitSessionKey) === "agent") return resolveAgentIdFromSessionKey(explicitSessionKey);
+	if (isUnscopedSessionKeySentinel(explicitSessionKey)) return resolveDefaultAgentId(getRuntimeConfig());
+	const agentIdRaw = opts.agent?.trim();
+	if (agentIdRaw) return normalizeAgentId(agentIdRaw);
+	if (!opts.to && !opts.sessionId) return;
+	const resolvedSessionKey = resolveSessionKeyForRequest({
+		cfg: getRuntimeConfig(),
+		to: opts.to,
+		sessionId: opts.sessionId
+	}).sessionKey;
+	return classifySessionKeyShape(resolvedSessionKey) === "agent" ? resolveAgentIdFromSessionKey(resolvedSessionKey) : void 0;
+}
+function buildGatewayJsonResponse(response) {
+	const deliveryStatus = response.result?.deliveryStatus;
+	if (deliveryStatus === void 0) return response;
+	return {
+		...response,
+		deliveryStatus
+	};
+}
+function isInFlightGatewayAgentResponse(response) {
+	return response.status === "in_flight";
+}
+function formatInFlightGatewayAgentMessage(response) {
+	return response.runId ? `Agent run ${response.runId} is already in flight; not starting a duplicate run.` : "Agent run is already in flight; not starting a duplicate run.";
+}
+async function agentViaGatewayCommand(opts, runtime, signalBridge) {
+	protectJsonStdout(opts);
+	const body = (opts.message ?? "").trim();
+	const explicitSessionKey = opts.sessionKey?.trim();
+	if (!body) throw new Error(`Missing message. Use ${formatCliCommand("daocore agent --message \"...\" --agent <id>")} or pass --to/--session-key/--session-id for an existing conversation.`);
+	if (!opts.to && !opts.sessionId && !opts.agent && !explicitSessionKey) throw new Error(`No target session selected. Use --agent <id>, --session-key <key>, --session-id <id>, or --to <E.164>. Run ${formatCliCommand("daocore agents list")} to see agents.`);
+	const cfg = getRuntimeConfig();
+	const agentIdRaw = opts.agent?.trim();
+	const agentId = agentIdRaw ? normalizeAgentId(agentIdRaw) : void 0;
+	if (agentId) {
+		if (!listAgentIds(cfg).includes(agentId)) throw new Error(`Unknown agent id "${agentIdRaw}". Use "${formatCliCommand("daocore agents list")}" to see configured agents.`);
+	}
+	const timeoutSeconds = parseTimeoutSeconds({
+		cfg,
+		timeout: opts.timeout
+	});
+	const gatewayTimeoutMs = timeoutSeconds === 0 ? NO_GATEWAY_TIMEOUT_MS : Math.max(1e4, (timeoutSeconds + 30) * 1e3);
+	const sessionKey = resolveSessionKeyForRequest({
+		cfg,
+		agentId,
+		to: opts.to,
+		sessionId: opts.sessionId,
+		sessionKey: explicitSessionKey
+	}).sessionKey;
+	const channel = normalizeMessageChannel(opts.channel);
+	const idempotencyKey = normalizeOptionalString(opts.runId) || randomIdempotencyKey();
+	const modelOverride = normalizeOptionalString(opts.model);
+	const gatewayIdentity = Boolean(modelOverride) ? {
+		clientName: GATEWAY_CLIENT_NAMES.GATEWAY_CLIENT,
+		mode: GATEWAY_CLIENT_MODES.BACKEND,
+		scopes: [ADMIN_SCOPE]
+	} : {
+		clientName: GATEWAY_CLIENT_NAMES.CLI,
+		mode: GATEWAY_CLIENT_MODES.CLI
+	};
+	let acceptedRunId = idempotencyKey;
+	let acceptedSessionKey = sessionKey;
+	let acceptedGatewayRun = false;
+	let activeConnectionAbortAttempted = false;
+	let activeConnectionAbortSucceeded = false;
+	let response;
+	try {
+		response = await withProgress({
+			label: "Waiting for agent reply…",
+			indeterminate: true,
+			enabled: opts.json !== true
+		}, async () => await callGateway({
+			method: "agent",
+			params: {
+				message: body,
+				agentId,
+				model: modelOverride,
+				to: opts.to,
+				replyTo: opts.replyTo,
+				sessionId: opts.sessionId,
+				sessionKey,
+				thinking: opts.thinking,
+				deliver: Boolean(opts.deliver),
+				channel,
+				replyChannel: opts.replyChannel,
+				replyAccountId: opts.replyAccount,
+				bestEffortDeliver: opts.bestEffortDeliver,
+				timeout: timeoutSeconds,
+				lane: opts.lane,
+				extraSystemPrompt: opts.extraSystemPrompt,
+				idempotencyKey
+			},
+			expectFinal: true,
+			timeoutMs: gatewayTimeoutMs,
+			signal: signalBridge.signal,
+			onAccepted: (payload) => {
+				acceptedGatewayRun = true;
+				const accepted = readAcceptedRunContext(payload);
+				acceptedRunId = accepted.runId ?? acceptedRunId;
+				acceptedSessionKey = accepted.sessionKey ?? acceptedSessionKey;
+			},
+			onSignalAbort: async (request) => {
+				activeConnectionAbortAttempted = true;
+				activeConnectionAbortSucceeded = await abortAcceptedGatewayAgentRunOnActiveConnection({
+					runId: acceptedRunId,
+					sessionKey: acceptedSessionKey,
+					signal: signalBridge.getReceivedSignal(),
+					runtime,
+					request
+				});
+			},
+			...gatewayIdentity
+		}));
+	} catch (err) {
+		if (isAbortError(err) && !activeConnectionAbortSucceeded && (acceptedGatewayRun || activeConnectionAbortAttempted)) await abortAcceptedGatewayAgentRunWithGatewayCall({
+			runId: acceptedRunId,
+			sessionKey: acceptedSessionKey,
+			signal: signalBridge.getReceivedSignal(),
+			runtime,
+			gatewayIdentity
+		});
+		throw err;
+	}
+	if (opts.json) {
+		writeRuntimeJson(runtime, buildGatewayJsonResponse(response));
+		return response;
+	}
+	const payloads = (response?.result)?.payloads ?? [];
+	if (isInFlightGatewayAgentResponse(response)) {
+		runtime.error?.(formatInFlightGatewayAgentMessage(response));
+		return response;
+	}
+	if (payloads.length === 0) {
+		if (response?.status !== "ok") runtime.log(response?.summary ? response.summary : "No reply from agent.");
+		return response;
+	}
+	for (const payload of payloads) {
+		const out = formatPayloadForLog(payload);
+		if (out) runtime.log(out);
+	}
+	return response;
+}
+async function agentViaGatewayCommandWithTransientRetries(opts, runtime, signalBridge) {
+	for (const [attempt, retryDelayMs] of [...GATEWAY_TRANSIENT_CONNECT_RETRY_DELAYS_MS, 0].entries()) try {
+		return await agentViaGatewayCommand(opts, runtime, signalBridge);
+	} catch (err) {
+		if (isAbortError(err)) throw err;
+		if (attempt === GATEWAY_TRANSIENT_CONNECT_RETRY_DELAYS_MS.length || !isTransientGatewayAgentConnectClose(err)) throw err;
+		runtime.error?.(`Gateway agent connection closed during handshake; retrying in ${retryDelayMs}ms before embedded fallback.`);
+		await delayMs(retryDelayMs, signalBridge.signal);
+	}
+	throw new Error("Gateway agent retry loop exhausted unexpectedly.");
+}
+async function agentCliCommand(opts, runtime, deps) {
+	protectJsonStdout(opts);
+	const dispatchOpts = normalizeSessionKeyOptsForDispatch(opts);
+	validateExplicitSessionKeyForDispatch(dispatchOpts);
+	const gatewayDispatchOpts = dispatchOpts.runId ? dispatchOpts : {
+		...dispatchOpts,
+		runId: randomIdempotencyKey()
+	};
+	const signalBridge = createAgentCliSignalBridge(resolveAgentCliProcessLike(deps));
+	const localOpts = {
+		...gatewayDispatchOpts,
+		agentId: gatewayDispatchOpts.agent,
+		replyAccountId: gatewayDispatchOpts.replyAccount,
+		cleanupBundleMcpOnRunEnd: true,
+		cleanupCliLiveSessionOnRunEnd: true,
+		abortSignal: signalBridge.signal
+	};
+	try {
+		if (dispatchOpts.local === true) return returnAfterSignalExit(await agentCommand(localOpts, runtime, deps), signalBridge.getReceivedSignal(), runtime);
+		try {
+			return returnAfterSignalExit(await agentViaGatewayCommandWithTransientRetries(gatewayDispatchOpts, runtime, signalBridge), signalBridge.getReceivedSignal(), runtime);
+		} catch (err) {
+			if (isAbortError(err)) {
+				if (exitForReceivedSignal(signalBridge.getReceivedSignal(), runtime)) return;
+				throw err;
+			}
+			if (isGatewayAgentTimeoutError(err)) {
+				const fallbackSession = createGatewayTimeoutFallbackSession(resolveAgentIdForGatewayTimeoutFallback(dispatchOpts));
+				runtime.error?.(`EMBEDDED FALLBACK: Gateway agent timed out; running embedded agent with fresh session ${fallbackSession.sessionId}: ${String(err)}`);
+				return returnAfterSignalExit(await agentCommand({
+					...localOpts,
+					sessionId: fallbackSession.sessionId,
+					sessionKey: fallbackSession.sessionKey,
+					runId: fallbackSession.sessionId,
+					resultMetaOverrides: {
+						...EMBEDDED_FALLBACK_META,
+						fallbackReason: "gateway_timeout",
+						fallbackSessionId: fallbackSession.sessionId,
+						fallbackSessionKey: fallbackSession.sessionKey
+					}
+				}, runtime, deps), signalBridge.getReceivedSignal(), runtime);
+			}
+			if (!isGatewayAgentEmbeddedFallbackError(err)) throw err;
+			runtime.error?.(`EMBEDDED FALLBACK: Gateway agent failed; running embedded agent: ${String(err)}`);
+			return returnAfterSignalExit(await agentCommand({
+				...localOpts,
+				resultMetaOverrides: EMBEDDED_FALLBACK_META
+			}, runtime, deps), signalBridge.getReceivedSignal(), runtime);
+		}
+	} catch (err) {
+		if (isAbortError(err) && exitForReceivedSignal(signalBridge.getReceivedSignal(), runtime)) return;
+		throw err;
+	} finally {
+		signalBridge.dispose();
+	}
+}
+//#endregion
+export { agentCliCommand };