remoteclaw 0.1.0-next.2abd2fa → 0.1.0-next.2e9a6cd

package/dist/bonjour-discovery-D8aOnk3M.js

@@ -0,0 +1,378 @@
+import { t as isTailnetIPv4 } from "./tailnet-Cy0Q27lj.js";
+import { t as runCommandWithTimeout } from "./exec-ClUTXFZ9.js";
+import { n as resolveWideAreaDiscoveryDomain } from "./widearea-dns-DUDYT3z2.js";
+
+//#region src/infra/bonjour-discovery.ts
+const DEFAULT_TIMEOUT_MS = 2e3;
+const GATEWAY_SERVICE_TYPE = "_remoteclaw-gw._tcp";
+function decodeDnsSdEscapes(value) {
+	let decoded = false;
+	const bytes = [];
+	let pending = "";
+	const flush = () => {
+		if (!pending) return;
+		bytes.push(...Buffer.from(pending, "utf8"));
+		pending = "";
+	};
+	for (let i = 0; i < value.length; i += 1) {
+		const ch = value[i] ?? "";
+		if (ch === "\\" && i + 3 < value.length) {
+			const escaped = value.slice(i + 1, i + 4);
+			if (/^[0-9]{3}$/.test(escaped)) {
+				const byte = Number.parseInt(escaped, 10);
+				if (!Number.isFinite(byte) || byte < 0 || byte > 255) {
+					pending += ch;
+					continue;
+				}
+				flush();
+				bytes.push(byte);
+				decoded = true;
+				i += 3;
+				continue;
+			}
+		}
+		pending += ch;
+	}
+	if (!decoded) return value;
+	flush();
+	return Buffer.from(bytes).toString("utf8");
+}
+function parseDigShortLines(stdout) {
+	return stdout.split("\n").map((l) => l.trim()).filter(Boolean);
+}
+function parseDigTxt(stdout) {
+	const tokens = [];
+	for (const raw of stdout.split("\n")) {
+		const line = raw.trim();
+		if (!line) continue;
+		const matches = Array.from(line.matchAll(/"([^"]*)"/g), (m) => m[1] ?? "");
+		for (const m of matches) {
+			const unescaped = m.replaceAll("\\\\", "\\").replaceAll("\\\"", "\"").replaceAll("\\n", "\n");
+			tokens.push(unescaped);
+		}
+	}
+	return tokens;
+}
+function parseDigSrv(stdout) {
+	const line = stdout.split("\n").map((l) => l.trim()).find(Boolean);
+	if (!line) return null;
+	const parts = line.split(/\s+/).filter(Boolean);
+	if (parts.length < 4) return null;
+	const port = Number.parseInt(parts[2] ?? "", 10);
+	const hostRaw = parts[3] ?? "";
+	if (!Number.isFinite(port) || port <= 0) return null;
+	const host = hostRaw.replace(/\.$/, "");
+	if (!host) return null;
+	return {
+		host,
+		port
+	};
+}
+function parseTailscaleStatusIPv4s(stdout) {
+	const parsed = stdout ? JSON.parse(stdout) : {};
+	const out = [];
+	const addIps = (value) => {
+		if (!value || typeof value !== "object") return;
+		const ips = value.TailscaleIPs;
+		if (!Array.isArray(ips)) return;
+		for (const ip of ips) {
+			if (typeof ip !== "string") continue;
+			const trimmed = ip.trim();
+			if (trimmed && isTailnetIPv4(trimmed)) out.push(trimmed);
+		}
+	};
+	addIps(parsed.Self);
+	const peerObj = parsed.Peer;
+	if (peerObj && typeof peerObj === "object") for (const peer of Object.values(peerObj)) addIps(peer);
+	return [...new Set(out)];
+}
+function parseIntOrNull(value) {
+	if (!value) return;
+	const parsed = Number.parseInt(value, 10);
+	return Number.isFinite(parsed) ? parsed : void 0;
+}
+function parseTxtTokens(tokens) {
+	const txt = {};
+	for (const token of tokens) {
+		const idx = token.indexOf("=");
+		if (idx <= 0) continue;
+		const key = token.slice(0, idx).trim();
+		const value = decodeDnsSdEscapes(token.slice(idx + 1).trim());
+		if (!key) continue;
+		txt[key] = value;
+	}
+	return txt;
+}
+function parseDnsSdBrowse(stdout) {
+	const instances = /* @__PURE__ */ new Set();
+	for (const raw of stdout.split("\n")) {
+		const line = raw.trim();
+		if (!line || !line.includes(GATEWAY_SERVICE_TYPE)) continue;
+		if (!line.includes("Add")) continue;
+		const match = line.match(/_remoteclaw-gw\._tcp\.?\s+(.+)$/);
+		if (match?.[1]) instances.add(decodeDnsSdEscapes(match[1].trim()));
+	}
+	return Array.from(instances.values());
+}
+function parseDnsSdResolve(stdout, instanceName) {
+	const decodedInstanceName = decodeDnsSdEscapes(instanceName);
+	const beacon = { instanceName: decodedInstanceName };
+	let txt = {};
+	for (const raw of stdout.split("\n")) {
+		const line = raw.trim();
+		if (!line) continue;
+		if (line.includes("can be reached at")) {
+			const match = line.match(/can be reached at\s+([^\s:]+):(\d+)/i);
+			if (match?.[1]) beacon.host = match[1].replace(/\.$/, "");
+			if (match?.[2]) beacon.port = parseIntOrNull(match[2]);
+			continue;
+		}
+		if (line.startsWith("txt") || line.includes("txtvers=")) txt = parseTxtTokens(line.split(/\s+/).filter(Boolean));
+	}
+	beacon.txt = Object.keys(txt).length ? txt : void 0;
+	if (txt.displayName) beacon.displayName = decodeDnsSdEscapes(txt.displayName);
+	if (txt.lanHost) beacon.lanHost = txt.lanHost;
+	if (txt.tailnetDns) beacon.tailnetDns = txt.tailnetDns;
+	if (txt.cliPath) beacon.cliPath = txt.cliPath;
+	beacon.gatewayPort = parseIntOrNull(txt.gatewayPort);
+	beacon.sshPort = parseIntOrNull(txt.sshPort);
+	if (txt.gatewayTls) {
+		const raw = txt.gatewayTls.trim().toLowerCase();
+		beacon.gatewayTls = raw === "1" || raw === "true" || raw === "yes";
+	}
+	if (txt.gatewayTlsSha256) beacon.gatewayTlsFingerprintSha256 = txt.gatewayTlsSha256;
+	if (txt.role) beacon.role = txt.role;
+	if (txt.transport) beacon.transport = txt.transport;
+	if (!beacon.displayName) beacon.displayName = decodedInstanceName;
+	return beacon;
+}
+async function discoverViaDnsSd(domain, timeoutMs, run) {
+	const instances = parseDnsSdBrowse((await run([
+		"dns-sd",
+		"-B",
+		GATEWAY_SERVICE_TYPE,
+		domain
+	], { timeoutMs })).stdout);
+	const results = [];
+	for (const instance of instances) {
+		const parsed = parseDnsSdResolve((await run([
+			"dns-sd",
+			"-L",
+			instance,
+			GATEWAY_SERVICE_TYPE,
+			domain
+		], { timeoutMs })).stdout, instance);
+		if (parsed) results.push({
+			...parsed,
+			domain
+		});
+	}
+	return results;
+}
+async function discoverWideAreaViaTailnetDns(domain, timeoutMs, run) {
+	if (!domain || domain === "local.") return [];
+	const startedAt = Date.now();
+	const remainingMs = () => timeoutMs - (Date.now() - startedAt);
+	const tailscaleCandidates = ["tailscale", "/Applications/Tailscale.app/Contents/MacOS/Tailscale"];
+	let ips = [];
+	for (const candidate of tailscaleCandidates) try {
+		ips = parseTailscaleStatusIPv4s((await run([
+			candidate,
+			"status",
+			"--json"
+		], { timeoutMs: Math.max(1, Math.min(700, remainingMs())) })).stdout);
+		if (ips.length > 0) break;
+	} catch {}
+	if (ips.length === 0) return [];
+	if (remainingMs() <= 0) return [];
+	ips = ips.slice(0, 40);
+	const probeName = `${GATEWAY_SERVICE_TYPE}.${domain.replace(/\.$/, "")}`;
+	const concurrency = 6;
+	let nextIndex = 0;
+	let nameserver = null;
+	let ptrs = [];
+	const worker = async () => {
+		while (nameserver === null) {
+			const budget = remainingMs();
+			if (budget <= 0) return;
+			const i = nextIndex;
+			nextIndex += 1;
+			if (i >= ips.length) return;
+			const ip = ips[i] ?? "";
+			if (!ip) continue;
+			try {
+				const lines = parseDigShortLines((await run([
+					"dig",
+					"+short",
+					"+time=1",
+					"+tries=1",
+					`@${ip}`,
+					probeName,
+					"PTR"
+				], { timeoutMs: Math.max(1, Math.min(250, budget)) })).stdout);
+				if (lines.length === 0) continue;
+				nameserver = ip;
+				ptrs = lines;
+				return;
+			} catch {}
+		}
+	};
+	await Promise.all(Array.from({ length: Math.min(concurrency, ips.length) }, () => worker()));
+	if (!nameserver || ptrs.length === 0) return [];
+	if (remainingMs() <= 0) return [];
+	const nameserverArg = `@${String(nameserver)}`;
+	const results = [];
+	for (const ptr of ptrs) {
+		const budget = remainingMs();
+		if (budget <= 0) break;
+		const ptrName = ptr.trim().replace(/\.$/, "");
+		if (!ptrName) continue;
+		const instanceName = ptrName.replace(/\.?_remoteclaw-gw\._tcp\..*$/, "");
+		const srv = await run([
+			"dig",
+			"+short",
+			"+time=1",
+			"+tries=1",
+			nameserverArg,
+			ptrName,
+			"SRV"
+		], { timeoutMs: Math.max(1, Math.min(350, budget)) }).catch(() => null);
+		const srvParsed = srv ? parseDigSrv(srv.stdout) : null;
+		if (!srvParsed) continue;
+		const txtBudget = remainingMs();
+		if (txtBudget <= 0) {
+			results.push({
+				instanceName: instanceName || ptrName,
+				displayName: instanceName || ptrName,
+				domain,
+				host: srvParsed.host,
+				port: srvParsed.port
+			});
+			continue;
+		}
+		const txt = await run([
+			"dig",
+			"+short",
+			"+time=1",
+			"+tries=1",
+			nameserverArg,
+			ptrName,
+			"TXT"
+		], { timeoutMs: Math.max(1, Math.min(350, txtBudget)) }).catch(() => null);
+		const txtTokens = txt ? parseDigTxt(txt.stdout) : [];
+		const txtMap = txtTokens.length > 0 ? parseTxtTokens(txtTokens) : {};
+		const beacon = {
+			instanceName: instanceName || ptrName,
+			displayName: txtMap.displayName || instanceName || ptrName,
+			domain,
+			host: srvParsed.host,
+			port: srvParsed.port,
+			txt: Object.keys(txtMap).length ? txtMap : void 0,
+			gatewayPort: parseIntOrNull(txtMap.gatewayPort),
+			sshPort: parseIntOrNull(txtMap.sshPort),
+			tailnetDns: txtMap.tailnetDns || void 0,
+			cliPath: txtMap.cliPath || void 0
+		};
+		if (txtMap.gatewayTls) {
+			const raw = txtMap.gatewayTls.trim().toLowerCase();
+			beacon.gatewayTls = raw === "1" || raw === "true" || raw === "yes";
+		}
+		if (txtMap.gatewayTlsSha256) beacon.gatewayTlsFingerprintSha256 = txtMap.gatewayTlsSha256;
+		if (txtMap.role) beacon.role = txtMap.role;
+		if (txtMap.transport) beacon.transport = txtMap.transport;
+		results.push(beacon);
+	}
+	return results;
+}
+function parseAvahiBrowse(stdout) {
+	const results = [];
+	let current = null;
+	for (const raw of stdout.split("\n")) {
+		const line = raw.trimEnd();
+		if (!line) continue;
+		if (line.startsWith("=") && line.includes(GATEWAY_SERVICE_TYPE)) {
+			if (current) results.push(current);
+			const marker = ` ${GATEWAY_SERVICE_TYPE}`;
+			const idx = line.indexOf(marker);
+			const left = idx >= 0 ? line.slice(0, idx).trim() : line;
+			const parts = left.split(/\s+/);
+			const instanceName = parts.length > 3 ? parts.slice(3).join(" ") : left;
+			current = {
+				instanceName,
+				displayName: instanceName
+			};
+			continue;
+		}
+		if (!current) continue;
+		const trimmed = line.trim();
+		if (trimmed.startsWith("hostname =")) {
+			const match = trimmed.match(/hostname\s*=\s*\[([^\]]+)\]/);
+			if (match?.[1]) current.host = match[1];
+			continue;
+		}
+		if (trimmed.startsWith("port =")) {
+			const match = trimmed.match(/port\s*=\s*\[(\d+)\]/);
+			if (match?.[1]) current.port = parseIntOrNull(match[1]);
+			continue;
+		}
+		if (trimmed.startsWith("txt =")) {
+			const txt = parseTxtTokens(Array.from(trimmed.matchAll(/"([^"]*)"/g), (m) => m[1]));
+			current.txt = Object.keys(txt).length ? txt : void 0;
+			if (txt.displayName) current.displayName = txt.displayName;
+			if (txt.lanHost) current.lanHost = txt.lanHost;
+			if (txt.tailnetDns) current.tailnetDns = txt.tailnetDns;
+			if (txt.cliPath) current.cliPath = txt.cliPath;
+			current.gatewayPort = parseIntOrNull(txt.gatewayPort);
+			current.sshPort = parseIntOrNull(txt.sshPort);
+			if (txt.gatewayTls) {
+				const raw = txt.gatewayTls.trim().toLowerCase();
+				current.gatewayTls = raw === "1" || raw === "true" || raw === "yes";
+			}
+			if (txt.gatewayTlsSha256) current.gatewayTlsFingerprintSha256 = txt.gatewayTlsSha256;
+			if (txt.role) current.role = txt.role;
+			if (txt.transport) current.transport = txt.transport;
+		}
+	}
+	if (current) results.push(current);
+	return results;
+}
+async function discoverViaAvahi(domain, timeoutMs, run) {
+	const args = [
+		"avahi-browse",
+		"-rt",
+		GATEWAY_SERVICE_TYPE
+	];
+	if (domain && domain !== "local.") args.push("-d", domain.replace(/\.$/, ""));
+	return parseAvahiBrowse((await run(args, { timeoutMs })).stdout).map((beacon) => ({
+		...beacon,
+		domain
+	}));
+}
+async function discoverGatewayBeacons(opts = {}) {
+	const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+	const platform = opts.platform ?? process.platform;
+	const run = opts.run ?? runCommandWithTimeout;
+	const wideAreaDomain = resolveWideAreaDiscoveryDomain({ configDomain: opts.wideAreaDomain });
+	const domainsRaw = Array.isArray(opts.domains) ? opts.domains : [];
+	const defaultDomains = ["local.", ...wideAreaDomain ? [wideAreaDomain] : []];
+	const domains = (domainsRaw.length > 0 ? domainsRaw : defaultDomains).map((d) => String(d).trim()).filter(Boolean).map((d) => d.endsWith(".") ? d : `${d}.`);
+	try {
+		if (platform === "darwin") {
+			const discovered = (await Promise.allSettled(domains.map(async (domain) => await discoverViaDnsSd(domain, timeoutMs, run)))).flatMap((r) => r.status === "fulfilled" ? r.value : []);
+			const wantsWideArea = wideAreaDomain ? domains.includes(wideAreaDomain) : false;
+			const hasWideArea = wideAreaDomain ? discovered.some((b) => b.domain === wideAreaDomain) : false;
+			if (wantsWideArea && !hasWideArea && wideAreaDomain) {
+				const fallback = await discoverWideAreaViaTailnetDns(wideAreaDomain, timeoutMs, run).catch(() => []);
+				return [...discovered, ...fallback];
+			}
+			return discovered;
+		}
+		if (platform === "linux") return (await Promise.allSettled(domains.map(async (domain) => await discoverViaAvahi(domain, timeoutMs, run)))).flatMap((r) => r.status === "fulfilled" ? r.value : []);
+	} catch {
+		return [];
+	}
+	return [];
+}
+
+//#endregion
+export { discoverGatewayBeacons as t };

package/dist/boot/handler.js

@@ -1,18 +1,18 @@
-import { $ as normalizeModelRef, A as normalizeChannelId, G as isGatewayMessageChannel, J as normalizeMessageChannel, K as isInternalMessageChannel, O as getChannelPlugin, Q as isCliProvider, U as INTERNAL_MESSAGE_CHANNEL, W as isDeliverableMessageChannel, Y as resolveMessageChannel, _ as resolveTextChunkLimit, at as resolveSessionAgentId, ct as normalizeAgentId, d as getAgentScopedMediaLocalRoots, ft as normalizeAccountId, g as resolveChunkMode, h as chunkMarkdownTextWithMode, it as resolveAgentWorkspaceDir, k as listChannelPlugins, lt as normalizeMainKey, m as chunkByParagraph, nt as listAgentIds, p as resolveMarkdownTableMode, q as listDeliverableMessageChannels, rt as resolveAgentConfig, tt as formatCliCommand, ut as resolveAgentIdFromSessionKey, x as loadConfig } from "../media-CojxZ45J.js";
-import { D as createInternalHookEvent, M as resolveGatewayPort, O as isGatewayStartupEvent, P as resolveStateDir, k as triggerInternalHook, n as defaultRuntime, s as getActivePluginRegistry, t as createSubsystemLogger } from "../subsystem-BUXAJwPD.js";
-import { A as parseSessionThreadInfo, B as resolveChannelResetConfig, C as DEFAULT_CONTEXT_TOKENS, D as setCliSessionId, E as getCliSessionId, F as updateSessionStore, G as resolveSessionTranscriptPath, H as resolveSessionResetType, I as normalizeAccountId$1, J as resolveExplicitAgentSessionKey, K as resolveStorePath, M as resolveMirroredTranscriptText, N as resolveAndPersistSessionFile, O as resolveChannelMessageToolHints, P as loadSessionStore, R as resolveSessionKey, S as ensureAgentWorkspace, T as DEFAULT_PROVIDER, U as setSessionRuntimeModel, V as resolveSessionResetPolicy, W as resolveSessionFilePathOptions, X as ensureAuthProfileStore, Y as resolveMainSessionKey, Z as SILENT_REPLY_TOKEN, _ as formatThinkingLevels, a as parseReplyDirectives, b as normalizeVerboseLevel, c as AGENT_LANE_NESTED, d as ChannelBridge, f as getGlobalHookRunner, g as resolveGatewayCredentialsFromConfig, h as registerAgentRunContext, i as shouldSuppressReasoningPayload, j as appendAssistantMessageToSessionTranscript, k as clearSessionAuthProfileOverride, l as resolveSendPolicy, m as emitAgentEvent, n as hasNonzeroUsage, o as resolveOutboundTarget, p as clearAgentRunContext, q as resolveAgentMainSessionKey, r as isRenderablePayload, s as resolveSessionDeliveryTarget, t as deriveSessionTotalTokens, u as applyVerboseOverride, v as formatXHighModelHint, w as DEFAULT_MODEL, x as supportsXHighThinking, y as normalizeThinkLevel, z as evaluateSessionFreshness } from "../usage-CYlQW4M2.js";
-import "../targets-JCISV-hS.js";
-import "../accounts-DBohBlww.js";
-import { t as generateSecureUuid } from "../secure-random-Pl9rPl0l.js";
-import "../fetch-BFSBLBkA.js";
-import "../retry-DUjAzOBy.js";
-import "../targets-C1NeMn2J.js";
-import { n as markdownToSignalTextChunks, t as sendMessageSignal } from "../send-CGXyTF22.js";
-import "../store-CPJXuhvQ.js";
-import "../outbound-attachment-B_0D60Yr.js";
+import { D as createInternalHookEvent, M as resolveGatewayPort, O as isGatewayStartupEvent, P as resolveStateDir, k as triggerInternalHook, n as defaultRuntime, s as getActivePluginRegistry, t as createSubsystemLogger } from "../subsystem-BCkt9Ocb.js";
+import { A as INTERNAL_MESSAGE_CHANNEL, B as normalizeModelRef, C as loadConfig, F as normalizeMessageChannel, H as getChannelPlugin, I as resolveMessageChannel, M as isGatewayMessageChannel, N as isInternalMessageChannel, P as listDeliverableMessageChannels, U as listChannelPlugins, W as normalizeChannelId, a as getAgentScopedMediaLocalRoots, at as resolveAgentConfig, c as chunkByParagraph, d as resolveTextChunkLimit, dt as normalizeMainKey, ft as resolveAgentIdFromSessionKey, it as listAgentIds, j as isDeliverableMessageChannel, l as chunkMarkdownTextWithMode, mt as normalizeAccountId, ot as resolveAgentWorkspaceDir, rt as formatCliCommand, s as resolveMarkdownTableMode, st as resolveSessionAgentId, u as resolveChunkMode, ut as normalizeAgentId, z as isCliProvider } from "../media-CmiNXiOZ.js";
+import { A as resolveSessionKey, B as resolveMainSessionKey, C as appendAssistantMessageToSessionTranscript, D as updateSessionStore, E as loadSessionStore, F as resolveSessionFilePathOptions, G as resolveChannelMessageToolHints, H as ensureAgentWorkspace, I as resolveSessionTranscriptPath, K as SILENT_REPLY_TOKEN, L as resolveStorePath, M as resolveChannelResetConfig, N as resolveSessionResetPolicy, O as normalizeAccountId$1, P as resolveSessionResetType, R as resolveAgentMainSessionKey, S as parseSessionThreadInfo, T as resolveAndPersistSessionFile, U as getCliSessionId, V as ensureAuthProfileStore, W as setCliSessionId, _ as emitAgentEvent, a as parseReplyDirectives, b as normalizeVerboseLevel, c as AGENT_LANE_NESTED, d as ChannelBridge, f as resolveCliRuntimeArgs, g as clearAgentRunContext, h as getGlobalHookRunner, i as shouldSuppressReasoningPayload, j as evaluateSessionFreshness, l as resolveSendPolicy, m as resolveCliRuntimeProvider, n as hasNonzeroUsage, o as resolveOutboundTarget, p as resolveCliRuntimeEnv, r as isRenderablePayload, s as resolveSessionDeliveryTarget, t as deriveSessionTotalTokens, u as applyVerboseOverride, v as registerAgentRunContext, w as resolveMirroredTranscriptText, x as clearSessionAuthProfileOverride, y as resolveGatewayCredentialsFromConfig, z as resolveExplicitAgentSessionKey } from "../usage-CAuX4vsd.js";
+import "../accounts-Bomfgw0M.js";
+import { t as generateSecureUuid } from "../secure-random-CBwDBdj1.js";
+import "../targets-3hewwPvM.js";
+import "../fetch-oku6r8tJ.js";
+import "../retry-BzWBtFpP.js";
+import "../targets-Bkw_co-B.js";
+import { n as markdownToSignalTextChunks, t as sendMessageSignal } from "../send-Dt4iCx61.js";
+import "../store-Dw93tSB-.js";
+import "../outbound-attachment-DaStRTGv.js";
+import fs from "node:fs/promises";
 import path from "node:path";
-import fs from "node:fs";
-import fs$1 from "node:fs/promises";
+import fsSync from "node:fs";
 import crypto from "node:crypto";
 
 //#region src/cli/outbound-send-mapping.ts
@@ -32,27 +32,27 @@ function createOutboundSendDepsFromCliSource(deps) {
 function createDefaultDeps() {
 	return {
 		sendMessageWhatsApp: async (...args) => {
-			const { sendMessageWhatsApp } = await import("../web-BUYUdnRH.js");
+			const { sendMessageWhatsApp } = await import("../web-B9gR_cGR.js");
 			return await sendMessageWhatsApp(...args);
 		},
 		sendMessageTelegram: async (...args) => {
-			const { sendMessageTelegram } = await import("../send-BqVOxAmK.js");
+			const { sendMessageTelegram } = await import("../send-BZCfto_I.js");
 			return await sendMessageTelegram(...args);
 		},
 		sendMessageDiscord: async (...args) => {
-			const { sendMessageDiscord } = await import("../send-CKavrhXj.js");
+			const { sendMessageDiscord } = await import("../send-MWjpLHEV.js");
 			return await sendMessageDiscord(...args);
 		},
 		sendMessageSlack: async (...args) => {
-			const { sendMessageSlack } = await import("../send-D1aYEG-k.js");
+			const { sendMessageSlack } = await import("../send-BT8XEvZB.js");
 			return await sendMessageSlack(...args);
 		},
 		sendMessageSignal: async (...args) => {
-			const { sendMessageSignal } = await import("../send-B84axiIa.js");
+			const { sendMessageSignal } = await import("../send-CPBd6ItT.js");
 			return await sendMessageSignal(...args);
 		},
 		sendMessageIMessage: async (...args) => {
-			const { sendMessageIMessage } = await import("../send-D08Je6DL.js");
+			const { sendMessageIMessage } = await import("../send-D2m_x8xM.js");
 			return await sendMessageIMessage(...args);
 		}
 	};
@@ -253,11 +253,11 @@ function resolveFailedDir(stateDir) {
 /** Ensure the queue directory (and failed/ subdirectory) exist. */
 async function ensureQueueDir(stateDir) {
 	const queueDir = resolveQueueDir(stateDir);
-	await fs.promises.mkdir(queueDir, {
+	await fsSync.promises.mkdir(queueDir, {
 		recursive: true,
 		mode: 448
 	});
-	await fs.promises.mkdir(resolveFailedDir(stateDir), {
+	await fsSync.promises.mkdir(resolveFailedDir(stateDir), {
 		recursive: true,
 		mode: 448
 	});
@@ -284,18 +284,18 @@ async function enqueueDelivery(params, stateDir) {
 	const filePath = path.join(queueDir, `${id}.json`);
 	const tmp = `${filePath}.${process.pid}.tmp`;
 	const json = JSON.stringify(entry, null, 2);
-	await fs.promises.writeFile(tmp, json, {
+	await fsSync.promises.writeFile(tmp, json, {
 		encoding: "utf-8",
 		mode: 384
 	});
-	await fs.promises.rename(tmp, filePath);
+	await fsSync.promises.rename(tmp, filePath);
 	return id;
 }
 /** Remove a successfully delivered entry from the queue. */
 async function ackDelivery(id, stateDir) {
 	const filePath = path.join(resolveQueueDir(stateDir), `${id}.json`);
 	try {
-		await fs.promises.unlink(filePath);
+		await fsSync.promises.unlink(filePath);
 	} catch (err) {
 		if ((err && typeof err === "object" && "code" in err ? String(err.code) : null) !== "ENOENT") throw err;
 	}
@@ -303,16 +303,16 @@ async function ackDelivery(id, stateDir) {
 /** Update a queue entry after a failed delivery attempt. */
 async function failDelivery(id, error, stateDir) {
 	const filePath = path.join(resolveQueueDir(stateDir), `${id}.json`);
-	const raw = await fs.promises.readFile(filePath, "utf-8");
+	const raw = await fsSync.promises.readFile(filePath, "utf-8");
 	const entry = JSON.parse(raw);
 	entry.retryCount += 1;
 	entry.lastError = error;
 	const tmp = `${filePath}.${process.pid}.tmp`;
-	await fs.promises.writeFile(tmp, JSON.stringify(entry, null, 2), {
+	await fsSync.promises.writeFile(tmp, JSON.stringify(entry, null, 2), {
 		encoding: "utf-8",
 		mode: 384
 	});
-	await fs.promises.rename(tmp, filePath);
+	await fsSync.promises.rename(tmp, filePath);
 }
 
 //#endregion
@@ -925,24 +925,20 @@ async function updateSessionStoreAfterAgentRun(params) {
 		cacheRead: runUsage.cacheReadTokens,
 		cacheWrite: runUsage.cacheWriteTokens
 	} : void 0;
-	const compactionsThisRun = 0;
 	const modelUsed = fallbackModel ?? defaultModel;
 	const providerUsed = fallbackProvider ?? defaultProvider;
-	const contextTokens = params.contextTokensOverride ?? DEFAULT_CONTEXT_TOKENS;
-	const entry = sessionStore[sessionKey] ?? {
-		sessionId,
-		updatedAt: Date.now()
-	};
+	const contextTokens = params.contextTokensOverride ?? 2e5;
 	const next = {
-		...entry,
+		...sessionStore[sessionKey] ?? {
+			sessionId,
+			updatedAt: Date.now()
+		},
 		sessionId,
 		updatedAt: Date.now(),
 		contextTokens
 	};
-	setSessionRuntimeModel(next, {
-		provider: providerUsed,
-		model: modelUsed
-	});
+	next.modelProvider = providerUsed;
+	next.model = modelUsed;
 	if (isCliProvider(providerUsed, cfg)) {
 		const cliSessionId = result.run.sessionId?.trim();
 		if (cliSessionId) setCliSessionId(next, providerUsed, cliSessionId);
@@ -962,7 +958,6 @@ async function updateSessionStoreAfterAgentRun(params) {
 		next.cacheRead = usage.cacheRead ?? 0;
 		next.cacheWrite = usage.cacheWrite ?? 0;
 	}
-	if (compactionsThisRun > 0) next.compactionCount = (entry.compactionCount ?? 0) + compactionsThisRun;
 	sessionStore[sessionKey] = next;
 	await updateSessionStore(storePath, (store) => {
 		store[sessionKey] = next;
@@ -1039,7 +1034,6 @@ function resolveSession(opts) {
 		sessionStore,
 		storePath,
 		isNewSession: !fresh && !opts.sessionId,
-		persistedThinking: fresh && sessionEntry?.thinkingLevel ? normalizeThinkLevel(sessionEntry.thinkingLevel) : void 0,
 		persistedVerbose: fresh && sessionEntry?.verboseLevel ? normalizeVerboseLevel(sessionEntry.verboseLevel) : void 0
 	};
 }
@@ -1108,18 +1102,13 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 		if (sessionAgentId !== agentIdOverride) throw new Error(`Agent id "${agentIdOverrideRaw}" does not match session key agent "${sessionAgentId}".`);
 	}
 	const agentCfg = cfg.agents?.defaults;
-	const thinkingLevelsHint = formatThinkingLevels(DEFAULT_PROVIDER, DEFAULT_MODEL);
-	const thinkOverride = normalizeThinkLevel(opts.thinking);
-	const thinkOnce = normalizeThinkLevel(opts.thinkingOnce);
-	if (opts.thinking && !thinkOverride) throw new Error(`Invalid thinking level. Use one of: ${thinkingLevelsHint}.`);
-	if (opts.thinkingOnce && !thinkOnce) throw new Error(`Invalid one-shot thinking level. Use one of: ${thinkingLevelsHint}.`);
 	const verboseOverride = normalizeVerboseLevel(opts.verbose);
 	if (opts.verbose && !verboseOverride) throw new Error("Invalid verbose level. Use \"on\", \"full\", or \"off\".");
 	if (opts.timeout !== void 0) {
 		const timeoutSecondsRaw = Number.parseInt(String(opts.timeout), 10);
 		if (Number.isNaN(timeoutSecondsRaw) || timeoutSecondsRaw < 0) throw new Error("--timeout must be a non-negative integer (seconds; 0 means no timeout)");
 	}
-	const { sessionId, sessionKey, sessionEntry: resolvedSessionEntry, sessionStore, storePath, isNewSession: _isNewSession, persistedThinking, persistedVerbose } = resolveSession({
+	const { sessionId, sessionKey, sessionEntry: resolvedSessionEntry, sessionStore, storePath, isNewSession: _isNewSession, persistedVerbose } = resolveSession({
 		cfg,
 		to: opts.to,
 		sessionId: opts.sessionId,
@@ -1143,7 +1132,6 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 				chatType: sessionEntry?.chatType
 			}) === "deny") throw new Error("send blocked by session policy");
 		}
-		let resolvedThinkLevel = thinkOnce ?? thinkOverride ?? persistedThinking ?? agentCfg?.thinkingDefault;
 		const resolvedVerboseLevel = verboseOverride ?? persistedVerbose ?? agentCfg?.verboseDefault;
 		if (sessionKey) registerAgentRunContext(runId, {
 			sessionKey,
@@ -1158,7 +1146,6 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 				sessionId,
 				updatedAt: Date.now()
 			};
-			if (thinkOverride) next.thinkingLevel = thinkOverride;
 			applyVerboseOverride(next, verboseOverride);
 			await persistSessionEntry({
 				sessionStore,
@@ -1168,7 +1155,7 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 			});
 			sessionEntry = next;
 		}
-		const { provider: defaultProvider, model: defaultModel } = normalizeModelRef(DEFAULT_PROVIDER, DEFAULT_MODEL);
+		const { provider: defaultProvider, model: defaultModel } = normalizeModelRef("unknown", "unknown");
 		let provider = defaultProvider;
 		let model = defaultModel;
 		const storedProviderOverride = sessionEntry?.providerOverride?.trim();
@@ -1193,22 +1180,6 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 				}
 			}
 		}
-		if (!resolvedThinkLevel) resolvedThinkLevel = agentCfg?.thinkingDefault ?? void 0;
-		if (resolvedThinkLevel === "xhigh" && !supportsXHighThinking(provider, model)) {
-			if (Boolean(thinkOnce || thinkOverride)) throw new Error(`Thinking level "xhigh" is only supported for ${formatXHighModelHint()}.`);
-			resolvedThinkLevel = "high";
-			if (sessionEntry && sessionStore && sessionKey && sessionEntry.thinkingLevel === "xhigh") {
-				const entry = sessionEntry;
-				entry.thinkingLevel = "high";
-				entry.updatedAt = Date.now();
-				await persistSessionEntry({
-					sessionStore,
-					sessionKey,
-					storePath,
-					entry
-				});
-			}
-		}
 		const sessionPathOpts = resolveSessionFilePathOptions({
 			agentId: sessionAgentId,
 			storePath
@@ -1236,11 +1207,13 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 			const messageChannel = resolveMessageChannel(runContext.messageChannel, opts.replyChannel ?? opts.channel);
 			const sessionMap = createSessionMapAdapter({ getSessionId: () => getCliSessionId(sessionEntry, provider) });
 			const bridge = new ChannelBridge({
-				provider,
+				provider: resolveCliRuntimeProvider(cfg),
 				sessionMap,
 				gatewayUrl: resolveGatewayUrlFromConfig(cfg),
 				gatewayToken: resolveGatewayTokenFromConfig(cfg),
-				workspaceDir
+				workspaceDir,
+				runtimeArgs: resolveCliRuntimeArgs(cfg),
+				runtimeEnv: resolveCliRuntimeEnv(cfg)
 			});
 			const messageToolHints = resolveChannelMessageToolHints({
 				cfg,
@@ -1341,7 +1314,7 @@ async function resolveBootPrompt(boot, workspaceDir) {
 	if (boot.file !== void 0) {
 		const filePath = path.isAbsolute(boot.file) ? boot.file : path.join(workspaceDir, boot.file);
 		try {
-			const trimmed = (await fs$1.readFile(filePath, "utf-8")).trim();
+			const trimmed = (await fs.readFile(filePath, "utf-8")).trim();
 			if (!trimmed) return { status: "empty" };
 			return {
 				status: "ok",